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

[mcasadevall at users.alioth.debian.org]

    Date: Wednesday, July 7, 2010 @ 09:48:50
  Author: mcasadevall
Revision: 13827

* Added python3 support (Closes: #587072)
  - Merged in patch from Per W, thank you.

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	2010-07-07 09:05:14 UTC (rev 13826)
+++ packages/sip4-qt3/trunk/debian/changelog	2010-07-07 09:48:50 UTC (rev 13827)
@@ -1,3 +1,10 @@
+sip4-qt3 (4.10.2-2) unstable; urgency=low
+
+  * Added python3 support (Closes: #587072)
+    - Merged in patch from Per W, thank you.
+
+ -- Michael Casadevall <mcasadevall at debian.org>  Wed, 07 Jul 2010 05:48:23 -0400
+
 sip4-qt3 (4.10.2-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/sip4-qt3/trunk/debian/control
===================================================================
--- packages/sip4-qt3/trunk/debian/control	2010-07-07 09:05:14 UTC (rev 13826)
+++ packages/sip4-qt3/trunk/debian/control	2010-07-07 09:48:50 UTC (rev 13827)
@@ -2,8 +2,10 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Torsten Marek <shlomme at debian.org>, Bernd Zeimetz <bzed at debian.org>, Michael Casadevall <mcasadevall at debian.org>
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1)
+Uploaders: Torsten Marek <shlomme at debian.org>, Bernd Zeimetz <bzed at debian.org>,
+ Michael Casadevall <mcasadevall at debian.org>
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg,
+ python-support (>= 0.7.1), python3-all-dev, python3-all-dbg
 Standards-Version: 3.8.4
 Homepage: http://www.riverbankcomputing.co.uk/software/sip/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sip4-qt3/trunk

Modified: packages/sip4-qt3/trunk/debian/rules
===================================================================
--- packages/sip4-qt3/trunk/debian/rules	2010-07-07 09:05:14 UTC (rev 13826)
+++ packages/sip4-qt3/trunk/debian/rules	2010-07-07 09:48:50 UTC (rev 13827)
@@ -14,7 +14,7 @@
 	CFLAGS += -O2 -g
 endif
 
-PYTHONS	:= $(shell pyversions -vr debian/control)
+PYTHONS	:= $(shell pyversions -vr debian/control) 3.1
 
 -include /usr/share/python/python.mk
 ifeq (,$(py_sitename))
@@ -96,7 +96,12 @@
 	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-dbg
 	mkdir -p debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/
-	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/
+	echo "$*"
+	if [ "$*" \< "3" ]; then \
+		install -m 644 -o root -g root debian/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/; \
+	else \
+		install -m 644 -o root -g root debian/sipconfig_py3.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/sipconfig.py; \
+	fi
 	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_nd.py
 	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-dbg/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py
 	mkdir -p debian/python-sip-dev/usr/include/python$*