[Python-modules-commits] r3232 - in /packages/python-qt4/trunk/debian: control python-qt4-dbus.install rules
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Tue Sep 11 16:40:02 UTC 2007
Author: shlomme
Date: Tue Sep 11 16:40:02 2007
New Revision: 3232
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3232
Log:
* fix handling of dbus debug modules
Modified:
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/python-qt4-dbus.install
packages/python-qt4/trunk/debian/rules
Modified: packages/python-qt4/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/control?rev=3232&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/control (original)
+++ packages/python-qt4/trunk/debian/control Tue Sep 11 16:40:02 2007
@@ -47,16 +47,6 @@
.
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
Provides: ${python:Provides}
@@ -72,6 +62,7 @@
Priority: extra
Architecture: any
Depends: python-qt4-gl (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends}
+XB-Python-Version: ${python:Versions}
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.
@@ -93,6 +84,7 @@
Priority: extra
Architecture: any
Depends: python-qt4-sql (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends}
+XB-Python-Version: ${python:Versions}
Description: Python bindings for Qt4's SQL module (debug extension)
The SQL module of Qt4 provides widgets and utility classes for
SQL database access.
Modified: packages/python-qt4/trunk/debian/python-qt4-dbus.install
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/python-qt4-dbus.install?rev=3232&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/python-qt4-dbus.install (original)
+++ packages/python-qt4/trunk/debian/python-qt4-dbus.install Tue Sep 11 16:40:02 2007
@@ -1,1 +1,1 @@
-/var/lib/python-support/python*/dbus/mainloop/*
+usr/lib/python*/dbus/mainloop/*
Modified: packages/python-qt4/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/rules?rev=3232&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/rules (original)
+++ packages/python-qt4/trunk/debian/rules Tue Sep 11 16:40:02 2007
@@ -18,7 +18,8 @@
PYTHONS := $(shell pyversions -vr debian/control)
-DEFAULT_PYTHON := $(shell pyversions -d)
+DEFAULT_PYTHON := $(shell pyversions -vd)
+
GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
ifneq (,$(filter $(GCCVER),4.2 4.3))
@@ -26,6 +27,8 @@
else
SPLIT=10
endif
+
+.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
@@ -54,7 +57,7 @@
-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
+ CXXFLAGS_RELEASE="-O0 -g" STRIP="" MOC=moc-qt4
touch $@
build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
@@ -87,28 +90,22 @@
dh_clean -k -a
dh_installdirs -a
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/; \
+ $(MAKE) -C build-$$v install \
+ INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp; \
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
+ 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; \
+ done
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
+# need python-dbus-dbg for that!
+# cp -p debian/python-qt4-dbus.install debian/python-qt4-dbus-dbg.install
dh_install -a --sourcedir=$(CURDIR)/debian/tmp
@@ -119,6 +116,24 @@
b=$$(basename $$i .so); \
mv $$i $$(dirname $$i)/$${b}_d.so; \
done
+
+ : # make the dbus extension available in /var
+ set -e; \
+ for v in ${PYTHONS}; do \
+ d=debian/python-qt4-dbus; \
+ mkdir -p $$d/usr/lib/python$$v/dbus/mainloop; \
+ mv $$d/var/lib/python-support/python$$v/dbus/mainloop/qt.so \
+ $$d/usr/lib/python$$v/dbus/mainloop/; \
+ ln -sf /usr/lib/python$$v/dbus/mainloop/qt.so \
+ $$d/var/lib/python-support/python$$v/dbus/mainloop/qt.so; \
+ done
+# d=debian/python-qt4-dbus-dbg; \
+# mkdir -p $$d/usr/lib/python$$v/dbus/mainloop; \
+# mv $$d/var/lib/python-support/python$$v/dbus/mainloop/qt_d.so \
+# $$d/usr/lib/python$$v/dbus/mainloop/; \
+# ln -sf /usr/lib/python$$v/dbus/mainloop/qt_d.so \
+ $$d/var/lib/python-support/python$$v/dbus/mainloop/qt_d.so; \
+
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 {} \;
@@ -132,7 +147,7 @@
dh_testroot
-cd designer && make distclean
-cd qpy/QtDesigner && make distclean
- rm -f designer/python.pro designer/Makefile *-stamp
+ rm -f designer/python.pro designer/Makefile *-stamp debian/python-*-dbg.install
rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) sip/Qt
dh_clean
@@ -147,8 +162,8 @@
dh_installdocs -A NEWS THANKS
dh_installexamples
dh_link
- set -e; \
- for p in python-qt4 python-qt4-gl python-qt4-sql python-qt4-dbus; do \
+ set -e; \
+ for p in python-qt4 python-qt4-gl python-qt4-sql; 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; \
More information about the Python-modules-commits
mailing list