[Python-modules-commits] r23504 - in packages/python-crypto/trunk/debian (4 files)

[sramacher at users.alioth.debian.org]

    Date: Sunday, February 17, 2013 @ 15:19:35
  Author: sramacher
Revision: 23504

Handle symlink to directory conversion (#700778)

Added:
  packages/python-crypto/trunk/debian/python-crypto-dbg.preinst
Modified:
  packages/python-crypto/trunk/debian/changelog
  packages/python-crypto/trunk/debian/patches/dont-drop-g.patch
  packages/python-crypto/trunk/debian/rules

Modified: packages/python-crypto/trunk/debian/changelog
===================================================================
--- packages/python-crypto/trunk/debian/changelog	2013-02-17 13:39:21 UTC (rev 23503)
+++ packages/python-crypto/trunk/debian/changelog	2013-02-17 15:19:35 UTC (rev 23504)
@@ -1,10 +1,10 @@
 python-crypto (2.6-4) UNRELEASED; urgency=low
 
-  * debian/patches/dont-drop-g.patch: Fix Origin and add Author.
-  * debian/rules: Install extension modules built for the debug version of
-    Python 3.3 into the correct package.
+  * debian/python-crypto-dbg.preinst: Add preinst script to handle symlink to
+    directory conversion for /usr/share/doc/python-crypto-dbg. Thanks to
+    Andreas Beckmann for the report. (Closes: #700778)
 
- -- Sebastian Ramacher <sramacher at debian.org>  Thu, 03 Jan 2013 01:06:17 +0100
+ -- Sebastian Ramacher <sramacher at debian.org>  Sun, 17 Feb 2013 15:47:35 +0100
 
 python-crypto (2.6-3) unstable; urgency=low
 

Modified: packages/python-crypto/trunk/debian/patches/dont-drop-g.patch
===================================================================
--- packages/python-crypto/trunk/debian/patches/dont-drop-g.patch	2013-02-17 13:39:21 UTC (rev 23503)
+++ packages/python-crypto/trunk/debian/patches/dont-drop-g.patch	2013-02-17 15:19:35 UTC (rev 23504)
@@ -1,8 +1,7 @@
 Description: don't drop -g and optimization values from the call to gcc
  The binaries will be stripped later anyway and CFLAGS contains the correct
  flags.
-Author: Sebastian Ramacher <s.ramacher at gmx.at>
-Origin: vendor
+Origin: Sebastian Ramacher <s.ramacher at gmx.at>
 Last-Update: 2011-11-12
 Forwarded: no
 

Added: packages/python-crypto/trunk/debian/python-crypto-dbg.preinst
===================================================================
--- packages/python-crypto/trunk/debian/python-crypto-dbg.preinst	                        (rev 0)
+++ packages/python-crypto/trunk/debian/python-crypto-dbg.preinst	2013-02-17 15:19:35 UTC (rev 23504)
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# handle symlink to directory conversion (#700778)
+DOCDIR=/usr/share/doc/python-crypto-dbg
+if [ -L $DOCDIR ] ; then
+  rm $DOCDIR
+fi
+
+#DEBHELPER#

Modified: packages/python-crypto/trunk/debian/rules
===================================================================
--- packages/python-crypto/trunk/debian/rules	2013-02-17 13:39:21 UTC (rev 23503)
+++ packages/python-crypto/trunk/debian/rules	2013-02-17 15:19:35 UTC (rev 23504)
@@ -43,10 +43,10 @@
 override_dh_install:
 	# Install everything excluding the *_d.so/*dmu.so debug extensions to python(3)-crypto
 	dh_install -X"_d.so" -X"python3" "debian/tmp/*" -p python-crypto
-	dh_install -X"dm.so" -X"dmu.so" -X"python2" "debian/tmp/*" -p python3-crypto
+	dh_install -X"dmu.so" -X"python2" "debian/tmp/*" -p python3-crypto
 	# Install the debug extensions to python(3)-crypto-dbg
 	find debian/tmp/ -name "*_d.so" -exec dh_install '{}' -p python-crypto-dbg \;
-	find debian/tmp/ -name "*cpython-*dm*.so" -exec dh_install '{}' -p python3-crypto-dbg \;
+	find debian/tmp/ -name "*dmu.so" -exec dh_install '{}' -p python3-crypto-dbg \;
 	# Continue with regular dh_install
 	dh_install