[Python-modules-commits] r17482 - in packages/pydkim/trunk/debian (changelog control rules)

[kitterman at users.alioth.debian.org]

    Date: Thursday, June 16, 2011 @ 20:32:00
  Author: kitterman
Revision: 17482

* python-dkim Breaks instead of Conflicts dkimproxy
 * Continue to beat debian/rules into submission

Modified:
  packages/pydkim/trunk/debian/changelog
  packages/pydkim/trunk/debian/control
  packages/pydkim/trunk/debian/rules

Modified: packages/pydkim/trunk/debian/changelog
===================================================================
--- packages/pydkim/trunk/debian/changelog	2011-06-16 20:01:01 UTC (rev 17481)
+++ packages/pydkim/trunk/debian/changelog	2011-06-16 20:32:00 UTC (rev 17482)
@@ -21,8 +21,9 @@
     - Update debian/copyright
   * Update debian/watch and debian/control Homepage: to point at the new
     upstream location
+  * python-dkim Breaks instead of Conflicts dkimproxy
 
- -- Scott Kitterman <scott at kitterman.com>  Tue, 14 Jun 2011 23:11:26 -0500
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 16 Jun 2011 15:01:59 -0500
 
 pydkim (0.3-6) unstable; urgency=low
 

Modified: packages/pydkim/trunk/debian/control
===================================================================
--- packages/pydkim/trunk/debian/control	2011-06-16 20:01:01 UTC (rev 17481)
+++ packages/pydkim/trunk/debian/control	2011-06-16 20:32:00 UTC (rev 17482)
@@ -14,7 +14,7 @@
 Package: python-dkim
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-dns|python-dnspython
-Conflicts: dkimproxy (<< 1.0.1-8.1~)
+Breaks: dkimproxy (<< 1.0.1-8.1~)
 Description: Python module for DKIM signing and verification
  Python module that implements DKIM (DomainKeys Identified Mail) email signing
  and verification. It also provides helper scripts for command line signing

Modified: packages/pydkim/trunk/debian/rules
===================================================================
--- packages/pydkim/trunk/debian/rules	2011-06-16 20:01:01 UTC (rev 17481)
+++ packages/pydkim/trunk/debian/rules	2011-06-16 20:32:00 UTC (rev 17482)
@@ -13,8 +13,7 @@
 	mv debian/python-dkim/usr/bin/dkimverify.py  debian/python-dkim/usr/bin/dkimverify
 	python3 $(CURDIR)/setup.py install --no-compile -O0 --install-layout=deb \
 		--root $(CURDIR)/debian/python3-dkim
-	rm $(CURDIR)/debian/python3-dkim/usr/bin/dkimverify.py
-	rm $(CURDIR)/debian/python3-dkim/usr/bin/dkimsign.py
+	rm -rf $(CURDIR)/debian/python3-dkim/usr/bin
 	rm -rf $(CURDIR)/debian/python3-dkim/usr/share/man
 	dh_install