[Python-modules-commits] r33732 - in packages/pyspf/trunk/debian (7 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Thu Aug 13 05:26:12 UTC 2015 

    Date: Thursday, August 13, 2015 @ 05:26:11
  Author: kitterman
Revision: 33732

* New upstream release
* Switch spf-tools-python to use python3 instead of python2.7
  - Update debian/rules and control
  - Patch spf.py to use /usr/bin/python3 when run as a script
* Promote python{3}-authres recommends to depends since it is used in the
  doctests
* Add dh-python to build-depends
* Updated debian/watch to point at pypi.debian.net redirector
* Update debian/copyright
* Update Homepage: field in debian/control to point at pypi instead of
  cheeseshop
* Bump standards version to 3.9.6 without further change.

Added:
  packages/pyspf/trunk/debian/patches/series
  packages/pyspf/trunk/debian/patches/use_python3.diff
Modified:
  packages/pyspf/trunk/debian/changelog
  packages/pyspf/trunk/debian/control
  packages/pyspf/trunk/debian/copyright
  packages/pyspf/trunk/debian/rules
  packages/pyspf/trunk/debian/spf-tools-python.links

Modified: packages/pyspf/trunk/debian/changelog
===================================================================
--- packages/pyspf/trunk/debian/changelog	2015-08-13 03:32:56 UTC (rev 33731)
+++ packages/pyspf/trunk/debian/changelog	2015-08-13 05:26:11 UTC (rev 33732)
@@ -1,3 +1,20 @@
+pyspf (2.0.12t-1) unstable; urgency=medium
+
+  * New upstream release
+  * Switch spf-tools-python to use python3 instead of python2.7
+    - Update debian/rules and control
+    - Patch spf.py to use /usr/bin/python3 when run as a script
+  * Promote python{3}-authres recommends to depends since it is used in the
+    doctests
+  * Add dh-python to build-depends
+  * Updated debian/watch to point at pypi.debian.net redirector
+  * Update debian/copyright
+  * Update Homepage: field in debian/control to point at pypi instead of
+    cheeseshop
+  * Bump standards version to 3.9.6 without further change.
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 05 Aug 2015 19:42:25 -0400
+
 pyspf (2.0.11-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/pyspf/trunk/debian/control
===================================================================
--- packages/pyspf/trunk/debian/control	2015-08-13 03:32:56 UTC (rev 33731)
+++ packages/pyspf/trunk/debian/control	2015-08-13 05:26:11 UTC (rev 33732)
@@ -3,18 +3,18 @@
 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 (>= 9), python-all (>= 2.6.6-6), python3-all
+Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-6), python3-all
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.3
-Homepage: http://cheeseshop.python.org/pypi/pyspf/
+Homepage: https://pypi.python.org/pypi/pyspf/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyspf/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyspf/trunk/
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 
 Package: python-spf
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-dns, python-ipaddr (>= 2.1.10)
-Recommends: python-authres
+Depends: ${python:Depends}, ${misc:Depends}, python-dns, python-ipaddr (>= 2.1.10),
+ python-authres
 Suggests: python-yaml
 Breaks: postfix-policyd-spf-python (<< 1.1~), tumgreyspf (<< 1.36-4.1~)
 Description: sender policy framework (SPF) module for Python
@@ -25,8 +25,8 @@
 
 Package: python3-spf
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}, python3-dns (>= 3.0.2-1+deb7u1)
-Recommends: python3-authres
+Depends: ${python3:Depends}, ${misc:Depends}, python3-dns (>= 3.0.2-1+deb7u1),
+  python3-authres
 Suggests: python3-yaml
 Breaks: postfix-policyd-spf-python (<< 1.2~)
 Description: sender policy framework (SPF) module for Python 3
@@ -37,7 +37,7 @@
 
 Package: spf-tools-python
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-spf
+Depends: ${python3:Depends}, ${misc:Depends}, python3-spf
 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. This

Modified: packages/pyspf/trunk/debian/copyright
===================================================================
--- packages/pyspf/trunk/debian/copyright	2015-08-13 03:32:56 UTC (rev 33731)
+++ packages/pyspf/trunk/debian/copyright	2015-08-13 05:26:11 UTC (rev 33732)
@@ -8,9 +8,9 @@
 Copyright Holder: (c) 2003 Terence Way <terry-spf at wayforward.net>
 Portions Copyright(c) 2004,2005,2006,2007,2008,2011,2012 Stuart Gathman
                       <stuart at bmsi.com>
