[Python-apps-commits] r5681 - in packages/pymilter-milters/trunk/debian (12 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Fri Jun 25 16:42:27 UTC 2010 

    Date: Friday, June 25, 2010 @ 16:42:23
  Author: kitterman
Revision: 5681

  * Convert from CDBS to Debhelper 7
    - Port debian/rules to DH 7 --with quilt plus overrides
    - Override dh_auto_build to rm -rf the irrelevant upstream makefile so it
      doesn't get used in the build
    - Drop cdbs from build-depends
    - Add quilt to build-depends
    - Update debian/README.source
    - Bump debhelper version requirement
    - Change compat to 7
    - Remove cdbs generated pycompat
  * Drop python-central since the package doesn't ship any Python modules
    - Add debian/spf-milter-python.install to install files in place of
      debian/patches/add-setup.py.patch
    - Simplify debian/rules
    - Drop build-depends on python-central and python
    - Replace  with python in spf-milter-python depends
    - Remove XS/XB-Python-Version
  * Change priority from extral to optional
  * Improve short description
  * Remove unneeded /etc/spf-milter-python from debian/spf-milter-python.dirs

Added:
  packages/pymilter-milters/trunk/debian/patches/series
  packages/pymilter-milters/trunk/debian/spf-milter-python.install
Modified:
  packages/pymilter-milters/trunk/debian/README.source
  packages/pymilter-milters/trunk/debian/changelog
  packages/pymilter-milters/trunk/debian/compat
  packages/pymilter-milters/trunk/debian/control
  packages/pymilter-milters/trunk/debian/copyright
  packages/pymilter-milters/trunk/debian/patches/spfmilter-debian-config.patch
  packages/pymilter-milters/trunk/debian/rules
  packages/pymilter-milters/trunk/debian/spf-milter-python.dirs
Deleted:
  packages/pymilter-milters/trunk/debian/patches/add-setup.py.patch
  packages/pymilter-milters/trunk/debian/pycompat

Modified: packages/pymilter-milters/trunk/debian/README.source
===================================================================
--- packages/pymilter-milters/trunk/debian/README.source	2010-06-25 16:40:10 UTC (rev 5680)
+++ packages/pymilter-milters/trunk/debian/README.source	2010-06-25 16:42:23 UTC (rev 5681)
@@ -1,5 +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/pymilter-milters/trunk/debian/changelog
===================================================================
--- packages/pymilter-milters/trunk/debian/changelog	2010-06-25 16:40:10 UTC (rev 5680)
+++ packages/pymilter-milters/trunk/debian/changelog	2010-06-25 16:42:23 UTC (rev 5681)
@@ -1,3 +1,28 @@
+pymilter-milters (0.8.13-5) unstable; urgency=low
+
+  * Convert from CDBS to Debhelper 7
+    - Port debian/rules to DH 7 --with quilt plus overrides
+    - Override dh_auto_build to rm -rf the irrelevant upstream makefile so it
+      doesn't get used in the build
+    - Drop cdbs from build-depends
+    - Add quilt to build-depends
+    - Update debian/README.source
+    - Bump debhelper version requirement
+    - Change compat to 7
+    - Remove cdbs generated pycompat
+  * Drop python-central since the package doesn't ship any Python modules
+    - Add debian/spf-milter-python.install to install files in place of
+      debian/patches/add-setup.py.patch
+    - Simplify debian/rules
+    - Drop build-depends on python-central and python
+    - Replace ${python:Depends} with python in spf-milter-python depends
+    - Remove XS/XB-Python-Version
+  * Change priority from extral to optional
+  * Improve short description
+  * Remove unneeded /etc/spf-milter-python from debian/spf-milter-python.dirs  
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 25 Jun 2010 09:33:53 -0400
+
 pymilter-milters (0.8.13-4) unstable; urgency=low
 
   * Move debian/python-milter-docs.doc to debian/python-milter-docs.docs so

Modified: packages/pymilter-milters/trunk/debian/compat
===================================================================
--- packages/pymilter-milters/trunk/debian/compat	2010-06-25 16:40:10 UTC (rev 5680)
+++ packages/pymilter-milters/trunk/debian/compat	2010-06-25 16:42:23 UTC (rev 5681)
@@ -1 +1 @@
-5
+7

Modified: packages/pymilter-milters/trunk/debian/control
===================================================================
--- packages/pymilter-milters/trunk/debian/control	2010-06-25 16:40:10 UTC (rev 5680)
+++ packages/pymilter-milters/trunk/debian/control	2010-06-25 16:42:23 UTC (rev 5681)
@@ -1,11 +1,10 @@
 Source: pymilter-milters
 Section: mail
-Priority: extra
+Priority: optional
 Maintainer: Scott Kitterman <scott at kitterman.com>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.1), python (>= 2.5.4-1~), python-central (>= 0.6)
