[Python-modules-commits] r8355 - in packages/python-qt3/trunk/debian (7 files)
bzed at users.alioth.debian.org
bzed at users.alioth.debian.org
Tue May 5 19:41:52 UTC 2009
Date: Tuesday, May 5, 2009 @ 19:41:51
Author: bzed
Revision: 8355
* Merging changes from Ubuntu to build with python2.6.
* Migrate from python-central to python-support. This also makes sure
that we get rid of DH_PYCENTRAL=nomove.
- Adding debian/python-qt-dev.preinst to tell python-central to
remove its cruft. The preinst script should be removed after
the release of Squeeze.
Added:
packages/python-qt3/trunk/debian/python-qt-dev.preinst
Modified:
packages/python-qt3/trunk/debian/changelog
packages/python-qt3/trunk/debian/control
packages/python-qt3/trunk/debian/python-qt3-gl.install
packages/python-qt3/trunk/debian/python-qt3.install
packages/python-qt3/trunk/debian/python-qtext.install
packages/python-qt3/trunk/debian/rules
Modified: packages/python-qt3/trunk/debian/changelog
===================================================================
--- packages/python-qt3/trunk/debian/changelog 2009-05-05 17:32:25 UTC (rev 8354)
+++ packages/python-qt3/trunk/debian/changelog 2009-05-05 19:41:51 UTC (rev 8355)
@@ -1,8 +1,14 @@
-python-qt3 (3.17.6-2) UNRELEASED; urgency=low
+python-qt3 (3.17.6-2) unstable; urgency=low
* Uploading to unstable.
+ * Merging changes from Ubuntu to build with python2.6.
+ * Migrate from python-central to python-support. This also makes sure
+ that we get rid of DH_PYCENTRAL=nomove.
+ - Adding debian/python-qt-dev.preinst to tell python-central to
+ remove its cruft. The preinst script should be removed after
+ the release of Squeeze.
- -- Bernd Zeimetz <bzed at debian.org> Wed, 29 Apr 2009 16:01:14 +0200
+ -- Bernd Zeimetz <bzed at debian.org> Tue, 05 May 2009 21:40:37 +0200
python-qt3 (3.17.6-1) experimental; urgency=low
@@ -29,7 +35,7 @@
* Bumped standards version to 3.7.3, no changes necessary.
* Added Homepage, Vcs-Svn and Vcs-Browser fields in debian/control.
* Changed priority of python-qt3-dbg to extra.
-
+
-- Torsten Marek <shlomme at debian.org> Sun, 16 Dec 2007 16:21:21 +0100
python-qt3 (3.17.3-3) unstable; urgency=low
@@ -51,7 +57,7 @@
* New upstream release
* pyqtconfig.py is now in python-qt-dev
-
+
-- Torsten Marek <shlomme at debian.org> Tue, 31 Jul 2007 21:45:27 +0200
python-qt3 (3.17.2-1) unstable; urgency=low
Modified: packages/python-qt3/trunk/debian/control
===================================================================
--- packages/python-qt3/trunk/debian/control 2009-05-05 17:32:25 UTC (rev 8354)
+++ packages/python-qt3/trunk/debian/control 2009-05-05 19:41:51 UTC (rev 8355)
@@ -3,8 +3,7 @@
Priority: optional
Maintainer: Ricardo Javier Cardenes Medina <rcardenes at debian.org>
Uploaders: Torsten Marek <shlomme at debian.org>, Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-10), libqt3-mt-dev (>= 3:3.3.4-4), qt3-dev-tools (>= 3:3.3.4-4), qt3-apps-dev (>= 3:3.3.4-4), sip4 (>= 4.7), python-sip4-dev (>= 4.7), libqscintilla-dev (>= 1.7), python-central (>= 0.5.8), dpatch, python-sip4-dbg, python-all-dbg
-XS-Python-Version: all
+Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-10), libqt3-mt-dev (>= 3:3.3.4-4), qt3-dev-tools (>= 3:3.3.4-4), qt3-apps-dev (>= 3:3.3.4-4), sip4 (>= 4.7), python-sip4-dev (>= 4.7), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), dpatch, python-sip4-dbg, python-all-dbg
Standards-Version: 3.8.0
Homepage: http://www.riverbankcomputing.co.uk/pyqt/index.php
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-qt3/trunk/
@@ -15,7 +14,6 @@
Depends: ${shlibs:Depends}, ${python:Depends}, python-sip4 (>= 4.7), python-sip4 (<= 4.8)
Suggests: python-qt3-gl, python-qt3-doc, libqt3-mt-mysql|libqt3-mt-odbc|libqt3-mt-psql
Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
Description: Qt3 bindings for Python
Python binding module that allows use of Qt X Window toolkit v3.
You can use it to create portable graphics-capable scripts (there
@@ -30,7 +28,6 @@
Architecture: any
Priority: extra
Depends: ${shlibs:Depends}, python-dbg, python-qt3 (= ${binary:Version}), python-sip4-dbg (>= 4.7)
-XB-Python-Version: ${python:Versions}
Description: Qt3 bindings for Python (debug extension)
Python binding module that allows use of Qt X Window toolkit v3.
You can use it to create portable graphics-capable scripts (there
@@ -43,7 +40,6 @@
Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2)
Suggests: python-qt3-doc
Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
Description: Qt3 OpenGL bindings for Python
Python binding module that allows use of the OpenGL facilities
offered by the Qt X Window toolkit v3. You can use it to create
@@ -66,7 +62,6 @@
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (= ${binary:Version})
Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
Description: Qt extensions for PyQt
PyQt Extensions. Contains:
.
@@ -97,7 +92,6 @@
Suggests: sip4
Replaces: python-qt3 (<< 3.17.3-2)
Architecture: all
-XB-Python-Version: ${python:Versions}
Description: Qt bindings for Python - Development files
Development .sip files with definitions of PyQt classes. They
are needed to build PyQt, but also as building blocks of other
Added: packages/python-qt3/trunk/debian/python-qt-dev.preinst
===================================================================
--- packages/python-qt3/trunk/debian/python-qt-dev.preinst (rev 0)
+++ packages/python-qt3/trunk/debian/python-qt-dev.preinst 2009-05-05 19:41:51 UTC (rev 8355)
@@ -0,0 +1,12 @@
+#!/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
+ pycentral pkgremove python-qt-dev
+ fi
+fi
+
+#DEBHELPER#
+
Modified: packages/python-qt3/trunk/debian/python-qt3-gl.install
===================================================================
--- packages/python-qt3/trunk/debian/python-qt3-gl.install 2009-05-05 17:32:25 UTC (rev 8354)
+++ packages/python-qt3/trunk/debian/python-qt3-gl.install 2009-05-05 19:41:51 UTC (rev 8355)
@@ -1 +1 @@
-usr/lib/python*/site-packages/qtgl.so
+usr/lib/python*/*-packages/qtgl.so
Modified: packages/python-qt3/trunk/debian/python-qt3.install
===================================================================
--- packages/python-qt3/trunk/debian/python-qt3.install 2009-05-05 17:32:25 UTC (rev 8354)
+++ packages/python-qt3/trunk/debian/python-qt3.install 2009-05-05 19:41:51 UTC (rev 8355)
@@ -1,7 +1,7 @@
-usr/lib/python*/site-packages/qtcanvas.so
-usr/lib/python*/site-packages/qtnetwork.so
-usr/lib/python*/site-packages/qtsql.so
-usr/lib/python*/site-packages/qttable.so
-usr/lib/python*/site-packages/qtui.so
-usr/lib/python*/site-packages/qtxml.so
-usr/lib/python*/site-packages/qt.so
+usr/lib/python*/*-packages/qtcanvas.so
+usr/lib/python*/*-packages/qtnetwork.so
+usr/lib/python*/*-packages/qtsql.so
+usr/lib/python*/*-packages/qttable.so
+usr/lib/python*/*-packages/qtui.so
+usr/lib/python*/*-packages/qtxml.so
+usr/lib/python*/*-packages/qt.so
Modified: packages/python-qt3/trunk/debian/python-qtext.install
===================================================================
--- packages/python-qt3/trunk/debian/python-qtext.install 2009-05-05 17:32:25 UTC (rev 8354)
+++ packages/python-qt3/trunk/debian/python-qtext.install 2009-05-05 19:41:51 UTC (rev 8355)
@@ -1 +1 @@
-usr/lib/python*/site-packages/qtext.so
+usr/lib/python*/*-packages/qtext.so
Modified: packages/python-qt3/trunk/debian/rules
===================================================================
--- packages/python-qt3/trunk/debian/rules 2009-05-05 17:32:25 UTC (rev 8354)
+++ packages/python-qt3/trunk/debian/rules 2009-05-05 19:41:51 UTC (rev 8355)
@@ -7,6 +7,15 @@
include /usr/share/dpatch/dpatch.make
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+py_sitename = site-packages
+py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+py_sitename_sh = $(py_sitename)
+py_libdir_sh = $(py_libdir)
+endif
+
+
DOC=$(CURDIR)/debian/python-qt3-doc/usr/share/doc/python-qt3-doc
INSTDIR=$(CURDIR)/debian
@@ -21,6 +30,7 @@
PYTHONS := $(shell pyversions -vr debian/control)
+
GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
ifneq (,$(filter $(GCCVER),4.2 4.3))
SPLIT=40
@@ -38,7 +48,7 @@
| python$* ../configure.py \
-c -n /usr/include/qscintilla \
-o /usr/lib -u -j $(SPLIT) \
- -d /usr/lib/python$*/site-packages \
+ -d /usr/lib/python$*/$(call py_sitename,$*) \
-l /usr/include/python$* \
-v /usr/share/sip/qt \
-m /usr/lib/python$*/config \
@@ -52,7 +62,7 @@
| python$*-dbg ../configure.py \
-c -n /usr/include/qscintilla \
-o /usr/lib -u -j $(SPLIT) \
- -d /usr/lib/python$*/site-packages \
+ -d /usr/lib/python$*/$(call py_sitename,$*) \
-l /usr/include/python$*_d \
-v /usr/share/sip/qt \
-m /usr/lib/python$*/config_d \
@@ -77,8 +87,9 @@
dh_clean -k -i
dh_installdirs -i
for version in ${PYTHONS}; do\
- mkdir -p debian/python-qt-dev/usr/lib/python$$version/site-packages;\
- install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-qt-dev/usr/lib/python$$version/site-packages;\
+ pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
+ mkdir -p debian/python-qt-dev/$$pylib;\
+ install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-qt-dev/$$pylib;\
done
dh_install -i
@@ -91,13 +102,14 @@
$(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
done
for version in ${PYTHONS}; do \
+ pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
$(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-qt3-dbg;\
- mkdir -p debian/python-qt3-gl-dbg/usr/lib/python$$version/site-packages;\
- mv debian/python-qt3-dbg/usr/lib/python$$version/site-packages/qtgl.so \
- debian/python-qt3-gl-dbg/usr/lib/python$$version/site-packages/;\
- mkdir -p debian/python-qtext-dbg/usr/lib/python$$version/site-packages;\
- mv debian/python-qt3-dbg/usr/lib/python$$version/site-packages/qtext.so \
- debian/python-qtext-dbg/usr/lib/python$$version/site-packages/;\
+ mkdir -p debian/python-qt3-gl-dbg/$$pylib;\
+ mv debian/python-qt3-dbg/$$pylib/qtgl.so \
+ debian/python-qt3-gl-dbg/$$pylib/;\
+ mkdir -p debian/python-qtext-dbg/$$pylib;\
+ mv debian/python-qt3-dbg/$$pylib/qtext.so \
+ debian/python-qtext-dbg/$$pylib/;\
done
dh_install -a --sourcedir=$(CURDIR)/debian/tmp
@@ -140,7 +152,7 @@
# dh_strip
dh_compress -X.py -X.bmp -X.ui -X.sql
dh_fixperms
- DH_PYCENTRAL=nomove dh_pycentral
+ dh_pysupport
dh_installdeb
dh_shlibdeps
dh_gencontrol
More information about the Python-modules-commits
mailing list