[Python-modules-commits] r32785 - in packages/pyrad/trunk/debian (5 files)

[sharky at users.alioth.debian.org]

    Date: Tuesday, May 26, 2015 @ 09:12:25
  Author: sharky
Revision: 32785

build python3-pyrad too

Added:
  packages/pyrad/trunk/debian/patches/python3.patch
Modified:
  packages/pyrad/trunk/debian/changelog
  packages/pyrad/trunk/debian/control
  packages/pyrad/trunk/debian/patches/series
  packages/pyrad/trunk/debian/rules

Modified: packages/pyrad/trunk/debian/changelog
===================================================================
--- packages/pyrad/trunk/debian/changelog	2015-05-26 08:26:53 UTC (rev 32784)
+++ packages/pyrad/trunk/debian/changelog	2015-05-26 09:12:25 UTC (rev 32785)
@@ -1,8 +1,13 @@
-pyrad (2.0-3) UNRELEASED; urgency=low
+pyrad (2.0-3) unstable; urgency=low
 
+  [ Jeremy Lainé ]
+  * Build both python-pyrad an python3-pyrad packages (Closes: #782931).
+  * Update Standards-Version to 3.9.6 (no changes).
+
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:01:57 +0200
+ -- Jeremy Lainé <jeremy.laine at m4x.org>  Tue, 26 May 2015 11:01:45 +0200
 
 pyrad (2.0-2) unstable; urgency=high
 

Modified: packages/pyrad/trunk/debian/control
===================================================================
--- packages/pyrad/trunk/debian/control	2015-05-26 08:26:53 UTC (rev 32784)
+++ packages/pyrad/trunk/debian/control	2015-05-26 09:12:25 UTC (rev 32785)
@@ -3,17 +3,23 @@
 Priority: optional
 Maintainer: Jeremy Lainé <jeremy.laine at m4x.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Bjorn Ove Grotan <bgrotan at grotan.com> 
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python-all,
+               python-setuptools,
+               python3-all,
+               python3-setuptools
+Standards-Version: 3.9.6
 Homepage: http://pypi.python.org/pypi/pyrad
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyrad/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyrad/trunk/
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 
 Package: python-pyrad
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-Description: Python module for creating and decoding RADIUS packets
+Description: Python module for creating and decoding RADIUS packets (Python 2)
  It takes care of all the details like building RADIUS 
  packets, sending them and decoding responses.
  This package contains several modules:
@@ -22,3 +28,20 @@
   - server: Basic RADIUS server and proxy classes.
   - packet: a RADIUS packet as send to/from servers
   - tools: utility functions
+ .
+ This package contains the module for Python 2.
+
+Package: python3-pyrad
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: Python module for creating and decoding RADIUS packets (Python 3)
+ It takes care of all the details like building RADIUS 
+ packets, sending them and decoding responses.
+ This package contains several modules:
+  - client: RADIUS client code
+  - dictionary: RADIUS attribute dictionary
+  - server: Basic RADIUS server and proxy classes.
+  - packet: a RADIUS packet as send to/from servers
+  - tools: utility functions
+ .
+ This package contains the module for Python 3.

Added: packages/pyrad/trunk/debian/patches/python3.patch
===================================================================
--- packages/pyrad/trunk/debian/patches/python3.patch	                        (rev 0)
+++ packages/pyrad/trunk/debian/patches/python3.patch	2015-05-26 09:12:25 UTC (rev 32785)
@@ -0,0 +1,16 @@
+Tuple parameter unpacking was removed in Python 3, see:
+
+https://www.python.org/dev/peps/pep-3113/
+
+--- a/pyrad/curved.py
++++ b/pyrad/curved.py
+@@ -35,7 +35,8 @@
+     def createPacket(self, **kwargs):
+         raise NotImplementedError('Attempted to use a pure base class')
+ 
+-    def datagramReceived(self, datagram, (host, port)):
++    def datagramReceived(self, datagram, source):
++        host, port = source
+         try:
+             pkt = self.CreatePacket(packet=datagram)
+         except packet.PacketError as err:

Modified: packages/pyrad/trunk/debian/patches/series
===================================================================
--- packages/pyrad/trunk/debian/patches/series	2015-05-26 08:26:53 UTC (rev 32784)
+++ packages/pyrad/trunk/debian/patches/series	2015-05-26 09:12:25 UTC (rev 32785)
@@ -1 +1,2 @@
 change_random_generator.patch
+python3.patch

Modified: packages/pyrad/trunk/debian/rules
===================================================================
--- packages/pyrad/trunk/debian/rules	2015-05-26 08:26:53 UTC (rev 32784)
+++ packages/pyrad/trunk/debian/rules	2015-05-26 09:12:25 UTC (rev 32785)
@@ -1,4 +1,11 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
+export PYBUILD_DESTDIR_python2=debian/python-pyrad/
+export PYBUILD_DESTDIR_python3=debian/python3-pyrad/
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3 --buildsystem=pybuild
+
+override_dh_auto_test:
+	: