[Pkg-cracklib-commits] [SCM] Git repository for pkg-cracklib branch, experimental, updated. debian/2.8.16-2-19-gb343783

[Jan Dittberner]

The following commit has been merged in the experimental branch:
commit 05772e959a2561e76549e91e39da16d70f13d4e6
Author: Jan Dittberner <jandd at debian.org>
Date:   Mon Jan 24 18:21:25 2011 +0100

    patch python/setup.py to use 2to3, add python3 to dh call

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
index e10aacd..978350d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,11 @@ cracklib2 (2.8.18-2) experimental; urgency=low
       python3-all-dev, python3-setuptools and python3-all to
       Build-Depends
     - debian/rules: add rules to build the Python3 binary package
-  * Switch to dh_python2 instead of python-support
+    - add debian/patches/python3-support and debian/patches/series to
+      modify python/setup.py for 2to3 usage
+  * Switch to dh_python2/dh_python3 instead of python-support
     - debian/control: remove python-support from Build-Depends
-    - debian/rules: add --with python2 to dh invocation
+    - debian/rules: add --with python2,python3 to dh invocation
 
  -- Jan Dittberner <jandd at debian.org>  Mon, 24 Jan 2011 17:55:33 +0100
 
@@ -493,7 +495,7 @@ cracklib2 (2.7-16) unstable; urgency=high
 
 cracklib2 (2.7-15) unstable; urgency=high
 
-  * Added missing "Depends: ${shlibs:Depends}" to cracklib-runtime. Thanks to 
+  * Added missing "Depends: ${shlibs:Depends}" to cracklib-runtime. Thanks to
     Maks Attems for discovering this. (closes: #280668)
   * Urgency high since this is an RC bug and no code changes were made.
 
diff --git a/debian/patches/python3-support.patch b/debian/patches/python3-support.patch
new file mode 100644
index 0000000..595db10
--- /dev/null
+++ b/debian/patches/python3-support.patch
@@ -0,0 +1,17 @@
+Subject: add Python3 support using 2to3
+Author: Jan Dittberner <jandd at debian.org>
+--- a/python/setup.py.in
++++ b/python/setup.py.in
+@@ -1,5 +1,5 @@
+ #!/usr/bin/python
+-# Copyright 2009 Jan Dittberner <jan at dittberner.info>
++# Copyright 2009, 2011 Jan Dittberner <jan at dittberner.info>
+ #
+ # This file is part of cracklib.
+ #
+@@ -55,4 +55,5 @@
+         "Topic :: Software Development :: Libraries :: Python Modules",
+         "Topic :: System :: Systems Administration",
+     ],
++    use_2to3=True,
+ )
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7b6c1aa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+python3-support.patch
diff --git a/debian/rules b/debian/rules
index 1b6b81b..bb2e129 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,4 +81,4 @@ override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
 %:
-	dh --with python2 $@
+	dh --with python2,python3 $@

-- 
Git repository for pkg-cracklib