[Python-modules-commits] r3223 - in /packages/python-qt4/trunk/debian: changelog control rules
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Mon Sep 10 20:17:06 UTC 2007
Author: shlomme
Date: Mon Sep 10 20:17:06 2007
New Revision: 3223
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3223
Log:
* merge back changes from Ubuntu
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/rules
Modified: packages/python-qt4/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/changelog?rev=3223&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/changelog (original)
+++ packages/python-qt4/trunk/debian/changelog Mon Sep 10 20:17:06 2007
@@ -1,3 +1,10 @@
+python-qt4 (4.3-6) UNRELEASED; urgency=low
+
+ * Merged back changes from Ubuntu:
+ * Added debug packages. (Closes: #435652)
+
+ -- Torsten Marek <shlomme at debian.org> Mon, 03 Sep 2007 23:23:47 +0200
+
python-qt4 (4.3-5) unstable; urgency=low
* Added DPMT to uploaders field.
Modified: packages/python-qt4/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/control?rev=3223&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/control (original)
+++ packages/python-qt4/trunk/debian/control Mon Sep 10 20:17:06 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Torsten Marek <shlomme at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev, libqt4-dev (>= 4.3.0-1), sip4 (>= 4.7-1), python-sip4-dev (>= 4.7-1), python-central (>= 0.5.8), dpatch, python-dbus (>= 0.80.0), libdbus-1-dev (>= 1.0.2)
+Build-Depends: debhelper (>= 5.0.38), python-all-dev, libqt4-dev (>= 4.3.0-1), sip4 (>= 4.7-1), python-sip4-dev (>= 4.7-1), python-central (>= 0.5.8), dpatch, python-dbus (>= 0.80.0), libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip4-dbg
Standards-Version: 3.7.2
XS-Python-Version: all
@@ -11,6 +11,7 @@
Architecture: any
Provides: ${python:Provides}
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-sip4 (>= 4.7), python-sip4 (<< 4.8), python-elementtree, python-qt4-common
+Suggests: python-qt4-dbg
XB-Python-Version: ${python:Versions}
Description: Python bindings for Qt4
PyQt4 exposes the Qt4 API to Python. The following modules are supported:
@@ -25,6 +26,16 @@
.
Homepage: http://www.riverbankcomputing.co.uk/pyqt/index.php
+Package: python-qt4-dbg
+Priority: extra
+Architecture: any
+Depends: python-qt4 (= ${binary:Version}), python-dbg, python-sip4-dbg (>= 4.7), ${shlibs:Depends}
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for Qt4 (debug extensions)
+ PyQt4 exposes the Qt4 API to Python.
+ .
+ This package contains the extensions built for the python debug interpreter.
+
Package: python-qt4-dbus
Architecture: any
Provides: ${python:Provides}
@@ -35,6 +46,16 @@
with the DBus main loop.
.
Homepage: http://www.riverbankcomputing.co.uk/pyqt/index.php
+
+Package: python-qt4-dbus-dbg
+Priority: extra
+Architecture: any
+Depends: python-qt4-dbus (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends}
+Description: DBus Support for PyQt4 (debug extensions)
+ The DBus module of PyQt4 provides integration of PyQt4 applications
+ with the DBus main loop.
+ .
+ This package contains the extension built for the python debug interpreter.
Package: python-qt4-gl
Architecture: any
@@ -47,6 +68,16 @@
.
Homepage: http://www.riverbankcomputing.co.uk/pyqt/index.php
+Package: python-qt4-gl-dbg
+Priority: extra
+Architecture: any
+Depends: python-qt4-gl (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends}
+Description: Python bindings for Qt4's OpenGL module (debug extension)
+ The OpenGL module of Qt4 provides widgets and utility classes
+ for OpenGL rendering in a Qt4 application.
+ .
+ This package contains the extension built for the python debug interpreter.
+
Package: python-qt4-sql
Architecture: any
Provides: ${python:Provides}
@@ -57,6 +88,16 @@
SQL database access.
.
Homepage: http://www.riverbankcomputing.co.uk/pyqt/index.php
+
+Package: python-qt4-sql-dbg
+Priority: extra
+Architecture: any
+Depends: python-qt4-sql (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends}
+Description: Python bindings for Qt4's SQL module (debug extension)
+ The SQL module of Qt4 provides widgets and utility classes for
+ SQL database access.
+ .
+ This package contains the extension built for the python debug interpreter.
Package: python-qt4-dev
Architecture: all
Modified: packages/python-qt4/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/rules?rev=3223&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/rules (original)
+++ packages/python-qt4/trunk/debian/rules Mon Sep 10 20:17:06 2007
@@ -16,45 +16,58 @@
CXXFLAGS += -O1
endif
-PYTHONS=$(shell pyversions -vr debian/control)
+PYTHONS := $(shell pyversions -vr debian/control)
-DEFAULT_PYTHON=$(shell pyversions -d|sed 's/python//')
+DEFAULT_PYTHON := $(shell pyversions -d)
-configure: configure-stamp
-configure-stamp: patch-stamp
+GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
+ifneq (,$(filter $(GCCVER),4.2 4.3))
+ SPLIT=40
+else
+ SPLIT=10
+endif
+
+configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+
+build-%/configure-stamp: patch-stamp
dh_testdir
- rm -f failed-stamp
# echo yes is needed because of the license question in configure.py
# LIBS_* is unset to avoid linking to too many libraries
# STRIP is unset to let stripping be handled by dh_strip
- for version in ${PYTHONS};\
- do\
- if [ $$version != $(DEFAULT_PYTHON) ];\
- then DISABLE_DESIGNER_PLUGIN=--disable-designer-plugin;\
- fi;\
- mkdir -p build-$$version;\
- cd build-$$version;\
- echo yes | python$$version ../configure.py \
- -q /usr/bin/qmake-qt4 -c \
- -j 40 $$DISABLE_DESIGNER_PLUGIN LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \
- MOC=moc-qt4 CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP=""|| touch ../failed-stamp;\
- cd ..;\
- done
- test ! -e failed-stamp && touch $@
- rm -f failed-stamp
+ mkdir -p build-$*
+ cd build-$* && echo yes \
+ | python$* ../configure.py \
+ -q /usr/bin/qmake-qt4 -c \
+ -j $(SPLIT) -m /usr/lib/python$*/config \
+ $(if $(filter $(DEFAULT_PYTHON),$*),,--disable-designer-plugin) \
+ LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \
+ CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" MOC=moc-qt4
+ touch $@
-build: build-stamp
-build-stamp: configure
+dbg-build-%/configure-stamp: patch-stamp
dh_testdir
- rm -f failed-stamp
- for version in ${PYTHONS};\
- do\
- cd build-$$version;\
- $(MAKE) || touch ../failed-stamp;\
- cd ..;\
- done
- test ! -e failed-stamp && touch $@
- rm -f failed-stamp
+ mkdir -p dbg-build-$*
+ cd dbg-build-$* && echo yes \
+ | python$*-dbg ../configure.py \
+ -q /usr/bin/qmake-qt4 -c \
+ -j $(SPLIT) -l /usr/include/python$*_d \
+ -m /usr/lib/python$*/config_d \
+ $(if $(filter $(DEFAULT_PYTHON),$*),,--disable-designer-plugin) \
+ LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \
+ CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" MOC=moc-qt4
+ touch $@
+
+build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
+
+build-%/build-stamp: build-%/configure-stamp
+ dh_testdir
+ $(MAKE) -C build-$*
+ touch $@
+
+dbg-build-%/build-stamp: dbg-build-%/configure-stamp
+ dh_testdir
+ $(MAKE) -C dbg-build-$*
+ touch $@
install-indep: configure
dh_testdir
@@ -73,12 +86,42 @@
dh_testroot
dh_clean -k -a
dh_installdirs -a
- for version in ${PYTHONS};\
- do\
- cd build-$$version && $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp;\
- cd ..;\
+ for v in ${PYTHONS}; do \
+ $(MAKE) -C build-$$v install \
+ INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp; \
+ mv debian/tmp/var/lib/python-support/python$$v/dbus \
+ debian/tmp/usr/lib/python$$v/; \
done
+ rm -rf debian/tmp/var
+
+ set -e; \
+ d=debian/python-qt4-dbg; \
+ for v in ${PYTHONS}; do \
+ $(MAKE) -C dbg-build-$$v install DESTDIR=$(CURDIR)/$$d; \
+ mv $$d/usr/lib/python$$v/site-packages/PyQt4/pyqtconfig.py \
+ $$d/usr/lib/python$$v/site-packages/PyQt4/pyqtconfig_d.py; \
+ mv $$d/var/lib/python-support/python$$v/dbus \
+ $$d/usr/lib/python$$v/; \
+ done
+
+ rm -rf debian/python-qt4-dbg/var
+
+ cp -p debian/python-qt4-gl.install debian/python-qt4-gl-dbg.install
+ cp -p debian/python-qt4-sql.install debian/python-qt4-sql-dbg.install
+ cp -p debian/python-qt4-dbus.install debian/python-qt4-dbus-dbg.install
+
dh_install -a --sourcedir=$(CURDIR)/debian/tmp
+
+ find debian/python-qt4-dbg \
+ \( -name 'QtOpenGL.so' -o -name 'QtSql.so' \) | xargs rm -f
+
+ for i in $$(find debian/python-*-dbg -name '*.so'); do \
+ b=$$(basename $$i .so); \
+ mv $$i $$(dirname $$i)/$${b}_d.so; \
+ done
+ find debian/python-*-dbg ! -type d \
+ ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+ find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
cp pyuic/uic/pyuic.py debian/pyqt4-dev-tools/usr/bin/pyuic4
rm debian/*/usr/lib/*/site-packages/PyQt4/uic/pyuic.py
@@ -87,15 +130,10 @@
clean: unpatch
dh_testdir
dh_testroot
- rm -f *-stamp
- for version in ${PYTHONS};\
- do\
- rm -fr build-$$version;\
- done
-cd designer && make distclean
- rm -f designer/python.pro designer/Makefile
- rm -rf sip/Qt
-cd qpy/QtDesigner && make distclean
+ rm -f designer/python.pro designer/Makefile *-stamp
+ rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) sip/Qt
dh_clean
# Must not depend on anything. This is to be called by
@@ -109,7 +147,13 @@
dh_installdocs -A NEWS THANKS
dh_installexamples
dh_link
- dh_strip
+ set -e; \
+ for p in python-qt4 python-qt4-gl python-qt4-sql python-qt4-dbus; do \
+ DH_OPTIONS= dh_strip -p$$p; \
+ rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+ mkdir -p debian/$$p-dbg/usr/share/doc; \
+ ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+ done
dh_compress -X.py -X.bmp -X.ui -X.sql
dh_fixperms
# DH_PYCENTRAL=nomove is set in binary-indep since only
More information about the Python-modules-commits
mailing list