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

[kitterman at users.alioth.debian.org]

    Date: Friday, October 26, 2012 @ 04:20:27
  Author: kitterman
Revision: 22838

* Fix debian/sipconfig_py3.snippet to use sys.abiflags to detect if the
  debug build is running instead of the non-existent (in python3)
  sys.pydebug
* Add *.preinst to python-sip-dbg, python-sip-dev, python3-sip-dbg, and
  python3-sip-dev to remove any potential doc directories that are now
  symlinks (Closes: #691442)

Added:
  packages/sip4/trunk/debian/python-sip-dbg.preinst
  packages/sip4/trunk/debian/python-sip-dev.preinst
  packages/sip4/trunk/debian/python3-sip-dbg.preinst
  packages/sip4/trunk/debian/python3-sip-dev.preinst
Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/sipconfig_py3.snippet

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2012-10-25 19:43:51 UTC (rev 22837)
+++ packages/sip4/trunk/debian/changelog	2012-10-26 04:20:27 UTC (rev 22838)
@@ -1,3 +1,14 @@
+sip4 (4.14-3) experimental; urgency=low
+
+  * Fix debian/sipconfig_py3.snippet to use sys.abiflags to detect if the
+    debug build is running instead of the non-existent (in python3)
+    sys.pydebug
+  * Add *.preinst to python-sip-dbg, python-sip-dev, python3-sip-dbg, and
+    python3-sip-dev to remove any potential doc directories that are now
+    symlinks (Closes: #691442)
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 26 Oct 2012 00:03:20 -0400
+
 sip4 (4.14-2) experimental; urgency=low
 
   * Enable building for multiple supported python3 versions

Added: packages/sip4/trunk/debian/python-sip-dbg.preinst
===================================================================
--- packages/sip4/trunk/debian/python-sip-dbg.preinst	                        (rev 0)
+++ packages/sip4/trunk/debian/python-sip-dbg.preinst	2012-10-26 04:20:27 UTC (rev 22838)
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+# Replace documentation directory with symlink
+docdir="/usr/share/doc/python-sip-dbg"
+if [ -d $docdir ] && [ ! -L $docdir ]; then
+    if rmdir $docdir 2>/dev/null; then
+        ln -sf python-sip $docdir
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0

Added: packages/sip4/trunk/debian/python-sip-dev.preinst
===================================================================
--- packages/sip4/trunk/debian/python-sip-dev.preinst	                        (rev 0)
+++ packages/sip4/trunk/debian/python-sip-dev.preinst	2012-10-26 04:20:27 UTC (rev 22838)
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+# Replace documentation directory with symlink
+docdir="/usr/share/doc/python-sip-dev"
+if [ -d $docdir ] && [ ! -L $docdir ]; then
+    if rmdir $docdir 2>/dev/null; then
+        ln -sf python-sip $docdir
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0

Added: packages/sip4/trunk/debian/python3-sip-dbg.preinst
===================================================================
--- packages/sip4/trunk/debian/python3-sip-dbg.preinst	                        (rev 0)
+++ packages/sip4/trunk/debian/python3-sip-dbg.preinst	2012-10-26 04:20:27 UTC (rev 22838)
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+# Replace documentation directory with symlink
+docdir="/usr/share/doc/python3-sip-dbg"
+if [ -d $docdir ] && [ ! -L $docdir ]; then
+    if rmdir $docdir 2>/dev/null; then
+        ln -sf python3-sip $docdir
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0

Added: packages/sip4/trunk/debian/python3-sip-dev.preinst
===================================================================
--- packages/sip4/trunk/debian/python3-sip-dev.preinst	                        (rev 0)
+++ packages/sip4/trunk/debian/python3-sip-dev.preinst	2012-10-26 04:20:27 UTC (rev 22838)
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+# Replace documentation directory with symlink
+docdir="/usr/share/doc/python3-sip-dev"
+if [ -d $docdir ] && [ ! -L $docdir ]; then
+    if rmdir $docdir 2>/dev/null; then
+        ln -sf python3-sip $docdir
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: packages/sip4/trunk/debian/sipconfig_py3.snippet
===================================================================
--- packages/sip4/trunk/debian/sipconfig_py3.snippet	2012-10-25 19:43:51 UTC (rev 22837)
+++ packages/sip4/trunk/debian/sipconfig_py3.snippet	2012-10-26 04:20:27 UTC (rev 22838)
@@ -1,5 +1,5 @@
 if sys.version_info[1] == @MINORVERS@:
-    if getattr(sys, "pydebug", False):
+    if 'd' in sys.abiflags:
         try:
             from sipconfig_d at MINORVERS@ import *
             from sipconfig_d at MINORVERS@ import _pkg_config, _default_macros