Date: Thursday, October 27, 2011 @ 19:58:53
Author: kitterman
Revision: 19080
* New upstream release (2.0.6)
- Supports python3 with 2to3
* Add new binary package for python3-spf
* Rework debian/rules to use 2to3 and build both spf binaries
* Removed no longer needed debian/python-spf.install
* Update debian/copyright
* Bump standards-version to 3.9.2 without further change
Added:
packages/pyspf/trunk/debian/python3-spf.docs
Modified:
packages/pyspf/trunk/debian/changelog
packages/pyspf/trunk/debian/control
packages/pyspf/trunk/debian/copyright
packages/pyspf/trunk/debian/python-spf.docs
packages/pyspf/trunk/debian/rules
Deleted:
packages/pyspf/trunk/debian/python-spf.install
Modified: packages/pyspf/trunk/debian/changelog
===================================================================
--- packages/pyspf/trunk/debian/changelog 2011-10-26 21:50:24 UTC (rev 19079)
+++ packages/pyspf/trunk/debian/changelog 2011-10-27 19:58:53 UTC (rev 19080)
@@ -1,10 +1,19 @@
-pyspf (2.0.5-6) UNRELEASED; urgency=low
+pyspf (2.0.6-1) unstable; urgency=low
[ Guilherme de Siqueira Pastore ]
* Remove myself from the Uploaders field in debian/control.
- -- Guilherme de Siqueira Pastore <gpastore at debian.org> Wed, 07 Sep 2011 20:58:32 -0300
+ [ Scott Kitterman ]
+ * New upstream release
+ - Supports python3 with 2to3
+ * Add new binary package for python3-spf
+ * Rework debian/rules to use 2to3 and build both spf binaries
+ * Removed no longer needed debian/python-spf.install
+ * Update debian/copyright
+ * Bump standards-version to 3.9.2 without further change
+ -- Scott Kitterman <scott at kitterman.com> Thu, 27 Oct 2011 14:41:56 -0400
+
pyspf (2.0.5-5) unstable; urgency=low
* No change rebuild for python transiiton
Modified: packages/pyspf/trunk/debian/control
===================================================================
--- packages/pyspf/trunk/debian/control 2011-10-26 21:50:24 UTC (rev 19079)
+++ packages/pyspf/trunk/debian/control 2011-10-27 19:58:53 UTC (rev 19080)
@@ -3,22 +3,34 @@
Priority: optional
Maintainer: Scott Kitterman <scott at kitterman.com>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Gustavo Franco <stratus at debian.org>
-Build-Depends: debhelper (>= 7.3.16), python-all (>= 2.6.6-6)
+Build-Depends: debhelper (>= 7.3.16), python-all (>= 2.6.6-6), python3-all
X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.1
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.9.1
+Standards-Version: 3.9.2
Package: python-spf
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, python-dns
Suggests: python-yaml
Description: sender policy framework (SPF) module for Python
- This module provides SPF (Sender Policy Framework). It is RFC 4408 compliant.
+ This module provides SPF (Sender Policy Framework) for Python. It is RFC 4408
+ compliant.
.
For more information about SPF see http://www.openspf.org/
+Package: python3-spf
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}, python3-dns
+Suggests: python3-yaml
+Description: sender policy framework (SPF) module for Python 3
+ This module provides SPF (Sender Policy Framework) for Python 3. It is RFC
+ 4408 compliant.
+ .
+ For more information about SPF see http://www.openspf.org/
+
Package: spf-tools-python
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, python-spf
@@ -31,4 +43,5 @@
* spfquery: Python implementation of spfquery (uses alternatives)
* pyspf-type99: Tool to convert SPF records of type TXT to type SPF
.
+ spfquery and pyspf-type99 are compatible with python3
For more information about SPF look at http://www.openspf.org/
Modified: packages/pyspf/trunk/debian/copyright
===================================================================
--- packages/pyspf/trunk/debian/copyright 2011-10-26 21:50:24 UTC (rev 19079)
+++ packages/pyspf/trunk/debian/copyright 2011-10-27 19:58:53 UTC (rev 19080)
@@ -8,7 +8,7 @@
Copyright Holder: (c) 2003 Terence Way <terry-spf at wayforward.net>
Portions Copyright (c) 2004,2005,2006,2007,2008 Stuart Gathman
<stuart at bmsi.com>
-Portions Copyright (c) 2005,2006,2007,2009 Scott Kitterman
+Portions Copyright (c) 2005,2006,2007,2008 Scott Kitterman
<scott at kitterman.com>
This software is licensed under the Python Software Foundation License.
@@ -29,3 +29,68 @@
PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+spfquery.py:
+
+# Author: Stuart D. Gathman <stuart at bmsi.com>
+# Copyright 2004 Business Management Systems, Inc.
+
+# This module is free software, and you may redistribute it and/or modify
+# it under the same terms as Python itself, so long as this copyright message
+# and disclaimer are retained in their original form.
+
+type99.py:
+
+Copyright (c) 2005,2006 Stuart Gathman <stuart at bmsi.com>
+Portions Copyright (c) 2007 Scott Kitterman <scott at kitterman.com>
+This module is free software, and you may redistribute it and/or modify
+it under the same terms as Python itself, so long as this copyright message
+and disclaimer are retained in their original form.
+
+IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
+AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
+SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+tests/testspf.py:
+
+# Author: Stuart D. Gathman <stuart at bmsi.com>
+# Copyright 2006 Business Management Systems, Inc.
+
+# This module is free software, and you may redistribute it and/or modify
+# it under the same terms as Python itself, so long as this copyright message
+# and disclaimer are retained in their original form.
+
+The RFC 4408 test-suite (rfc4408-tests.yml) is
+(C) 2006-2007 Stuart D Gathman <stuart at bmsi.com>
+ 2007 Julian Mehnle <julian at mehnle.net>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
Modified: packages/pyspf/trunk/debian/python-spf.docs
===================================================================
--- packages/pyspf/trunk/debian/python-spf.docs 2011-10-26 21:50:24 UTC (rev 19079)
+++ packages/pyspf/trunk/debian/python-spf.docs 2011-10-27 19:58:53 UTC (rev 19080)
@@ -1 +1,5 @@
README
+test/doctest.yml
+test/rfc4408-tests.yml
+test/testspf.py
+test/test.yml
Deleted: packages/pyspf/trunk/debian/python-spf.install
===================================================================
--- packages/pyspf/trunk/debian/python-spf.install 2011-10-26 21:50:24 UTC (rev 19079)
+++ packages/pyspf/trunk/debian/python-spf.install 2011-10-27 19:58:53 UTC (rev 19080)
@@ -1,2 +0,0 @@
-spf.py usr/share/pyshared/
-
Added: packages/pyspf/trunk/debian/python3-spf.docs
===================================================================
--- packages/pyspf/trunk/debian/python3-spf.docs (rev 0)
+++ packages/pyspf/trunk/debian/python3-spf.docs 2011-10-27 19:58:53 UTC (rev 19080)
@@ -0,0 +1,5 @@
+README
+test/doctest.yml
+test/rfc4408-tests.yml
+test/testspf.py
+test/test.yml
Modified: packages/pyspf/trunk/debian/rules
===================================================================
--- packages/pyspf/trunk/debian/rules 2011-10-26 21:50:24 UTC (rev 19079)
+++ packages/pyspf/trunk/debian/rules 2011-10-27 19:58:53 UTC (rev 19080)
@@ -1,18 +1,50 @@
#!/usr/bin/make -f
%:
- dh $@ --with python2
+ dh $@ --with python2,python3
-override_dh_install:
- # Install test suite
- dh_install test usr/share/doc/python-spf
+override_dh_auto_install:
+ set -e && for pyvers in $(shell pyversions -vr); do \
+ python$$pyvers setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/python-spf; \
+ done
+
+ 2to3 -w $(CURDIR)/spf.py
+
+ set -e && for py3vers in $(shell py3versions -sv); do \
+ python$$py3vers setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/python3-spf; \
+ done
+
+ mv $(CURDIR)/spf.py.bak $(CURDIR)/spf.py
+
# 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.pyspf
+ mv $(CURDIR)/debian/python-spf/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/pyspf-type99
+ mv $(CURDIR)/debian/python-spf/usr/bin/type99.py debian/spf-tools-python/usr/bin/pyspf-type99
+ rm -rf $(CURDIR)/debian/python-spf/usr/bin
+ # Don't ship python3 specific variants of spf-tools (current scripts work for both)
+ rm -rf $(CURDIR)/debian/python3-spf/usr/bin
+override_dh_installdocs:
+
+ cp $(CURDIR)/CHANGELOG $(CURDIR)/changelog
+ dh_installdocs
+ rm $(CURDIR)/changelog
+
+override_dh_auto_clean:
+
+ set -e && for pyvers in $(shell pyversions -vr); do \
+ python$$pyvers setup.py clean -a; \
+ done
+ set -e && for py3vers in $(shell py3versions -sv); do \
+ python$$py3vers setup.py clean -a; \
+ done
+ find . -name \*.pyc -exec rm {} \;
+ dh_clean
+