[Python-modules-commits] r15021 - in packages/pyspf/trunk/debian (16 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Sat Dec 4 15:57:48 UTC 2010


    Date: Saturday, December 4, 2010 @ 15:57:45
  Author: kitterman
Revision: 15021

Switch from cdbs/pycentral to dh 7/dh_python2, modernize package

Added:
  packages/pyspf/trunk/debian/spf-tools-python.links
Modified:
  packages/pyspf/trunk/debian/README.Debian.spf-tools-python
  packages/pyspf/trunk/debian/changelog
  packages/pyspf/trunk/debian/compat
  packages/pyspf/trunk/debian/control
  packages/pyspf/trunk/debian/pyspf.1
  packages/pyspf/trunk/debian/python-spf.docs
  packages/pyspf/trunk/debian/rules
  packages/pyspf/trunk/debian/spf-tools-python.docs
  packages/pyspf/trunk/debian/spf-tools-python.manpages
  packages/pyspf/trunk/debian/spf-tools-python.postinst
  packages/pyspf/trunk/debian/spf-tools-python.prerm
Deleted:
  packages/pyspf/trunk/debian/README.Debian
  packages/pyspf/trunk/debian/README.Debian.python-spf
  packages/pyspf/trunk/debian/python-spf.manpages
  packages/pyspf/trunk/debian/source/

Deleted: packages/pyspf/trunk/debian/README.Debian
===================================================================
--- packages/pyspf/trunk/debian/README.Debian	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/README.Debian	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1,11 +0,0 @@
-README.Debian
-
-In addition to the Python SPF library, the python-spf package installs a python
-version of the spfquery script and a DNS Resource Record Type 99 (Type SPF) 
-conversion helper script.
-
-Use of the Python SPF library is documented in the pyspf(1) man page.
-
-Use of the Python spfquery is documented in the spfquery.pyspf(1) man page.
-
-Use of the Type 99 helper script is documented in the pyspf-type99(1) man page.

Deleted: packages/pyspf/trunk/debian/README.Debian.python-spf
===================================================================
--- packages/pyspf/trunk/debian/README.Debian.python-spf	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/README.Debian.python-spf	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1,11 +0,0 @@
-README.Debian.python-spf
-
-A Python version of the spfquery script and a DNS Resource Record Type 99
-(Type SPF) conversion helper script are provided in the spf-tools-python
-package.
-
-Use of the Python SPF library is documented in the pyspf(1) man page.
-
-Use of the Python spfquery is documented in the spfquery.pyspf(1) man page.
-
-Use of the Type 99 helper script is documented in the pyspf-type99(1) man page.

Modified: packages/pyspf/trunk/debian/README.Debian.spf-tools-python
===================================================================
--- packages/pyspf/trunk/debian/README.Debian.spf-tools-python	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/README.Debian.spf-tools-python	2010-12-04 15:57:45 UTC (rev 15021)
@@ -4,7 +4,8 @@
 spf-tools-python package installs a Python version of the spfquery script and a
 DNS Resource Record Type 99 (Type SPF) conversion helper script.
 
-Use of the Python SPF library is documented in the pyspf(1) man page.
+Use of the Python SPF library as a command line script (pyspf) is documented
+in the pyspf(1) man page.
 
 Use of the Python spfquery is documented in the spfquery.pyspf(1) man page.
 

Modified: packages/pyspf/trunk/debian/changelog
===================================================================
--- packages/pyspf/trunk/debian/changelog	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/changelog	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1,3 +1,38 @@
+pyspf (2.0.5-3) experimental; urgency=low
+
+  * Convert from cdbs to debhelper 7 rules
+    - Update debian/rules
+    - Drop build-depends on cdbs
+    - Update required debhelper version and debian/compat
+    - Remove autogenerated debian/pycompat
+  * Convert from dh_pycentral to dh_python2
+    - Add --with python2 in debian/rules
+    - Drop build-depends on python-central
+    - Update required minimum python-all version
+  * Build depend on python-all instead of python-all-dev
+  * Update to recent Python Policy recommendations
+    - Use X-Python-Version instead of XS-Python-Version
+    - Drop XB-Python-Version from all binaries
+  * Provide /usr/bin/pyspf so spf.py can be also be used as a command line
+    tool
+    - Provide as symlink to /usr/share/pyshared/spf.py in
+      debian/spf-tools-python.links
+    - Change spf-tools-python to depend on python-spf and not just recommends
+    - Move pyspf.1 from python-spf to spf-tools-python
+    - spf-tools-python replaces python-spf << 2.0.5.-3~
+  * Improve package descriptions
+  * Clean up redundant README files
+    - Drop README.Debian and README.Debian.python-spf
+    - Update content of README.Debian.spf.tools.python
+  * Set -e in debian/spf-tools-python.postinst/prerm instead of /bin/sh -e
+  * Remove unused patches and debian/patches
+  * Change priority to optional to match overrides
+  * Remove obsolete XS-DM-Upload-Allowed field
+  * Fix misspelling in debian/pyspf.1
+  * Bump standards version to 3.9.1 without further change
+
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 04 Dec 2010 10:44:42 -0500
+
 pyspf (2.0.5-2) unstable; urgency=low
 
   [ Sandro Tosi ]

Modified: packages/pyspf/trunk/debian/compat
===================================================================
--- packages/pyspf/trunk/debian/compat	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/compat	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1 +1 @@
-5
+7

Modified: packages/pyspf/trunk/debian/control
===================================================================
--- packages/pyspf/trunk/debian/control	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/control	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1,33 +1,35 @@
 Source: pyspf
 Section: python
-Priority: extra
+Priority: optional
 Maintainer: Scott Kitterman <scott at kitterman.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Guilherme de S. Pastore <guilherme.pastore at terra.com.br>, Gustavo Franco <stratus at debian.org>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.1), python-all-dev, python-central (>= 0.6)