+Build-Depends: debhelper (>= 7.3.16), quilt (>= 0.46-7)
 Standards-Version: 3.8.4
-XS-Python-Version: >= 2.4
 Homepage: http://sourceforge.net/projects/pymilter/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/pymilter-milters/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pymilter-milters/
@@ -25,10 +24,9 @@
 
 Package: spf-milter-python
 Architecture: all
-XB-Python-Version: >= 2.4
-Depends: ${python:Depends}, ${misc:Depends}, python-milter (>= 0.9.3), python-spf (>= 2.0), lsb-base, adduser 
+Depends: python, ${misc:Depends}, python-milter (>= 0.9.3), python-spf (>= 2.0), lsb-base, adduser 
 Suggests: postfix (>= 2.3) | sendmail (>= 8.13)
-Description: RFC 4408 compliant Python SPF Milter for Sendmail and Postfix
+Description: RFC 4408 compliant SPF Milter for Sendmail and Postfix
  A Python mail filter to add Received-SPF headers and reject forged mail.
  Rejection policy is configured via sendmail access file. Updated for RFC 4408
  compliance.

Modified: packages/pymilter-milters/trunk/debian/copyright
===================================================================
--- packages/pymilter-milters/trunk/debian/copyright	2010-06-25 16:40:10 UTC (rev 5680)
+++ packages/pymilter-milters/trunk/debian/copyright	2010-06-25 16:42:23 UTC (rev 5681)
@@ -38,6 +38,6 @@
 they are requested to be sent to <dredd at megacity.org> for inclusion in future
 versions
 
-The Debian packaging is © 2007 - 2009 Scott Kitterman <scott at kitterman.com>
+The Debian packaging is © 2007 - 2010 Scott Kitterman <scott at kitterman.com>
 and is licensed under the GPL version 2 or later.  See above.
 

Deleted: packages/pymilter-milters/trunk/debian/patches/add-setup.py.patch
===================================================================
--- packages/pymilter-milters/trunk/debian/patches/add-setup.py.patch	2010-06-25 16:40:10 UTC (rev 5680)
+++ packages/pymilter-milters/trunk/debian/patches/add-setup.py.patch	2010-06-25 16:42:23 UTC (rev 5681)
@@ -1,36 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' pymilter-milters-0.8.12/setup.py pymilter-milters-0.8.12.new/setup.py
---- pymilter-milters-0.8.12/setup.py	1969-12-31 19:00:00.000000000 -0500
-+++ pymilter-milters-0.8.12.new/setup.py	2008-12-28 01:52:19.000000000 -0500
-@@ -0,0 +1,32 @@
-+#!/usr/bin/python
-+
-+from distutils.core import setup
-+import os
-+
-+DESC = """spf-milter-python SPF milter for Sendmail and Postfix implemented in Python."""
-+
-+setup(name='spf-milter-python',
-+      version='0.8.12',
-+      description=DESC,
-+      author='Stuart D. Gathman',
-+      author_email='stuart at bmsi.com',
-+      url='http://sourceforge.net/projects/pymilter/',
-+      license='GNU General Public License',
-+      keywords = ['Sendmail','Postfix','spf','milter','email'],
-+      scripts = ['spfmilter.py'],
-+      data_files=[(os.path.join('../', 'etc', 'spf-milter-python'),
-+         ['spfmilter.cfg'])],
-+      classifiers = [
-+        'Development Status :: 5 - Production/Stable',
-+        'Environment :: No Input/Output (Daemon)',
-+        'Intended Audience :: Developers',
-+        'License :: OSI Approved :: GNU General Public License (GPL)',
-+        'Natural Language :: English',
-+        'Operating System :: POSIX',
-+        'Programming Language :: Python',
-+        'Topic :: Communications :: Email :: Mail Transport Agents',
-+        'Topic :: Communications :: Email :: Filters',
-+        'Topic :: Software Development :: Libraries :: Python Applications'
-+      ]
-+)
-+

Added: packages/pymilter-milters/trunk/debian/patches/series
===================================================================
--- packages/pymilter-milters/trunk/debian/patches/series	                        (rev 0)
+++ packages/pymilter-milters/trunk/debian/patches/series	2010-06-25 16:42:23 UTC (rev 5681)
@@ -0,0 +1 @@
+spfmilter-debian-config.patch

