[Python-modules-commits] r8755 - in packages/sip4-qt3/trunk/debian (changelog control rules)

[shlomme at users.alioth.debian.org]

    Date: Tuesday, June 9, 2009 @ 18:54:14
  Author: shlomme
Revision: 8755

Add fix for #530846

Modified:
  packages/sip4-qt3/trunk/debian/changelog
  packages/sip4-qt3/trunk/debian/control
  packages/sip4-qt3/trunk/debian/rules

Modified: packages/sip4-qt3/trunk/debian/changelog
===================================================================
--- packages/sip4-qt3/trunk/debian/changelog	2009-06-09 16:01:34 UTC (rev 8754)
+++ packages/sip4-qt3/trunk/debian/changelog	2009-06-09 18:54:14 UTC (rev 8755)
@@ -3,6 +3,9 @@
   [ Torsten Marek ]
   * New upstream release
   * Removed debian/pycompat, not needed anymore
+  * debian/rules
+    - Install configuration modules in python-sip4{,-dbg} instead of 
+      python-sip4-dev (Closes: #530846)
 
   [ Bernd Zeimetz ]
   * Fixing override disparity: Set 'debug' as sectiong for the -dbg package.

Modified: packages/sip4-qt3/trunk/debian/control
===================================================================
--- packages/sip4-qt3/trunk/debian/control	2009-06-09 16:01:34 UTC (rev 8754)
+++ packages/sip4-qt3/trunk/debian/control	2009-06-09 18:54:14 UTC (rev 8755)
@@ -62,7 +62,6 @@
 Architecture: all
 Section: python
 Depends: ${python:Depends}, python-dev
-Replaces: python-sip4 (<< 4.7)
 Recommends: python-sip4 (>= ${source:Version})
 Description: Python/C++ bindings generator development files
  SIP is a tool for generating bindings for C++ classes with some ideas

Modified: packages/sip4-qt3/trunk/debian/rules
===================================================================
--- packages/sip4-qt3/trunk/debian/rules	2009-06-09 16:01:34 UTC (rev 8754)
+++ packages/sip4-qt3/trunk/debian/rules	2009-06-09 18:54:14 UTC (rev 8755)
@@ -86,27 +86,28 @@
 	ln -s ../python$*/sip.h \
 	    debian/python-sip4-dev/usr/include/python$*_d/sip.h
 	mkdir -p debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)
-	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)/
 	install -m 644 -o root -g root sipdistutils.py debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)
-	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_nd.py
-	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py
 
-install-arch: build 
+install-arch-pre:
 	dh_testdir
 	dh_testroot
 	dh_clean -k -a
 	dh_installdirs -a
 
-	for version in ${PYTHONS}; do\
-		$(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
-		$(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-sip4-dbg;\
-	done
+install-arch-%: 
+	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip4-dbg
+	mkdir -p debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/
+	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/
+	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_nd.py
+	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip4-dbg/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py
 
+install-arch: build install-arch-pre $(PYTHONS:%=install-arch-%)
 	for i in $$(find debian/python-sip4-dbg -name '*.so'); do \
 		b=$$(basename $$i .so); \
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
-	find debian/python-sip4-dbg ! -type d ! -name '*_d.so' | xargs rm -f
+	find debian/python-sip4-dbg ! -type d ! -name '*_d.*' | xargs rm -f
 	find debian/python-sip4-dbg -depth -empty -exec rmdir {} \;
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp