[Python-modules-commits] r13533 - in packages/pydkim/trunk/debian (13 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Tue Jun 22 04:07:06 UTC 2010 

    Date: Tuesday, June 22, 2010 @ 04:07:02
  Author: kitterman
Revision: 13533

  * Convert from CDBS to Debhelper 7:
    - Drop cdbs from build-depends and bump required debhelper verion
    - Change compat to 7
    - Change debian/rules to DH 7 tiny --with quilt
    - Add quilt to build-depends
    - Update README.source for quilt
    - Remove autogenerated pycompat
  * Convert from python-central to dh_python2
    - Drop python-central from build-depends
    - Build --with python2
    - Bump python version requirement to 2.6.5-2~
  * Bump standards version to 3.8.4 without further change
  * Remove DM-Upload-Allowed (no longer needed)
  * Update debian/dkimsign.1 and debian/dkimverify.1 to specify their license
  * Use correct ?\194?\169 symbol in debian/copyright
  * Remove pointless debian/examples file
  * Fix typo in previous debian/changelog entry to make lintian happy

Added:
  packages/pydkim/trunk/debian/patches/series
Modified:
  packages/pydkim/trunk/debian/README.source
  packages/pydkim/trunk/debian/changelog
  packages/pydkim/trunk/debian/compat
  packages/pydkim/trunk/debian/control
  packages/pydkim/trunk/debian/copyright
  packages/pydkim/trunk/debian/dkimsign.1
  packages/pydkim/trunk/debian/dkimverify.1
  packages/pydkim/trunk/debian/patches/adjust-setup.py.patch
  packages/pydkim/trunk/debian/rules
Deleted:
  packages/pydkim/trunk/debian/examples
  packages/pydkim/trunk/debian/pycompat
  packages/pydkim/trunk/debian/source/

Modified: packages/pydkim/trunk/debian/README.source
===================================================================
--- packages/pydkim/trunk/debian/README.source	2010-06-21 22:33:00 UTC (rev 13532)
+++ packages/pydkim/trunk/debian/README.source	2010-06-22 04:07:02 UTC (rev 13533)
@@ -1,4 +1,5 @@
-This package uses CDBS simple patchsys.  dpkg-source -x does produce source
+This package uses quilt for patches.  dpkg-source -x does produce source
 ready for building with dpkg-buildpackage.  It does not procude source ready
-for editing.  To edit or update a patch, use cdbs-edit-patch.  See man
-cdbs-edit-patch for details.
+for editing.  See /usr/share/doc/quilt/README.source for information on using
+quilt.
+

Modified: packages/pydkim/trunk/debian/changelog
===================================================================
--- packages/pydkim/trunk/debian/changelog	2010-06-21 22:33:00 UTC (rev 13532)
+++ packages/pydkim/trunk/debian/changelog	2010-06-22 04:07:02 UTC (rev 13533)
@@ -1,7 +1,29 @@
+pydkim (0.3-4) unstable; urgency=low
+
+  * Convert from CDBS to Debhelper 7:
+    - Drop cdbs from build-depends and bump required debhelper verion
+    - Change compat to 7
+    - Change debian/rules to DH 7 tiny --with quilt
+    - Add quilt to build-depends
+    - Update README.source for quilt
+    - Remove autogenerated pycompat
+  * Convert from python-central to dh_python2
+    - Drop python-central from build-depends
+    - Build --with python2
+    - Bump python version requirement to 2.6.5-2~
+  * Bump standards version to 3.8.4 without further change
+  * Remove DM-Upload-Allowed (no longer needed)
+  * Update debian/dkimsign.1 and debian/dkimverify.1 to specify their license
+  * Use correct © symbol in debian/copyright
+  * Remove pointless debian/examples file
+  * Fix typo in previous debian/changelog entry to make lintian happy
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 21 Jun 2010 23:20:36 -0400
+
 pydkim (0.3-3) unstable; urgency=low
 
   * Adjust dkimproxy conflict to << 1.0.1-8.1 due to filename collision
-    (Closes #511037)
+    (Closes: #511037)
   * Add ${misc:Depends}
 
  -- Scott Kitterman <scott at kitterman.com>  Mon, 12 Jan 2009 23:17:26 -0500

Modified: packages/pydkim/trunk/debian/compat
===================================================================
--- packages/pydkim/trunk/debian/compat	2010-06-21 22:33:00 UTC (rev 13532)
+++ packages/pydkim/trunk/debian/compat	2010-06-22 04:07:02 UTC (rev 13533)
@@ -1,2 +1,2 @@
-5
+7
 

Modified: packages/pydkim/trunk/debian/control
===================================================================
--- packages/pydkim/trunk/debian/control	2010-06-21 22:33:00 UTC (rev 13532)
+++ packages/pydkim/trunk/debian/control	2010-06-22 04:07:02 UTC (rev 13533)
@@ -3,14 +3,12 @@
 Priority: optional
 Maintainer: Scott Kitterman <scott at kitterman.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> 
-Build-Depends: debhelper (>=5), cdbs (>=0.4.48), python (>=2.5)
-Build-Depends-Indep: python-central
+Build-Depends: debhelper (>= 7.3.16), python (>= 2.6.5-2~), quilt (>= 0.46-7)
 XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pydkim/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pydkim/trunk/
-Standards-Version: 3.8.0.1
+Standards-Version: 3.8.4
 Homepage: http://hewgill.com/pydkim
-DM-Upload-Allowed: yes
 
 Package: python-dkim
 Architecture: all

Modified: packages/pydkim/trunk/debian/copyright
===================================================================
--- packages/pydkim/trunk/debian/copyright	2010-06-21 22:33:00 UTC (rev 13532)
+++ packages/pydkim/trunk/debian/copyright	2010-06-22 04:07:02 UTC (rev 13533)
@@ -3,7 +3,7 @@
 
 It was downloaded from http://hewgill.com/pydkim
 
-Copyright Holder: Copyright (c) 2008 Greg Hewgill http://hewgill.com
+Copyright Holder: Copyright © 2008 Greg Hewgill http://hewgill.com
 
 License:
 
@@ -23,7 +23,7 @@
 #    misrepresented as being the original software.
 # 3. This notice may not be removed or altered from any source distribution.
 #
-# Copyright (c) 2008 Greg Hewgill http://hewgill.com
+# Copyright © 2008 Greg Hewgill http://hewgill.com
 
-The Debian packaging is (C) 2008, Scott Kitterman <scott at kitterman.com> and
+The Debian packaging is © 2008, Scott Kitterman <scott at kitterman.com> and
 is licensed under the same terms as pydkim, see above.

Modified: packages/pydkim/trunk/debian/dkimsign.1
===================================================================
--- packages/pydkim/trunk/debian/dkimsign.1	2010-06-21 22:33:00 UTC (rev 13532)
+++ packages/pydkim/trunk/debian/dkimsign.1	2010-06-22 04:07:02 UTC (rev 13533)
@@ -154,4 +154,5 @@
 .IX Header "AUTHORS"
 This version of \fBdkimsign\fR was written by Greg Hewgill <greg at hewgill.com>.
 .PP
-This man-page was created by Scott Kitterman <scott at kitterman.com>.
+This man-page was created by Scott Kitterman <scott at kitterman.com> and is
+licensed under the same terms as pydkim.

Modified: packages/pydkim/trunk/debian/dkimverify.1
===================================================================
--- packages/pydkim/trunk/debian/dkimverify.1	2010-06-21 22:33:00 UTC (rev 13532)
+++ packages/pydkim/trunk/debian/dkimverify.1	2010-06-22 04:07:02 UTC (rev 13533)
@@ -146,4 +146,5 @@
 .IX Header "AUTHORS"
 This version of \fBdkimsign\fR was written by Greg Hewgill <greg at hewgill.com>.
 .PP
-This man-page was created by Scott Kitterman <scott at kitterman.com>.
+This man-page was created by Scott Kitterman <scott at kitterman.com> and is
+licensed under the same terms as pydkim.

Deleted: packages/pydkim/trunk/debian/examples
===================================================================
--- packages/pydkim/trunk/debian/examples	2010-06-21 22:33:00 UTC (rev 13532)
+++ packages/pydkim/trunk/debian/examples	2010-06-22 04:07:02 UTC (rev 13533)
@@ -1,2 +0,0 @@
-examples/*
-

Modified: packages/pydkim/trunk/debian/patches/adjust-setup.py.patch
===================================================================
--- packages/pydkim/trunk/debian/patches/adjust-setup.py.patch	2010-06-21 22:33:00 UTC (rev 13532)
+++ packages/pydkim/trunk/debian/patches/adjust-setup.py.patch	2010-06-22 04:07:02 UTC (rev 13533)
@@ -1,6 +1,10 @@
-diff -Nur -x '*.orig' -x '*~' pydkim-0.3/setup.py pydkim-0.3.new/setup.py
---- pydkim-0.3/setup.py	2008-06-25 06:42:31.000000000 -0400
-+++ pydkim-0.3.new/setup.py	2008-11-07 00:24:33.000000000 -0500
+This is a Debian specific patch that should not go upstream.  See debian/
+changelog for source and rationale.
+
+Index: pydkim-0.3/setup.py
+===================================================================
+--- pydkim-0.3.orig/setup.py	2010-06-21 23:43:45.503817777 -0400
++++ pydkim-0.3/setup.py	2010-06-21 23:43:55.486817085 -0400
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python

Added: packages/pydkim/trunk/debian/patches/series
===================================================================
--- packages/pydkim/trunk/debian/patches/series	                        (rev 0)
+++ packages/pydkim/trunk/debian/patches/series	2010-06-22 04:07:02 UTC (rev 13533)
@@ -0,0 +1 @@
+adjust-setup.py.patch

Deleted: packages/pydkim/trunk/debian/pycompat
===================================================================
--- packages/pydkim/trunk/debian/pycompat	2010-06-21 22:33:00 UTC (rev 13532)
+++ packages/pydkim/trunk/debian/pycompat	2010-06-22 04:07:02 UTC (rev 13533)
@@ -1 +0,0 @@
-2

Modified: packages/pydkim/trunk/debian/rules
===================================================================
--- packages/pydkim/trunk/debian/rules	2010-06-21 22:33:00 UTC (rev 13532)
+++ packages/pydkim/trunk/debian/rules	2010-06-22 04:07:02 UTC (rev 13533)
@@ -1,13 +1,10 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
-DEB_COMPRESS_EXCLUDE := .py
+%:
+	dh $@ --with quilt, --with python2
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-install/python-dkim::
+override_dh_install:
 	mv debian/python-dkim/usr/bin/dkimsign.py  debian/python-dkim/usr/bin/dkimsign
 	mv debian/python-dkim/usr/bin/dkimverify.py  debian/python-dkim/usr/bin/dkimverify
+	dh_install

More information about the Python-modules-commits mailing list