-Portions Copyright(c) 2005,2006,2007,2008,2011,2012,2013 Scott Kitterman
+Portions Copyright(c) 2005,2006,2007,2008,2011,2012,2013,2014 Scott Kitterman
                        <scott at kitterman.com>
-Portions Copyright(c) 2013 Stuart Gathman <stuart at gathman.org>
+Portions Copyright(c) 2013,2014 Stuart Gathman <stuart at gathman.org>
 
 
 This software is licensed under the Python Software Foundation License.
@@ -96,3 +96,31 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+The RFC 7208 test-suite (rfc7208-tests.yml) is
+(C) 2006-2008 Stuart D Gathman <stuart at bmsi.com>
+    2007-2008 Julian Mehnle <julian at mehnle.net>
+         2014 Scott Kitterman <scott at kitterman.com>
+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.
+

Added: packages/pyspf/trunk/debian/patches/series
===================================================================
--- packages/pyspf/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyspf/trunk/debian/patches/series	2015-08-13 05:26:11 UTC (rev 33732)
@@ -0,0 +1 @@
+use_python3.diff

Added: packages/pyspf/trunk/debian/patches/use_python3.diff
===================================================================
--- packages/pyspf/trunk/debian/patches/use_python3.diff	                        (rev 0)
+++ packages/pyspf/trunk/debian/patches/use_python3.diff	2015-08-13 05:26:11 UTC (rev 33732)
@@ -0,0 +1,14 @@
+Description: Patch spf.py to use /usr/bin/python3 when run as a script
+Author: Scott Kitterman <scott at kitterman.com>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2015-08-13
+
+--- pyspf-2.0.12t.orig/spf.py
++++ pyspf-2.0.12t/spf.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ from __future__ import print_function
+ """SPF (Sender Policy Framework) implementation.
+ 

Modified: packages/pyspf/trunk/debian/rules
===================================================================
--- packages/pyspf/trunk/debian/rules	2015-08-13 03:32:56 UTC (rev 33731)
+++ packages/pyspf/trunk/debian/rules	2015-08-13 05:26:11 UTC (rev 33732)
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+export DH_VERBOSE=1
 %:
 	dh $@ --with python2,python3
 
@@ -19,13 +20,11 @@
 	mkdir -p debian/spf-tools-python/usr/bin/
 	# Rename the `spfquery` tool for the alternatives system
 	# (omitting the ".py" language extension):
-	mv $(CURDIR)/debian/python-spf/usr/bin/spfquery.py debian/spf-tools-python/usr/bin/spfquery.pyspf
+	mv $(CURDIR)/debian/python3-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 $(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
+	mv $(CURDIR)/debian/python3-spf/usr/bin/type99.py	 debian/spf-tools-python/usr/bin/pyspf-type99
+	rm -rf $(CURDIR)/debian/python*-spf/usr/bin
 
 override_dh_installdocs:
 
@@ -46,7 +45,11 @@
 
 override_dh_fixperms:
 	dh_fixperms
-	chmod +x $(CURDIR)/debian/python-spf/usr/lib/python2.?/*-packages/spf.py
+	chmod +x $(CURDIR)/debian/python3-spf/usr/lib/python3/dist-packages/spf.py
 
+override_dh_python2:
+	dh_python2 -N spf-tools-python
+
 override_dh_python3:
-	dh_python3 -N spf-tools-python
+	dh_python3 --shebang=/usr/bin/python3
+

Modified: packages/pyspf/trunk/debian/spf-tools-python.links
===================================================================
--- packages/pyspf/trunk/debian/spf-tools-python.links	2015-08-13 03:32:56 UTC (rev 33731)
+++ packages/pyspf/trunk/debian/spf-tools-python.links	2015-08-13 05:26:11 UTC (rev 33732)
@@ -1 +1 @@
-usr/lib/python2.7/dist-packages/spf.py usr/bin/pyspf
+usr/lib/python3/dist-packages/spf.py usr/bin/pyspf

More information about the Python-modules-commits mailing list