-XS-Python-Version: all
+Build-Depends: debhelper (>= 7.3.16), python-all (>= 2.6.6-6)
+X-Python-Version: >= 2.4
 Homepage: http://cheeseshop.python.org/pypi/pyspf/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyspf/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyspf/trunk/
-Standards-Version: 3.8.0.1
-XS-DM-Upload-Allowed: yes
+Standards-Version: 3.9.1
 
 Package: python-spf
 Architecture: all
-Depends: ${python:Depends}, python-dns, ${misc:Depends}
+Depends: ${python:Depends}, ${misc:Depends}, python-dns
 Suggests: python-yaml
-XB-Python-Version: all
 Description: sender policy framework (SPF) module for Python
  This module provides SPF (Sender Policy Framework).  It is RFC 4408 compliant.
  .
- For more information about SPF look at http://www.openspf.org/
+ For more information about SPF see http://www.openspf.org/
 
 Package: spf-tools-python
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
-Recommends: python-spf
-XB-Python-Version: all
+Depends: ${python:Depends}, ${misc:Depends}, python-spf
 Conflicts: spfquery (<= 1.2.5-4), libmail-spf-query-perl (<< 1:1.999.1-3), python-spf (<< 2.0.4-4~)
+Replaces: python-spf (<< 2.0.5-3)
 Description: sender policy framework (SPF) tools for Python
- SPF (Sender Policy Framework) related scripts and tools in Python.
+ SPF (Sender Policy Framework) related scripts and tools in Python. This
+ package currently provides three scripts:
  .
+  * pyspf: command line use of spf.py
+  * spfquery: Python implementation of spfquery (uses alternatives)
+  * pyspf-type99: Tool to convert SPF records of type TXT to type SPF
+ .
  For more information about SPF look at http://www.openspf.org/

Modified: packages/pyspf/trunk/debian/pyspf.1
===================================================================
--- packages/pyspf/trunk/debian/pyspf.1	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/pyspf.1	2010-12-04 15:57:45 UTC (rev 15021)
@@ -128,12 +128,12 @@
 .\" ========================================================================
 .\"
 .IX Title "python-spf 1"
-.TH python-spf 1 "2007-12-07"
+.TH python-spf 1 "2010-12-03"
 .SH "NAME"
 pyspf \- pure-Python SPF library
 .SH "VERSION"
 .IX Header "VERSION"
