summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/dependencies
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick/dependencies')
-rw-r--r--ubuntu/maverick/dependencies/python-tqt/debian/control2
-rw-r--r--ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides22
-rw-r--r--ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.preinst35
-rw-r--r--ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs4
-rw-r--r--ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install2
-rwxr-xr-xubuntu/maverick/dependencies/python-tqt/debian/rules5
-rw-r--r--ubuntu/maverick/dependencies/sip4-tqt/debian/control2
-rw-r--r--[-rwxr-xr-x]ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links0
-rwxr-xr-xubuntu/maverick/dependencies/sip4-tqt/debian/rules5
9 files changed, 24 insertions, 53 deletions
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/control b/ubuntu/maverick/dependencies/python-tqt/debian/control
index 71f586675..4eb3719bd 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), 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
+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-dev (>= 2.6.6-3~), python-sip-dbg, python-all-dbg
Standards-Version: 3.8.4
Package: python-tqt
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
index 3d0ed6137..36e6c1349 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
@@ -1,15 +1,15 @@
# lintian test overriden as the files tripping this error are put into the source
# of the generated package. This is a false-positive
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qt/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtaxcontainer/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtcanvas/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtext/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtgl/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtnetwork/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtpe/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtsql/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qttable/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtui/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtxml/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.preinst b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.preinst
deleted file mode 100644
index b17b35a44..000000000
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.preinst
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# TODO: remove this file after releasing Squeeze
-set -e
-if [ "$1" = upgrade ]
-then
- if dpkg --compare-versions "$2" lt 3.17.6-2; then
- if which python >/dev/null 2>&1 && which pycentral >/dev/null 2>&1; then
- pycentral pkgremove python-qt-dev
- else
- flist=$(tempfile)
- find /usr/share/pycentral/python-qt-dev -depth -mindepth 2 \
- \( -name '*.py' -printf 'p %P\n' -o -printf '%y %P\n' \) \
- > $flist 2>/dev/null || true
- if [ -s $flist ]; then
- for d in /usr/lib/python[0-9].[0-9]; do
- case "$d" in */python2.1|*/python2.2) continue; esac
- while read t n; do
- case "$t" in
- p) rm -f $d/$n $d/${n}[co];;
- d) rmdir $d/$n 2>/dev/null || true;;
- *) rm -f $d/$n
- esac
- done < $flist
- done
- fi
- rm -f $flist
- dpkg -L python-qt-dev \
- | awk '/\/usr\/share\/pycentral/ {next} /\.py$/ {print $0"c\n" $0"o"}' \
- | xargs rm -f >&2
- fi
- fi
-fi
-
-#DEBHELPER#
-
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs
index dcd0e5b12..43a4fa9fa 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs
@@ -1,2 +1,2 @@
-usr/share/doc/python-qt3-doc/html
-usr/share/doc/python-qt3-doc/examples
+usr/share/doc/python-tqt-doc/html
+usr/share/doc/python-tqt-doc/examples
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install
index 840625c0a..65f82036b 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install
@@ -1 +1 @@
-doc/PyQt.html usr/share/doc/python-qt3-doc/html
+doc/PyQt.html usr/share/doc/python-tqt-doc/html
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules
index 86eca95c9..b0acb35f6 100755
--- a/ubuntu/maverick/dependencies/python-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/rules
@@ -32,6 +32,9 @@ CXXFLAGS += "-I/usr/include/tqt"
PYTHONS := $(shell pyversions -vr debian/control)
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
ifneq (,$(filter $(GCCVER),4.2 4.3))
@@ -154,7 +157,7 @@ endif
# dh_strip
dh_compress -X.py -X.bmp -X.ui -X.sql
dh_fixperms
- dh_pysupport
+ ${DH_PYTHON2}
dh_sip
dh_lintian
dh_installdeb
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/control b/ubuntu/maverick/dependencies/sip4-tqt/debian/control
index 825f458eb..7091f5392 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/control
+++ b/ubuntu/maverick/dependencies/sip4-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 (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1), libtqtinterface-dev
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), libtqtinterface-dev
Standards-Version: 3.8.4
XS-Python-Version: all
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links
index 26a9ded9b..26a9ded9b 100755..100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links
+++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
index 2286739d5..9073bd22f 100755
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
@@ -19,6 +19,9 @@ endif
PYTHONS := $(shell pyversions -vr debian/control)
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2 --no-dbg-cleaning,dh_pysupport)
+
-include /usr/share/python/python.mk
ifeq (,$(py_sitename))
py_sitename = site-packages
@@ -132,7 +135,7 @@ ifneq (,$(findstring -a, $(DH_OPTIONS)))
endif
dh_compress
dh_fixperms
- dh_pysupport
+ ${DH_PYTHON2}
dh_installdeb
dh_shlibdeps
dh_gencontrol