Modified: packages/pymilter-milters/trunk/debian/patches/spfmilter-debian-config.patch
===================================================================
--- packages/pymilter-milters/trunk/debian/patches/spfmilter-debian-config.patch	2010-06-25 16:40:10 UTC (rev 5680)
+++ packages/pymilter-milters/trunk/debian/patches/spfmilter-debian-config.patch	2010-06-25 16:42:23 UTC (rev 5681)
@@ -1,6 +1,9 @@
-diff -Nur -x '*.orig' -x '*~' pymilter-milters-0.8.12/spfmilter.cfg pymilter-milters-0.8.12.new/spfmilter.cfg
---- pymilter-milters-0.8.12/spfmilter.cfg	2007-07-25 15:04:44.000000000 -0400
-+++ pymilter-milters-0.8.12.new/spfmilter.cfg	2008-12-28 01:49:37.000000000 -0500
+This is a distro patch to integrate spf-milter-python properly in Debian and
+derived systems.  It has not gone, and does not need to go, upstream.
+Index: pymilter-milters-0.8.13/spfmilter.cfg
+===================================================================
+--- pymilter-milters-0.8.13.orig/spfmilter.cfg	2010-06-25 09:48:57.297393452 -0400
++++ pymilter-milters-0.8.13/spfmilter.cfg	2010-06-25 09:49:10.028395235 -0400
 @@ -1,6 +1,6 @@
  [milter]
  # The socket used to communicate with sendmail
@@ -9,9 +12,10 @@
  # Name of the milter given to sendmail
  name = pyspffilter
  # Trusted relays such as secondary MXes that should not have SPF checked.
-diff -Nur -x '*.orig' -x '*~' pymilter-milters-0.8.12/spfmilter.py pymilter-milters-0.8.12.new/spfmilter.py
---- pymilter-milters-0.8.12/spfmilter.py	2007-07-25 13:14:59.000000000 -0400
-+++ pymilter-milters-0.8.12.new/spfmilter.py	2008-12-28 01:49:37.000000000 -0500
+Index: pymilter-milters-0.8.13/spfmilter.py
+===================================================================
+--- pymilter-milters-0.8.13.orig/spfmilter.py	2010-06-25 09:49:01.156394811 -0400
++++ pymilter-milters-0.8.13/spfmilter.py	2010-06-25 09:49:10.032395674 -0400
 @@ -1,3 +1,4 @@
 +#!/usr/bin/python
  # A simple SPF milter.
@@ -26,7 +30,7 @@
  import Milter
  import spf
  import syslog
-@@ -238,16 +241,16 @@
+@@ -231,16 +234,16 @@
    Milter.factory = spfMilter
    Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
    global config

Deleted: packages/pymilter-milters/trunk/debian/pycompat
===================================================================
--- packages/pymilter-milters/trunk/debian/pycompat	2010-06-25 16:40:10 UTC (rev 5680)
+++ packages/pymilter-milters/trunk/debian/pycompat	2010-06-25 16:42:23 UTC (rev 5681)
@@ -1 +0,0 @@
-2

Modified: packages/pymilter-milters/trunk/debian/rules
===================================================================
--- packages/pymilter-milters/trunk/debian/rules	2010-06-25 16:40:10 UTC (rev 5680)
+++ packages/pymilter-milters/trunk/debian/rules	2010-06-25 16:42:23 UTC (rev 5681)
@@ -1,19 +1,8 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
-DEB_COMPRESS_EXCLUDE := .py
+%:
+	dh $@ --with quilt
 
-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/spf-milter-python::
-	python ./setup.py install --install-layout=deb --root $(CURDIR)/debian/spf-milter-python
-	cp $(CURDIR)/debian/spfmilter \
-		 $(CURDIR)/debian/spf-milter-python/usr/bin/
-	install -D -p -m0644 debian/spf-milter-python.lintian-overrides \
-		debian/spf-milter/python/usr/share/lintian/overrides/spf-milter-python
-
-clean::
-	rm -rf build
-
+override_dh_auto_build:
+	rm -rf makefile
+	dh_auto_build

Modified: packages/pymilter-milters/trunk/debian/spf-milter-python.dirs
===================================================================
--- packages/pymilter-milters/trunk/debian/spf-milter-python.dirs	2010-06-25 16:40:10 UTC (rev 5680)
+++ packages/pymilter-milters/trunk/debian/spf-milter-python.dirs	2010-06-25 16:42:23 UTC (rev 5681)
@@ -1,3 +1,2 @@
 /var/log/spf-milter-python/save
-/etc/spf-milter-python
 

Added: packages/pymilter-milters/trunk/debian/spf-milter-python.install
===================================================================
--- packages/pymilter-milters/trunk/debian/spf-milter-python.install	                        (rev 0)
+++ packages/pymilter-milters/trunk/debian/spf-milter-python.install	2010-06-25 16:42:23 UTC (rev 5681)
@@ -0,0 +1,3 @@
+spfmilter.py usr/bin/
+debian/spfmilter usr/bin/
+spfmilter.cfg etc/spf-milter-python

More information about the Python-apps-commits mailing list