[Python-modules-commits] r22817 - in packages/sip4/trunk/debian (5 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Tue Oct 23 00:25:04 UTC 2012 

    Date: Tuesday, October 23, 2012 @ 00:25:02
  Author: kitterman
Revision: 22817

* Enable building for multiple supported python3 versions
  - Support python3.3 and later file locations
  - Generate sipconfig_py3.py during configure to account for different
    sipconfig contents for python3.2/3.3
* Update debian/rules to properly install sipconfig data for python3-sip-dbg
* Use/usr/share/doc symlinks for python-sip-dev, python3-sip-dbg, and
  python3-sip-dev

Added:
  packages/sip4/trunk/debian/sipconfig_py3.header
  packages/sip4/trunk/debian/sipconfig_py3.snippet
Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/rules
  packages/sip4/trunk/debian/sipconfig_py3.py

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2012-10-22 18:57:52 UTC (rev 22816)
+++ packages/sip4/trunk/debian/changelog	2012-10-23 00:25:02 UTC (rev 22817)
@@ -1,3 +1,15 @@
+sip4 (4.14-2) experimental; urgency=low
+
+  * Enable building for multiple supported python3 versions
+    - Support python3.3 and later file locations
+    - Generate sipconfig_py3.py during configure to account for different
+      sipconfig contents for python3.2/3.3
+  * Update debian/rules to properly install sipconfig data for python3-sip-dbg
+  * Use/usr/share/doc symlinks for python-sip-dev, python3-sip-dbg, and
+    python3-sip-dev
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 22 Oct 2012 19:40:12 -0400
+
 sip4 (4.14-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/sip4/trunk/debian/rules
===================================================================
--- packages/sip4/trunk/debian/rules	2012-10-22 18:57:52 UTC (rev 22816)
+++ packages/sip4/trunk/debian/rules	2012-10-23 00:25:02 UTC (rev 22817)
@@ -22,7 +22,8 @@
 	LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
 endif
 
-PYTHONS	:= $(shell pyversions -vr) $(shell py3versions -vd)
+PYTHONS	:= $(shell pyversions -vr) $(shell py3versions -vr)
+PYTHON3S := $(shell py3versions -vr)
 
 -include /usr/share/python/python.mk
 ifeq (,$(py_sitename))
@@ -32,12 +33,11 @@
 py_libdir_sh = $(py_libdir)
 endif
 
-
 .PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
 
 configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
 
-build-%/configure-stamp:
+build-%/configure-stamp: $(PYTHON3S:%=sipconfig-%)
 	dh_testdir
 	mkdir -p build-$*
 	cd build-$* \
@@ -60,8 +60,14 @@
                         LFLAGS="${LDFLAGS}" LFLAGS_RELEASE="" STRIP="" 
 	touch $@
 
+sipconfig-3.%:
+	cat $(CURDIR)/debian/sipconfig_py3.py $(CURDIR)/debian/sipconfig_py3.snippet \
+		> $(CURDIR)/debian/sipconfig_py3.py.tmp
+	sed -e "s/@MINORVERS@/$*/g" <$(CURDIR)/debian/sipconfig_py3.py.tmp \
+		> $(CURDIR)/debian/sipconfig_py3.py
+	touch $@
 
-build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
+build: $(PYTHON3S:%=sipconfig-%) $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
 
 build-%/build-stamp: build-%/configure-stamp
 	dh_testdir
@@ -81,6 +87,9 @@
 	dh_testroot
 	rm -rf *-stamp siputils.pyc __pycache__ $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
 	rm -rf $(CURDIR)/siplib/sip.h $(CURDIR)/siplib/siplib.c $(CURDIR)/siplib/siplib.sbf
+	cp $(CURDIR)/debian/sipconfig_py3.header $(CURDIR)/debian/sipconfig_py3.py
+	rm -rf $(CURDIR)/debian/sipconfig_py3.py.tmp
+	rm -rf $(CURDIR)/sipconfig-3.*
 	dh_clean debian/python3-sip.pydist
 
 install-arch: build
@@ -104,41 +113,60 @@
 		b=$$(basename $$i .so); \
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
-	find debian/python*-sip-dbg ! -type d ! -name '*_d.*' | xargs rm -f
+	find debian/python*-sip-dbg ! -type d ! -name '*_d.*' ! -name *sipconfig_d* | xargs rm -f
 	find debian/python*-sip-dbg -depth -empty -exec rmdir {} \;
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
 	install -m 755 -o root -g root debian/dh_sip debian/python-sip-dev/usr/bin
 
+install-arch-3.2:
+	$(MAKE) -C build-3.2 install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-3.2 install DESTDIR=$(CURDIR)/debian/python3-sip-dbg
+	mkdir -p debian/python3-sip/usr/lib/python3.2/dist-packages/
+	mkdir -p debian/python3-sip-dbg/usr/lib/python3/dist-packages/
+	mkdir -p debian/python3-sip-dbg/usr/lib/python3.2/dist-packages/
+	install -m 644 -o root -g root debian/sipconfig_py3.py debian/python3-sip/usr/lib/python3.2/dist-packages/sipconfig.py
+	install -m 644 -o root -g root build-3.2/sipconfig.py debian/python3-sip/usr/lib/python3.2/dist-packages/sipconfig_nd2.py
+	mv debian/python3-sip-dbg/usr/lib/python3.2/dist-packages/sipconfig.py debian/python3-sip-dbg/usr/lib/python3/dist-packages/sipconfig_d2.py
+	mkdir -p debian/python3-sip-dev/usr/include/python3.2mu
+	install -m 644 -o root -g root siplib/sip.h debian/python3-sip-dev/usr/include/python3.2mu/
+	mkdir -p debian/python3-sip-dev/usr/include/python3.2dmu
+	ln -s ../python3.2mu/sip.h \
+	    debian/python3-sip-dev/usr/include/python3.2dmu/sip.h
+	mkdir -p debian/python3-sip-dev/usr/lib/python3.2/dist-packages
+	install -m 644 -o root -g root sipdistutils.py debian/python3-sip-dev/usr/lib/python3.2/dist-packages
+
 install-arch-3.%:
 	$(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-sip-dbg
 	mkdir -p debian/python3-sip/usr/lib/python3.$*/dist-packages/
+	mkdir -p debian/python3-sip-dbg/usr/lib/python3/dist-packages/
+	mkdir -p debian/python3-sip-dbg/usr/lib/python3.$*/dist-packages/
 	install -m 644 -o root -g root debian/sipconfig_py3.py debian/python3-sip/usr/lib/python3.$*/dist-packages/sipconfig.py
-	install -m 644 -o root -g root build-3.$*/sipconfig.py debian/python3-sip/usr/lib/python3.$*/dist-packages/sipconfig_nd.py
-	install -m 644 -o root -g root dbg-build-3.$*/sipconfig.py debian/python3-sip-dbg/usr/lib/python3.$*/dist-packages/sipconfig_d.py
-	mkdir -p debian/python3-sip-dev/usr/include/python3.$*mu
-	install -m 644 -o root -g root siplib/sip.h debian/python3-sip-dev/usr/include/python3.$*mu/
-	mkdir -p debian/python3-sip-dev/usr/include/python3.$*dmu
-	ln -s ../python3.$*mu/sip.h \
-	    debian/python3-sip-dev/usr/include/python3.$*dmu/sip.h
+	install -m 644 -o root -g root build-3.$*/sipconfig.py debian/python3-sip/usr/lib/python3.$*/dist-packages/sipconfig_nd$*.py
+	mv debian/python3-sip-dbg/usr/lib/python3.$*/dist-packages/sipconfig.py debian/python3-sip-dbg/usr/lib/python3/dist-packages/sipconfig_d$*.py
+	mkdir -p debian/python3-sip-dev/usr/include/python3.$*m
+	install -m 644 -o root -g root siplib/sip.h debian/python3-sip-dev/usr/include/python3.$*m/
+	mkdir -p debian/python3-sip-dev/usr/include/python3.$*dm
+	ln -s ../python3.$*m/sip.h \
+	    debian/python3-sip-dev/usr/include/python3.$*dm/sip.h
 	mkdir -p debian/python3-sip-dev/usr/lib/python3.$*/dist-packages
 	install -m 644 -o root -g root sipdistutils.py debian/python3-sip-dev/usr/lib/python3.$*/dist-packages
 
-install-arch-%:
-	$(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,$*)/
-	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$*
-	install -m 644 -o root -g root siplib/sip.h debian/python-sip-dev/usr/include/python$*/
-	mkdir -p debian/python-sip-dev/usr/include/python$*_d
-	ln -s ../python$*/sip.h \
-	    debian/python-sip-dev/usr/include/python$*_d/sip.h
-	mkdir -p debian/python-sip-dev/usr/lib/python$*/$(call py_sitename,$*)
-	install -m 644 -o root -g root sipdistutils.py debian/python-sip-dev/usr/lib/python$*/$(call py_sitename,$*)
+install-arch-2%:
+	$(MAKE) -C build-2$* install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-2$* install DESTDIR=$(CURDIR)/debian/python-sip-dbg
+	mkdir -p debian/python-sip/usr/lib/python2$*/$(call py_sitename,2$*)/
+	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip/usr/lib/python2$*/$(call py_sitename,2$*)/
+	install -m 644 -o root -g root build-2$*/sipconfig.py debian/python-sip/usr/lib/python2$*/$(call py_sitename,2$*)/sipconfig_nd.py
+	install -m 644 -o root -g root dbg-build-2$*/sipconfig.py debian/python-sip-dbg/usr/lib/python2$*/$(call py_sitename,2$*)/sipconfig_d.py
+	mkdir -p debian/python-sip-dev/usr/include/python2$*
+	install -m 644 -o root -g root siplib/sip.h debian/python-sip-dev/usr/include/python2$*/
+	mkdir -p debian/python-sip-dev/usr/include/python2$*_d
+	ln -s ../python2$*/sip.h \
+	    debian/python-sip-dev/usr/include/python2$*_d/sip.h
+	mkdir -p debian/python-sip-dev/usr/lib/python2$*/$(call py_sitename,2$*)
+	install -m 644 -o root -g root sipdistutils.py debian/python-sip-dev/usr/lib/python2$*/$(call py_sitename,2$*)
 
 
 # Must not depend on anything. This is to be called by
@@ -161,6 +189,15 @@
 	rm -rf debian/python-sip-dbg/usr/share/doc/python-sip-dbg
 	mkdir -p debian/python-sip-dbg/usr/share/doc
 	ln -s python-sip debian/python-sip-dbg/usr/share/doc/python-sip-dbg
+	rm -rf debian/python-sip-dev/usr/share/doc/python-sip-dev
+	mkdir -p debian/python-sip-dev/usr/share/doc
+	ln -s python-sip debian/python-sip-dev/usr/share/doc/python-sip-dev
+	rm -rf debian/python3-sip-dbg/usr/share/doc/python3-sip-dbg
+	mkdir -p debian/python3-sip-dbg/usr/share/doc
+	ln -s python3-sip debian/python3-sip-dbg/usr/share/doc/python3-sip-dbg
+	rm -rf debian/python3-sip-dev/usr/share/doc/python3-sip-dev
+	mkdir -p debian/python3-sip-dev/usr/share/doc
+	ln -s python3-sip debian/python3-sip-dev/usr/share/doc/python3-sip-dev
 endif
 	dh_compress -X.inv
 	dh_fixperms

Added: packages/sip4/trunk/debian/sipconfig_py3.header
===================================================================
--- packages/sip4/trunk/debian/sipconfig_py3.header	                        (rev 0)
+++ packages/sip4/trunk/debian/sipconfig_py3.header	2012-10-23 00:25:02 UTC (rev 22817)
@@ -0,0 +1,5 @@
+# Import the sipconfig.py for the correct python3 version and normal or debug
+# build.
+
+import sys
+

Modified: packages/sip4/trunk/debian/sipconfig_py3.py
===================================================================
--- packages/sip4/trunk/debian/sipconfig_py3.py	2012-10-22 18:57:52 UTC (rev 22816)
+++ packages/sip4/trunk/debian/sipconfig_py3.py	2012-10-23 00:25:02 UTC (rev 22817)
@@ -1,13 +1,5 @@
-# import the sipconfig.py for the normal or the debug build
+# Import the sipconfig.py for the correct python3 version and normal or debug
+# build.
 
 import sys
 
-if getattr(sys, "pydebug", False):
-    try:
-        from sipconfig_d import *
-        from sipconfig_d import _pkg_config, _default_macros
-    except ImportError as msg:
-        raise ImportError('No module named sipconfig; package python-sip4-dbg not installed')
-else:
-    from sipconfig_nd import *
-    from sipconfig_nd import _pkg_config, _default_macros

Added: packages/sip4/trunk/debian/sipconfig_py3.snippet
===================================================================
--- packages/sip4/trunk/debian/sipconfig_py3.snippet	                        (rev 0)
+++ packages/sip4/trunk/debian/sipconfig_py3.snippet	2012-10-23 00:25:02 UTC (rev 22817)
@@ -0,0 +1,11 @@
+if sys.version_info[1] == @MINORVERS@:
+    if getattr(sys, "pydebug", False):
+        try:
+            from sipconfig_d at MINORVERS@ import *
+            from sipconfig_d at MINORVERS@ import _pkg_config, _default_macros
+        except ImportError as msg:
+            raise ImportError('No module named sipconfig; package python3-sip4-dbg not installed')
+    else:
+        from sipconfig_nd at MINORVERS@ import *
+        from sipconfig_nd at MINORVERS@ import _pkg_config, _default_macros
+

More information about the Python-modules-commits mailing list