| 351efad4 | 2014-04-16 01:04:54 | Michele Calgaro |
Fixes tdebindings FTBFS caused by ruby 2.0.0 on Debian/Ubuntu |
||
|
M debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.install M debian/lenny/tdebindings/debian/libqt0-ruby-trinity.install M debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.install M debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.install M debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.install M debian/wheezy/tdebindings/debian/libqt0-ruby-trinity.install M ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.install M ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.install M ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.install M ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.install M ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.install M ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.install |
||
diff --git a/debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.install b/debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.install index c0da990..33de286 100644 --- a/debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.install +++ b/debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so* -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la +debian/tmp/opt/trinity/lib/*/*/*/korundum.so* +debian/tmp/opt/trinity/lib/*/*/*/korundum.la korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby diff --git a/debian/lenny/tdebindings/debian/libqt0-ruby-trinity.install b/debian/lenny/tdebindings/debian/libqt0-ruby-trinity.install index 7ea7610..a18befa 100644 --- a/debian/lenny/tdebindings/debian/libqt0-ruby-trinity.install +++ b/debian/lenny/tdebindings/debian/libqt0-ruby-trinity.install @@ -6,10 +6,10 @@ debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb debian/tmp/opt/trinity/lib/ruby/*/Qt.rb -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.so* -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la +debian/tmp/opt/trinity/lib/*/*/*/qtruby.so* +debian/tmp/opt/trinity/lib/*/*/*/qtruby.la -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so* -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la +debian/tmp/opt/trinity/lib/*/*/*/tqui.so* +debian/tmp/opt/trinity/lib/*/*/*/tqui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby diff --git a/debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.install b/debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.install index c0da990..33de286 100644 --- a/debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.install +++ b/debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so* -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la +debian/tmp/opt/trinity/lib/*/*/*/korundum.so* +debian/tmp/opt/trinity/lib/*/*/*/korundum.la korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby diff --git a/debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.install b/debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.install index 7ea7610..a18befa 100644 --- a/debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.install +++ b/debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.install @@ -6,10 +6,10 @@ debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb debian/tmp/opt/trinity/lib/ruby/*/Qt.rb -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.so* -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la +debian/tmp/opt/trinity/lib/*/*/*/qtruby.so* +debian/tmp/opt/trinity/lib/*/*/*/qtruby.la -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so* -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la +debian/tmp/opt/trinity/lib/*/*/*/tqui.so* +debian/tmp/opt/trinity/lib/*/*/*/tqui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby diff --git a/debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.install b/debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.install index c0da990..33de286 100644 --- a/debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.install +++ b/debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so* -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la +debian/tmp/opt/trinity/lib/*/*/*/korundum.so* +debian/tmp/opt/trinity/lib/*/*/*/korundum.la korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby diff --git a/debian/wheezy/tdebindings/debian/libqt0-ruby-trinity.install b/debian/wheezy/tdebindings/debian/libqt0-ruby-trinity.install index 7ea7610..a18befa 100644 --- a/debian/wheezy/tdebindings/debian/libqt0-ruby-trinity.install +++ b/debian/wheezy/tdebindings/debian/libqt0-ruby-trinity.install @@ -6,10 +6,10 @@ debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb debian/tmp/opt/trinity/lib/ruby/*/Qt.rb -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.so* -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la +debian/tmp/opt/trinity/lib/*/*/*/qtruby.so* +debian/tmp/opt/trinity/lib/*/*/*/qtruby.la -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so* -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la +debian/tmp/opt/trinity/lib/*/*/*/tqui.so* +debian/tmp/opt/trinity/lib/*/*/*/tqui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby diff --git a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.install b/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.install index c0da990..33de286 100644 --- a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.install +++ b/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so* -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la +debian/tmp/opt/trinity/lib/*/*/*/korundum.so* +debian/tmp/opt/trinity/lib/*/*/*/korundum.la korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby diff --git a/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.install b/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.install index 7ea7610..a18befa 100644 --- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.install +++ b/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.install @@ -6,10 +6,10 @@ debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb debian/tmp/opt/trinity/lib/ruby/*/Qt.rb -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.so* -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la +debian/tmp/opt/trinity/lib/*/*/*/qtruby.so* +debian/tmp/opt/trinity/lib/*/*/*/qtruby.la -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so* -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la +debian/tmp/opt/trinity/lib/*/*/*/tqui.so* +debian/tmp/opt/trinity/lib/*/*/*/tqui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby diff --git a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.install b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.install index c0da990..33de286 100644 --- a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.install +++ b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so* -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la +debian/tmp/opt/trinity/lib/*/*/*/korundum.so* +debian/tmp/opt/trinity/lib/*/*/*/korundum.la korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby diff --git a/ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.install b/ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.install index 7ea7610..a18befa 100644 --- a/ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.install +++ b/ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.install @@ -6,10 +6,10 @@ debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb debian/tmp/opt/trinity/lib/ruby/*/Qt.rb -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.so* -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la +debian/tmp/opt/trinity/lib/*/*/*/qtruby.so* +debian/tmp/opt/trinity/lib/*/*/*/qtruby.la -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so* -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la +debian/tmp/opt/trinity/lib/*/*/*/tqui.so* +debian/tmp/opt/trinity/lib/*/*/*/tqui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby diff --git a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.install b/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.install index c0da990..33de286 100644 --- a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.install +++ b/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.install @@ -6,7 +6,7 @@ debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so* -debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la +debian/tmp/opt/trinity/lib/*/*/*/korundum.so* +debian/tmp/opt/trinity/lib/*/*/*/korundum.la korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby diff --git a/ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.install b/ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.install index 7ea7610..a18befa 100644 --- a/ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.install +++ b/ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.install @@ -6,10 +6,10 @@ debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb debian/tmp/opt/trinity/lib/ruby/*/Qt.rb -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.so* -debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la +debian/tmp/opt/trinity/lib/*/*/*/qtruby.so* +debian/tmp/opt/trinity/lib/*/*/*/qtruby.la -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so* -debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la +debian/tmp/opt/trinity/lib/*/*/*/tqui.so* +debian/tmp/opt/trinity/lib/*/*/*/tqui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby |
||
| f65fdd93 | 2014-04-16 01:05:53 | Michele Calgaro |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging |
||
|
A redhat/build/install_requires.sh A redhat/packages.mga4 M redhat/Makefile.r14 M redhat/Makefile.v3.5.13-sru M redhat/applications/kaffeine/kaffeine-3.5.13.2.spec M redhat/build/build_rpm_package.sh M redhat/build/configure_repository.sh M redhat/build/get_installed_package_version.sh M redhat/build/get_latest_tarball_version.sh M redhat/build/get_rpm_package_name.sh M redhat/build/is_latest_package_built.sh M redhat/build/update_repository.sh M redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec M redhat/packages.mga M redhat/packages.oss M redhat/tdebase/tdebase-3.5.13.2.spec M redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec |
||
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 57c9d56..ab00f4b 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -1,12 +1,12 @@
SHELL := /bin/bash
-PATH := $(PATH)/build:$(shell pwd)
+PATH := $(PATH):$(shell pwd)/build
TDE_VERSION = 14.0.0
buildpkg = \
@echo "Now processing '$(1)' ."; \
- if ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
+ if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
echo " Package '${1}' is not yet installed."; \
- if ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
+ if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
echo " Building package."; \
build_rpm_package.sh "$(1)" ${TDE_VERSION} || exit 1; \
echo " Updating repository."; \
diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru
index 6f13212..c8c2e61 100644
--- a/redhat/Makefile.v3.5.13-sru
+++ b/redhat/Makefile.v3.5.13-sru
@@ -1,12 +1,12 @@
SHELL := /bin/bash
-PATH := $(PATH)/build:$(shell pwd)
+PATH := $(PATH):$(shell pwd)/build
TDE_VERSION = 3.5.13.2
buildpkg = \
@echo "Now processing '$(1)' ."; \
- if ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
+ if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
echo " Package '${1}' is not yet installed."; \
- if ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
+ if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
echo " Building package."; \
build_rpm_package.sh "$(1)" ${TDE_VERSION} || exit 1; \
echo " Updating repository."; \
@@ -51,7 +51,7 @@
tqca-tls: tqtinterface tqca
$(call buildpkg,dependencies/tqca-tls)
-qt3:
+qt3: esound
$(call buildpkg,dependencies/qt3)
tqtinterface: qt3
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index 7b9b2f2..0570ac1 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
** Diff limit reached (max: 250 lines) **
|
||