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

[sramacher at users.alioth.debian.org]

    Date: Wednesday, January 2, 2013 @ 23:44:44
  Author: sramacher
Revision: 23237

Revert some previous changes and add Breaks: python-keyring (<= 0.7.1-1)

Modified:
  packages/python-crypto/trunk/debian/changelog
  packages/python-crypto/trunk/debian/control
  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-01-02 22:55:49 UTC (rev 23236)
+++ packages/python-crypto/trunk/debian/changelog	2013-01-02 23:44:44 UTC (rev 23237)
@@ -1,12 +1,11 @@
-python-crypto (2.6-3) UNRELEASED; urgency=low
+python-crypto (2.6-3) unstable; urgency=low
 
-  * debian/patches/dont-drop-g.patch: Fix Origin and add Author.
   * debian/{control,copyright}: Update my mail address.
-  * debian/control: Remove DM-Upload-Allowed.
-  * debian/rules: Install extension modules built for the debug version of
-    Python 3.3 into the correct package.
+  * debian/control:
+    - Remove DM-Upload-Allowed.
+    - Add Breaks python{,3}-keyring (<= 0.7.1-1) to python{,3}-crypto.
 
- -- Sebastian Ramacher <sramacher at debian.org>  Mon, 24 Sep 2012 22:54:35 +0200
+ -- Sebastian Ramacher <sramacher at debian.org>  Thu, 03 Jan 2013 00:32:03 +0100
 
 python-crypto (2.6-2) unstable; urgency=low
 

Modified: packages/python-crypto/trunk/debian/control
===================================================================
--- packages/python-crypto/trunk/debian/control	2013-01-02 22:55:49 UTC (rev 23236)
+++ packages/python-crypto/trunk/debian/control	2013-01-02 23:44:44 UTC (rev 23237)
@@ -27,6 +27,7 @@
 Replaces: python2.3-crypto, python2.4-crypto
 Provides: ${python:Provides}
 Suggests: python-crypto-dbg, python-crypto-doc
+Breaks: python-keyring (<= 0.7.1-1)
 Description: cryptographic algorithms and protocols for Python
  A collection of cryptographic algorithms and protocols, implemented
  for use from Python. Among the contents of the package:
@@ -57,6 +58,7 @@
 Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python3:Provides}
 Suggests: python3-crypto-dbg, python-crypto-doc
+Breaks: python3-keyring (<= 0.7.1-1)
 Description: cryptographic algorithms and protocols for Python 3
  A collection of cryptographic algorithms and protocols, implemented
  for use from Python 3. Among the contents of the package:

Modified: packages/python-crypto/trunk/debian/patches/dont-drop-g.patch
===================================================================
--- packages/python-crypto/trunk/debian/patches/dont-drop-g.patch	2013-01-02 22:55:49 UTC (rev 23236)
+++ packages/python-crypto/trunk/debian/patches/dont-drop-g.patch	2013-01-02 23:44:44 UTC (rev 23237)
@@ -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
 

Modified: packages/python-crypto/trunk/debian/rules
===================================================================
--- packages/python-crypto/trunk/debian/rules	2013-01-02 22:55:49 UTC (rev 23236)
+++ packages/python-crypto/trunk/debian/rules	2013-01-02 23:44:44 UTC (rev 23237)
@@ -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