From ed01c256e45dd964f0e3da22364ee4819acd29da Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 3 Dec 2011 19:29:53 -0600 Subject: [PATCH 1/5] Fix python-tqt FTBFS on Debian and Ubuntu --- debian/lenny/dependencies/python-tqt/debian/control | 2 +- debian/lenny/dependencies/python-tqt/debian/rules | 4 ++-- debian/squeeze/dependencies/python-tqt/debian/control | 2 +- debian/squeeze/dependencies/python-tqt/debian/rules | 4 ++-- ubuntu/maverick/dependencies/python-tqt/debian/control | 2 +- ubuntu/maverick/dependencies/python-tqt/debian/rules | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/lenny/dependencies/python-tqt/debian/control b/debian/lenny/dependencies/python-tqt/debian/control index 9354c760b..c7b03ffe4 100644 --- a/debian/lenny/dependencies/python-tqt/debian/control +++ b/debian/lenny/dependencies/python-tqt/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Torsten Marek , Bernd Zeimetz , Michael Casadevall -Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqt3-mt-dev (>= 3:3.3.4-4), tqt3-dev-tools (>= 3:3.3.4-4), tqt3-apps-dev (>= 3:3.3.4-4), python-sip-dev (>= 4.10.0-2ubuntu1), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), python-sip-dbg, python-all-dbg +Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqt3-mt-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1), python-sip-dbg, python-all-dbg Standards-Version: 3.8.4 Package: python-tqt diff --git a/debian/lenny/dependencies/python-tqt/debian/rules b/debian/lenny/dependencies/python-tqt/debian/rules index 0e74c131e..90f208768 100755 --- a/debian/lenny/dependencies/python-tqt/debian/rules +++ b/debian/lenny/dependencies/python-tqt/debian/rules @@ -44,7 +44,7 @@ build-%/configure-stamp: mkdir -p build-$* cd build-$* && echo yes \ | python$* ../configure.py \ - -c -n /usr/include/qscintilla \ + -c -n /usr/include/tqscintilla \ -o /usr/lib -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*) \ -l /usr/include/python$* \ @@ -58,7 +58,7 @@ dbg-build-%/configure-stamp: mkdir -p dbg-build-$* cd dbg-build-$* && echo yes \ | python$*-dbg ../configure.py \ - -c -n /usr/include/qscintilla \ + -c -n /usr/include/tqscintilla \ -o /usr/lib -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*) \ -l /usr/include/python$*_d \ diff --git a/debian/squeeze/dependencies/python-tqt/debian/control b/debian/squeeze/dependencies/python-tqt/debian/control index 9354c760b..c7b03ffe4 100644 --- a/debian/squeeze/dependencies/python-tqt/debian/control +++ b/debian/squeeze/dependencies/python-tqt/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Torsten Marek , Bernd Zeimetz , Michael Casadevall -Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqt3-mt-dev (>= 3:3.3.4-4), tqt3-dev-tools (>= 3:3.3.4-4), tqt3-apps-dev (>= 3:3.3.4-4), python-sip-dev (>= 4.10.0-2ubuntu1), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), python-sip-dbg, python-all-dbg +Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqt3-mt-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1), python-sip-dbg, python-all-dbg Standards-Version: 3.8.4 Package: python-tqt diff --git a/debian/squeeze/dependencies/python-tqt/debian/rules b/debian/squeeze/dependencies/python-tqt/debian/rules index 0e74c131e..90f208768 100755 --- a/debian/squeeze/dependencies/python-tqt/debian/rules +++ b/debian/squeeze/dependencies/python-tqt/debian/rules @@ -44,7 +44,7 @@ build-%/configure-stamp: mkdir -p build-$* cd build-$* && echo yes \ | python$* ../configure.py \ - -c -n /usr/include/qscintilla \ + -c -n /usr/include/tqscintilla \ -o /usr/lib -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*) \ -l /usr/include/python$* \ @@ -58,7 +58,7 @@ dbg-build-%/configure-stamp: mkdir -p dbg-build-$* cd dbg-build-$* && echo yes \ | python$*-dbg ../configure.py \ - -c -n /usr/include/qscintilla \ + -c -n /usr/include/tqscintilla \ -o /usr/lib -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*) \ -l /usr/include/python$*_d \ diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/control b/ubuntu/maverick/dependencies/python-tqt/debian/control index 9354c760b..c7b03ffe4 100644 --- a/ubuntu/maverick/dependencies/python-tqt/debian/control +++ b/ubuntu/maverick/dependencies/python-tqt/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Torsten Marek , Bernd Zeimetz , Michael Casadevall -Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqt3-mt-dev (>= 3:3.3.4-4), tqt3-dev-tools (>= 3:3.3.4-4), tqt3-apps-dev (>= 3:3.3.4-4), python-sip-dev (>= 4.10.0-2ubuntu1), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), python-sip-dbg, python-all-dbg +Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqt3-mt-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1), python-sip-dbg, python-all-dbg Standards-Version: 3.8.4 Package: python-tqt diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules index 0e74c131e..90f208768 100755 --- a/ubuntu/maverick/dependencies/python-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/python-tqt/debian/rules @@ -44,7 +44,7 @@ build-%/configure-stamp: mkdir -p build-$* cd build-$* && echo yes \ | python$* ../configure.py \ - -c -n /usr/include/qscintilla \ + -c -n /usr/include/tqscintilla \ -o /usr/lib -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*) \ -l /usr/include/python$* \ @@ -58,7 +58,7 @@ dbg-build-%/configure-stamp: mkdir -p dbg-build-$* cd dbg-build-$* && echo yes \ | python$*-dbg ../configure.py \ - -c -n /usr/include/qscintilla \ + -c -n /usr/include/tqscintilla \ -o /usr/lib -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*) \ -l /usr/include/python$*_d \ From 36ee03e4ce97921aab8858efc5e6d54ccb9bb322 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 3 Dec 2011 21:16:47 -0600 Subject: [PATCH 2/5] Fix tde-i18n FTBFS on Debian and Ubuntu --- debian/lenny/tde-i18n/debian/rules | 2 +- debian/squeeze/tde-i18n/debian/rules | 2 +- ubuntu/maverick/tde-i18n/debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/tde-i18n/debian/rules b/debian/lenny/tde-i18n/debian/rules index 60b78838f..f49804687 100755 --- a/debian/lenny/tde-i18n/debian/rules +++ b/debian/lenny/tde-i18n/debian/rules @@ -54,7 +54,7 @@ $(STAMP_EXTRACT): $(STAMP_BUILD): # Building the '$(cur_lang)' language ... - cd $(cur_lang_dir) && ./configure $(configkde) && $(MAKE) + cd $(cur_lang_dir) && autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && ./configure $(configkde) && $(MAKE) touch $@ diff --git a/debian/squeeze/tde-i18n/debian/rules b/debian/squeeze/tde-i18n/debian/rules index 60b78838f..f49804687 100755 --- a/debian/squeeze/tde-i18n/debian/rules +++ b/debian/squeeze/tde-i18n/debian/rules @@ -54,7 +54,7 @@ $(STAMP_EXTRACT): $(STAMP_BUILD): # Building the '$(cur_lang)' language ... - cd $(cur_lang_dir) && ./configure $(configkde) && $(MAKE) + cd $(cur_lang_dir) && autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && ./configure $(configkde) && $(MAKE) touch $@ diff --git a/ubuntu/maverick/tde-i18n/debian/rules b/ubuntu/maverick/tde-i18n/debian/rules index 60b78838f..f49804687 100755 --- a/ubuntu/maverick/tde-i18n/debian/rules +++ b/ubuntu/maverick/tde-i18n/debian/rules @@ -54,7 +54,7 @@ $(STAMP_EXTRACT): $(STAMP_BUILD): # Building the '$(cur_lang)' language ... - cd $(cur_lang_dir) && ./configure $(configkde) && $(MAKE) + cd $(cur_lang_dir) && autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && ./configure $(configkde) && $(MAKE) touch $@ From 27bb59b64d7af7a5aefc60d1164f0ce5a53b4079 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 3 Dec 2011 22:04:27 -0600 Subject: [PATCH 3/5] Fix python-tqt FTBFS on Debian and Ubuntu --- debian/lenny/dependencies/python-tqt/debian/rules | 5 +++-- debian/squeeze/dependencies/python-tqt/debian/rules | 5 +++-- ubuntu/maverick/dependencies/python-tqt/debian/rules | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/lenny/dependencies/python-tqt/debian/rules b/debian/lenny/dependencies/python-tqt/debian/rules index 90f208768..28d432240 100755 --- a/debian/lenny/dependencies/python-tqt/debian/rules +++ b/debian/lenny/dependencies/python-tqt/debian/rules @@ -25,6 +25,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) else CXXFLAGS += -O1 endif +CXXFLAGS += "-I/usr/include/tqt" PYTHONS := $(shell pyversions -vr debian/control) @@ -64,7 +65,7 @@ dbg-build-%/configure-stamp: -l /usr/include/python$*_d \ -v /usr/share/sip/tqt \ -m /usr/lib/python$*/config_d \ - CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g" STRIP="" + CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP="" touch $@ build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp) @@ -105,7 +106,7 @@ install-arch: build mkdir -p debian/python-tqt-gl-dbg/$$pylib;\ mv debian/python-tqt-dbg/$$pylib/qtgl.so \ debian/python-tqt-gl-dbg/$$pylib/;\ - mkdir -p debian/python-qtext-dbg/$$pylib;\ + mkdir -p debian/python-tqtext-dbg/$$pylib;\ mv debian/python-tqt-dbg/$$pylib/qtext.so \ debian/python-tqtext-dbg/$$pylib/;\ done diff --git a/debian/squeeze/dependencies/python-tqt/debian/rules b/debian/squeeze/dependencies/python-tqt/debian/rules index 90f208768..28d432240 100755 --- a/debian/squeeze/dependencies/python-tqt/debian/rules +++ b/debian/squeeze/dependencies/python-tqt/debian/rules @@ -25,6 +25,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) else CXXFLAGS += -O1 endif +CXXFLAGS += "-I/usr/include/tqt" PYTHONS := $(shell pyversions -vr debian/control) @@ -64,7 +65,7 @@ dbg-build-%/configure-stamp: -l /usr/include/python$*_d \ -v /usr/share/sip/tqt \ -m /usr/lib/python$*/config_d \ - CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g" STRIP="" + CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP="" touch $@ build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp) @@ -105,7 +106,7 @@ install-arch: build mkdir -p debian/python-tqt-gl-dbg/$$pylib;\ mv debian/python-tqt-dbg/$$pylib/qtgl.so \ debian/python-tqt-gl-dbg/$$pylib/;\ - mkdir -p debian/python-qtext-dbg/$$pylib;\ + mkdir -p debian/python-tqtext-dbg/$$pylib;\ mv debian/python-tqt-dbg/$$pylib/qtext.so \ debian/python-tqtext-dbg/$$pylib/;\ done diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules index 90f208768..28d432240 100755 --- a/ubuntu/maverick/dependencies/python-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/python-tqt/debian/rules @@ -25,6 +25,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) else CXXFLAGS += -O1 endif +CXXFLAGS += "-I/usr/include/tqt" PYTHONS := $(shell pyversions -vr debian/control) @@ -64,7 +65,7 @@ dbg-build-%/configure-stamp: -l /usr/include/python$*_d \ -v /usr/share/sip/tqt \ -m /usr/lib/python$*/config_d \ - CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g" STRIP="" + CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP="" touch $@ build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp) @@ -105,7 +106,7 @@ install-arch: build mkdir -p debian/python-tqt-gl-dbg/$$pylib;\ mv debian/python-tqt-dbg/$$pylib/qtgl.so \ debian/python-tqt-gl-dbg/$$pylib/;\ - mkdir -p debian/python-qtext-dbg/$$pylib;\ + mkdir -p debian/python-tqtext-dbg/$$pylib;\ mv debian/python-tqt-dbg/$$pylib/qtext.so \ debian/python-tqtext-dbg/$$pylib/;\ done From 737ded8949924f3d061ddc639a1fba3b9e0ca732 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 3 Dec 2011 22:07:11 -0600 Subject: [PATCH 4/5] Same as prior commit --- debian/lenny/dependencies/python-tqt/debian/rules | 2 +- debian/squeeze/dependencies/python-tqt/debian/rules | 2 +- ubuntu/maverick/dependencies/python-tqt/debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/dependencies/python-tqt/debian/rules b/debian/lenny/dependencies/python-tqt/debian/rules index 28d432240..ebb91c6e4 100755 --- a/debian/lenny/dependencies/python-tqt/debian/rules +++ b/debian/lenny/dependencies/python-tqt/debian/rules @@ -88,7 +88,7 @@ install-indep: configure for version in ${PYTHONS}; do\ pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \ mkdir -p debian/python-tqt-dev/$$pylib;\ - install -m 644 -o root -g root build-$$version/pytqtconfig.py debian/python-tqt-dev/$$pylib;\ + install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\ done dh_install -i diff --git a/debian/squeeze/dependencies/python-tqt/debian/rules b/debian/squeeze/dependencies/python-tqt/debian/rules index 28d432240..ebb91c6e4 100755 --- a/debian/squeeze/dependencies/python-tqt/debian/rules +++ b/debian/squeeze/dependencies/python-tqt/debian/rules @@ -88,7 +88,7 @@ install-indep: configure for version in ${PYTHONS}; do\ pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \ mkdir -p debian/python-tqt-dev/$$pylib;\ - install -m 644 -o root -g root build-$$version/pytqtconfig.py debian/python-tqt-dev/$$pylib;\ + install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\ done dh_install -i diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules index 28d432240..ebb91c6e4 100755 --- a/ubuntu/maverick/dependencies/python-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/python-tqt/debian/rules @@ -88,7 +88,7 @@ install-indep: configure for version in ${PYTHONS}; do\ pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \ mkdir -p debian/python-tqt-dev/$$pylib;\ - install -m 644 -o root -g root build-$$version/pytqtconfig.py debian/python-tqt-dev/$$pylib;\ + install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\ done dh_install -i From 7d0fe729b027f5e966a3ef7aecaecbed287ca945 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 3 Dec 2011 22:10:18 -0600 Subject: [PATCH 5/5] Same as prior commit --- debian/lenny/dependencies/python-tqt/debian/control | 2 +- debian/squeeze/dependencies/python-tqt/debian/control | 2 +- ubuntu/maverick/dependencies/python-tqt/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/dependencies/python-tqt/debian/control b/debian/lenny/dependencies/python-tqt/debian/control index c7b03ffe4..79b5b4582 100644 --- a/debian/lenny/dependencies/python-tqt/debian/control +++ b/debian/lenny/dependencies/python-tqt/debian/control @@ -72,7 +72,7 @@ Package: python-tqtext-dbg Priority: extra Section: debug Architecture: any -Depends: ${shlibs:Depends}, python-dbg, python-qtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} Description: TQt debug extensions for PyQt PyQt debug Extensions. Contains: . diff --git a/debian/squeeze/dependencies/python-tqt/debian/control b/debian/squeeze/dependencies/python-tqt/debian/control index c7b03ffe4..79b5b4582 100644 --- a/debian/squeeze/dependencies/python-tqt/debian/control +++ b/debian/squeeze/dependencies/python-tqt/debian/control @@ -72,7 +72,7 @@ Package: python-tqtext-dbg Priority: extra Section: debug Architecture: any -Depends: ${shlibs:Depends}, python-dbg, python-qtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} Description: TQt debug extensions for PyQt PyQt debug Extensions. Contains: . diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/control b/ubuntu/maverick/dependencies/python-tqt/debian/control index c7b03ffe4..79b5b4582 100644 --- a/ubuntu/maverick/dependencies/python-tqt/debian/control +++ b/ubuntu/maverick/dependencies/python-tqt/debian/control @@ -72,7 +72,7 @@ Package: python-tqtext-dbg Priority: extra Section: debug Architecture: any -Depends: ${shlibs:Depends}, python-dbg, python-qtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} Description: TQt debug extensions for PyQt PyQt debug Extensions. Contains: .