-2\.0\.4
+2\.0\.5
 
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
@@ -186,7 +186,7 @@
 \'fail', 450 for 'error' and 250 for all else.  The third is an explanation.
 
 Note: SPF results alone are never sufficient to decide that a message should be
-accepted.  Accept, reject, or defer decisions are a function of local reciever
+accepted.  Accept, reject, or defer decisions are a function of local receiver
 policy.
 
 The RFC 4408 compliant API:

Modified: packages/pyspf/trunk/debian/python-spf.docs
===================================================================
--- packages/pyspf/trunk/debian/python-spf.docs	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/python-spf.docs	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1,2 +1 @@
 README
-debian/README.Debian.python-spf

Deleted: packages/pyspf/trunk/debian/python-spf.manpages
===================================================================
--- packages/pyspf/trunk/debian/python-spf.manpages	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/python-spf.manpages	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1 +0,0 @@
-debian/pyspf.1

Modified: packages/pyspf/trunk/debian/rules
===================================================================
--- packages/pyspf/trunk/debian/rules	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/rules	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1,22 +1,18 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
 
-DEB_PYTHON_SYSTEM=pycentral
-DEB_COMPRESS_EXCLUDE += \.py$ \.yml$
+%:
+	dh $@ --with python2
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-install/python-spf::
+override_dh_install:
 	# Install test suite
 	dh_install test usr/share/doc/python-spf
 
-install/spf-tools-python::
 	# Make dirs for the tools package (then move scripts from python-spf)
 	mkdir -p debian/spf-tools-python/usr/bin/
 	# Rename the `spfquery` tool for the alternatives system
 	# (omitting the ".py" language extension):
-	mv debian/tmp/usr/bin/spfquery.py debian/spf-tools-python/usr/bin/spfquery.$(DEB_SOURCE_PACKAGE)
+	mv debian/tmp/usr/bin/spfquery.py debian/spf-tools-python/usr/bin/spfquery.pyspf
 	# Give the `type99` tool a more specific name
 	# (omitting the ".py" language extension):
-	mv debian/tmp/usr/bin/type99.py	 debian/spf-tools-python/usr/bin/$(DEB_SOURCE_PACKAGE)-type99
+	mv debian/tmp/usr/bin/type99.py	 debian/spf-tools-python/usr/bin/pyspf-type99
+

Modified: packages/pyspf/trunk/debian/spf-tools-python.docs
===================================================================
--- packages/pyspf/trunk/debian/spf-tools-python.docs	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/spf-tools-python.docs	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1,2 +1 @@
-README
 debian/README.Debian.spf-tools-python

Added: packages/pyspf/trunk/debian/spf-tools-python.links
===================================================================
--- packages/pyspf/trunk/debian/spf-tools-python.links	                        (rev 0)
+++ packages/pyspf/trunk/debian/spf-tools-python.links	2010-12-04 15:57:45 UTC (rev 15021)
@@ -0,0 +1 @@
+usr/share/pyshared/spf.py usr/bin/pyspf

Modified: packages/pyspf/trunk/debian/spf-tools-python.manpages
===================================================================
--- packages/pyspf/trunk/debian/spf-tools-python.manpages	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/spf-tools-python.manpages	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1,2 +1,3 @@
 debian/pyspf-type99.1
 debian/spfquery.pyspf.1
+debian/pyspf.1

Modified: packages/pyspf/trunk/debian/spf-tools-python.postinst
===================================================================
--- packages/pyspf/trunk/debian/spf-tools-python.postinst	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/spf-tools-python.postinst	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1,5 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
 
+set -e
 mode=$1
 
 source_package=pyspf

Modified: packages/pyspf/trunk/debian/spf-tools-python.prerm
===================================================================
--- packages/pyspf/trunk/debian/spf-tools-python.prerm	2010-12-04 12:30:13 UTC (rev 15020)
+++ packages/pyspf/trunk/debian/spf-tools-python.prerm	2010-12-04 15:57:45 UTC (rev 15021)
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 mode=$1
 




More information about the Python-modules-commits mailing list