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

[kitterman at users.alioth.debian.org]

    Date: Tuesday, November 6, 2012 @ 04:03:36
  Author: kitterman
Revision: 22899

Give up on doc directory symlinks as not worth the trouble
(Closes: #691442)

Modified:
  packages/sip4/trunk/debian/changelog
  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
  packages/sip4/trunk/debian/rules

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2012-11-05 23:01:40 UTC (rev 22898)
+++ packages/sip4/trunk/debian/changelog	2012-11-06 04:03:36 UTC (rev 22899)
@@ -1,3 +1,10 @@
+sip4 (4.14-4) experimental; urgency=low
+
+  * Give up on doc directory symlinks as not worth the trouble
+    (Closes: #691442)
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 05 Nov 2012 20:58:12 -0500
+
 sip4 (4.14-3) experimental; urgency=low
 
   * Fix debian/sipconfig_py3.snippet to use sys.abiflags to detect if the

Modified: packages/sip4/trunk/debian/python-sip-dbg.preinst
===================================================================
--- packages/sip4/trunk/debian/python-sip-dbg.preinst	2012-11-05 23:01:40 UTC (rev 22898)
+++ packages/sip4/trunk/debian/python-sip-dbg.preinst	2012-11-06 04:03:36 UTC (rev 22899)
@@ -4,7 +4,7 @@
 # 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
+    if rm -rf $docdir 2>/dev/null; then
         ln -sf python-sip $docdir
     fi
 fi

Modified: packages/sip4/trunk/debian/python-sip-dev.preinst
===================================================================
--- packages/sip4/trunk/debian/python-sip-dev.preinst	2012-11-05 23:01:40 UTC (rev 22898)
+++ packages/sip4/trunk/debian/python-sip-dev.preinst	2012-11-06 04:03:36 UTC (rev 22899)
@@ -4,8 +4,8 @@
 # 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
+    if rm -rf $docdir 2>/dev/null; then
+        echo "Removing $docdir for conversion to symlink."
     fi
 fi
 

Modified: packages/sip4/trunk/debian/python3-sip-dbg.preinst
===================================================================
--- packages/sip4/trunk/debian/python3-sip-dbg.preinst	2012-11-05 23:01:40 UTC (rev 22898)
+++ packages/sip4/trunk/debian/python3-sip-dbg.preinst	2012-11-06 04:03:36 UTC (rev 22899)
@@ -4,7 +4,7 @@
 # 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
+    if rm -rf $docdir 2>/dev/null; then
         ln -sf python3-sip $docdir
     fi
 fi

Modified: packages/sip4/trunk/debian/python3-sip-dev.preinst
===================================================================
--- packages/sip4/trunk/debian/python3-sip-dev.preinst	2012-11-05 23:01:40 UTC (rev 22898)
+++ packages/sip4/trunk/debian/python3-sip-dev.preinst	2012-11-06 04:03:36 UTC (rev 22899)
@@ -4,7 +4,7 @@
 # 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
+    if rm -rf $docdir 2>/dev/null; then
         ln -sf python3-sip $docdir
     fi
 fi

Modified: packages/sip4/trunk/debian/rules
===================================================================
--- packages/sip4/trunk/debian/rules	2012-11-05 23:01:40 UTC (rev 22898)
+++ packages/sip4/trunk/debian/rules	2012-11-06 04:03:36 UTC (rev 22899)
@@ -186,18 +186,6 @@
 	DH_OPTIONS= dh_strip -ppython-sip -Npython-sip-dev --dbg-package=python-sip-dbg
 	DH_OPTIONS= dh_strip -ppython3-sip-dev
 	DH_OPTIONS= dh_strip -ppython3-sip -Npython3-sip-dev --dbg-package=python3-sip-dbg
-	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