[Python-modules-commits] r25641 - in packages/sip4/trunk/debian (6 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Mon Aug 19 15:54:57 UTC 2013 

    Date: Monday, August 19, 2013 @ 15:54:55
  Author: kitterman
Revision: 25641

* Urgency medium for RC bug fix affecting stable -> testing upgrades
* Clean up symlink versus directory for python/python3-sip-dbg
  (Closes: #720156)
  - Convert doc directories for -dbg packages to symlinks (as
    python-sip-dbg has in wheezy)
  - Add python/python3-sip-dbg.postinsts to straighten up existing dirs
  - Convert sip-dbg doc dir to symlink to sip-dev
* Exclude sip-dev from dh_python3 processing to fix errors with dh_python3
  processing inappropriate files
* Remove install-arch-3.2, now that python3.2 is no longer supported to
  simplify debian/rules, bump minimum python3-all-dev version required to
  3.3.2-5~

Added:
  packages/sip4/trunk/debian/python-sip-dbg.postinst
  packages/sip4/trunk/debian/python3-sip-dbg.postinst
  packages/sip4/trunk/debian/sip-dbg.postinst
Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/control
  packages/sip4/trunk/debian/rules

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2013-08-19 07:25:02 UTC (rev 25640)
+++ packages/sip4/trunk/debian/changelog	2013-08-19 15:54:55 UTC (rev 25641)
@@ -1,3 +1,20 @@
+sip4 (4.14.7-4) unstable; urgency=medium
+
+  * Urgency medium for RC bug fix affecting stable -> testing upgrades
+  * Clean up symlink versus directory for python/python3-sip-dbg
+    (Closes: #720156)
+    - Convert doc directories for -dbg packages to symlinks (as
+      python-sip-dbg has in wheezy)
+    - Add python/python3-sip-dbg.postinsts to straighten up existing dirs
+    - Convert sip-dbg doc dir to symlink to sip-dev
+  * Exclude sip-dev from dh_python3 processing to fix errors with dh_python3
+    processing inappropriate files
+  * Remove install-arch-3.2, now that python3.2 is no longer supported to
+    simplify debian/rules, bump minimum python3-all-dev version required to
+    3.3.2-5~
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 19 Aug 2013 08:59:25 -0400
+
 sip4 (4.14.7-3) unstable; urgency=low
 
   * Split usr/bin/sip out of python-sip-dev to fix missing depends for

Modified: packages/sip4/trunk/debian/control
===================================================================
--- packages/sip4/trunk/debian/control	2013-08-19 07:25:02 UTC (rev 25640)
+++ packages/sip4/trunk/debian/control	2013-08-19 15:54:55 UTC (rev 25641)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>, Scott Kitterman <scott at kitterman.com>
 Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 7), python-all-dev (>= 2.7.2-5~), python-all-dbg,
- python3-all-dev (>= 3.2.2~rc1-1~), python3-all-dbg, python-sphinx (>= 1.0.7+dfsg), flex
+ python3-all-dev (>= 3.3.2-5~), python3-all-dbg, python-sphinx (>= 1.0.7+dfsg), flex
 Standards-Version: 3.9.4
 Homepage: http://www.riverbankcomputing.co.uk/software/sip/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/sip4/trunk/

Added: packages/sip4/trunk/debian/python-sip-dbg.postinst
===================================================================
--- packages/sip4/trunk/debian/python-sip-dbg.postinst	                        (rev 0)
+++ packages/sip4/trunk/debian/python-sip-dbg.postinst	2013-08-19 15:54:55 UTC (rev 25641)
@@ -0,0 +1,13 @@
+#! /bin/sh
+set -e
+
+
+DOCDIR=/usr/share/doc/python-sip-dbg
+DOCLINK=python-sip
+
+if [ -d $DOCDIR ] && [ ! -L $DOCDIR ]; then
+    rmdir $DOCDIR
+    ln -s $DOCLINK $DOCDIR
+fi
+
+#DEBHELPER#

Added: packages/sip4/trunk/debian/python3-sip-dbg.postinst
===================================================================
--- packages/sip4/trunk/debian/python3-sip-dbg.postinst	                        (rev 0)
+++ packages/sip4/trunk/debian/python3-sip-dbg.postinst	2013-08-19 15:54:55 UTC (rev 25641)
@@ -0,0 +1,13 @@
+#! /bin/sh
+set -e
+
+
+DOCDIR=/usr/share/doc/python3-sip-dbg
+DOCLINK=python3-sip
+
+if [ -d $DOCDIR ] && [ ! -L $DOCDIR ]; then
+    rmdir $DOCDIR
+    ln -s $DOCLINK $DOCDIR
+fi
+
+#DEBHELPER#

Modified: packages/sip4/trunk/debian/rules
===================================================================
--- packages/sip4/trunk/debian/rules	2013-08-19 07:25:02 UTC (rev 25640)
+++ packages/sip4/trunk/debian/rules	2013-08-19 15:54:55 UTC (rev 25641)
@@ -119,23 +119,6 @@
 	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
@@ -180,8 +163,18 @@
 	dh_installdocs -A
 	dh_installexamples
 	dh_link
-# don't call strip twice, it's in binary-common
+# don't call strip twice (or make the -dbg doc directories symlinks twice),
+# it's in binary-common
 ifneq (,$(findstring -a, $(DH_OPTIONS)))
+	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/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/sip-dbg/usr/share/doc/sip-dbg
+	mkdir -p debian/sip-dbg/usr/share/doc
+	ln -s sip-dev debian/sip-dbg/usr/share/doc/sip-dbg
 	DH_OPTIONS= dh_strip -ppython-sip-dev
 	DH_OPTIONS= dh_strip -ppython-sip -Npython-sip-dev --dbg-package=python-sip-dbg
 	DH_OPTIONS= dh_strip -ppython3-sip-dev
@@ -190,8 +183,8 @@
 endif
 	dh_compress -X.inv
 	dh_fixperms
-	dh_python2 --no-dbg-cleaning
-	dh_python3 --no-dbg-cleaning
+	dh_python2 --no-dbg-cleaning -N sip-dev
+	dh_python3 --no-dbg-cleaning -N sip-dev
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

Added: packages/sip4/trunk/debian/sip-dbg.postinst
===================================================================
--- packages/sip4/trunk/debian/sip-dbg.postinst	                        (rev 0)
+++ packages/sip4/trunk/debian/sip-dbg.postinst	2013-08-19 15:54:55 UTC (rev 25641)
@@ -0,0 +1,13 @@
+#! /bin/sh
+set -e
+
+
+DOCDIR=/usr/share/doc/sip-dbg
+DOCLINK=sip-dev
+
+if [ -d $DOCDIR ] && [ ! -L $DOCDIR ]; then
+    rmdir $DOCDIR
+    ln -s $DOCLINK $DOCDIR
+fi
+
+#DEBHELPER#

More information about the Python-modules-commits mailing list