diff options
| author | Calvin Morrison <mutantturkey@gmail.com> | 2011-12-14 15:50:42 -0500 |
|---|---|---|
| committer | Calvin Morrison <mutantturkey@gmail.com> | 2011-12-14 15:50:42 -0500 |
| commit | fc98476aef6bf17768cfc0450bd25ac967d01834 (patch) | |
| tree | 7411b50fd18336185de9fb8520fd9154822020b4 /ubuntu/maverick/dependencies/python-tqt/debian | |
| parent | cc3f13111c121c8a39b9937bb2e1bf00207c9df0 (diff) | |
| parent | e9bf572672fe20775479a10b426d32379f4185d0 (diff) | |
| download | tde-packaging-fc98476aef6bf17768cfc0450bd25ac967d01834.tar.gz tde-packaging-fc98476aef6bf17768cfc0450bd25ac967d01834.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/dependencies/python-tqt/debian')
| -rw-r--r-- | ubuntu/maverick/dependencies/python-tqt/debian/control | 4 | ||||
| -rwxr-xr-x | ubuntu/maverick/dependencies/python-tqt/debian/rules | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/control b/ubuntu/maverick/dependencies/python-tqt/debian/control index 9354c760b..dffd4d77c 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 <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> -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), libtqtinterface-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 @@ -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/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules index 0e74c131e..ebb91c6e4 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) @@ -44,7 +45,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,13 +59,13 @@ 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 \ -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) @@ -87,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 @@ -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 |