Package: python-configglue
Version: 1.0-1build1
Severity: normal

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear Maintainer,

A new version of configglue has been released upstream.  Version 1.1.0 also
adds Python 3 support.  Attached is a debdiff to update to the new upstream
release and enable Python 3 support via the new python3-configglue binary
package.

The patch also contains a number of updates and style changes based on
https://wiki.debian.org/Python/LibraryStyleGuide


- -- System Information:
Debian Release: wheezy/sid
  APT prefers saucy-updates
  APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy'), 
(100, 'saucy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.10.0-1-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages python-configglue depends on:
ii  python      2.7.5-1ubuntu1
ii  python-xdg  0.25-3
ii  python2.7   2.7.5-5ubuntu1

python-configglue recommends no packages.

python-configglue suggests no packages.

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJR0hm0AAoJEBJutWOnSwa/opwP/34p5NTtN5aaGFsfuDqG4ChL
T4lf2Oskq9K1Yqcb7zt+4os9cLvW0NRxWLPTsdjU95OXqdrudlNo/SkSOMhAw6UN
xeadm0UmI1k9RRwhebaprwrR3ZVln7R2rkL5WDzl2s3PpxG1FjCqsgppYpSsXqnq
v8Lzk7/oVreeuemMpi3AFaPE9QzVViCNSFjrwjyuPyM/WwyHvhL66HfPqajXzXB2
hdzkeeJe0PDAoJvUEdDjIt4GRwJHh7aF9hY+f2ewCcZGOn8siaugapEAIGvusYT+
z+mehWVEX9kvSkZldY9zt2zff6si0BdKcHGh4Jr3Q2CSYcbBUi7wqe9syGItBKkR
LrC4Pekh+yYlpDWPUiFatPVxI4+hzgA8zvf4odxqozpTx3ckwNqufwLfr5qVUgNg
SMfjvuuqH0b15qL/ouKS7Q1B8p5xeSMVuZsdTkzg6yKwxNyk28xDCVIEqqLTvHG8
Qv++038TR612/p5w5KfDCHXRSm5fYtBIvgDZIlKcA1r8ryX3XfrEuXSGsTJMbS9r
hBFk/0xeHmFPNZPuyCGLJFTcUi2Ln7ZR05hF0ES+vE9hFx7WmDwzyK+uhyDIricz
62NH2q/1NnI3pBEknGQf+/oNONZSdBxtIreWqKoIwvd1CdkHfQT7YPMPnCqJ8FGS
vTbWoDqddGXso7voCjzc
=2BWE
-----END PGP SIGNATURE-----
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-05 11:14:22 +0000
+++ debian/changelog	2013-07-02 00:03:01 +0000
@@ -1,3 +1,22 @@
+python-configglue (1.1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Add Python 3 packaging.
+    - debian/compat: bump to 8
+    - debian/control:
+      + Add required Python 2 and Python 3 Build-Depends
+      + Add X-Python3-Version header
+      + Standards-Version bumped to 3.9.4
+      + Added python3-configglue binary package.
+    - debian/patches/disable-lp1196754.patch: Required due to test suite
+      failure when run in Python 3 under non-UTF-8 locales.
+    - debian/pycompat: Obsolete, removed.
+    - debian/python{,3}-configglue.install: Added
+    - debian/rules: Add rules to build and test for Python 3.
+    - debian/source/format: Added.
+
+ -- Barry Warsaw <[email protected]>  Mon, 01 Jul 2013 20:01:46 -0400
+
 python-configglue (1.0-1) unstable; urgency=low
 
   * New upstream release

=== modified file 'debian/compat'
--- debian/compat	2009-06-15 14:33:00 +0000
+++ debian/compat	2013-07-02 00:03:01 +0000
@@ -1,1 +1,1 @@
-5
+8

=== modified file 'debian/control'
--- debian/control	2011-08-05 11:14:22 +0000
+++ debian/control	2013-07-02 00:03:01 +0000
@@ -2,18 +2,37 @@
 Section: python
 Priority: optional
 Maintainer: Andrew Mitchell <[email protected]>
-Build-Depends: 
+Build-Depends:
  python (>= 2.6.6-3~),
  python-setuptools,
+ python-xdg,
+ python-configparser,
+ python-mock,
+ python3,
+ python3-setuptools,
+ python3-xdg,
+ python3-mock,
  debhelper (>= 7.0.50)
-X-Python-Version: >=2.6
-Standards-Version: 3.9.2
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
+Standards-Version: 3.9.4
 
 Package: python-configglue
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${python:Depends}
 Description: Glues together optparse.OptionParser and ConfigParser.ConfigParser
- Configglue is a library that glues together python's optparse.OptionParser 
- and ConfigParser.ConfigParser, so that the same options can be exported to a
- configuration file and a commandline interface.
+ Configglue is a library that glues together python's optparse.OptionParser
+ and ConfigParser.ConfigParser, so that the same options can be exported to a
+ configuration file and a commandline interface.
+ .
+ This is the Python 2 package.
+
+Package: python3-configglue
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: Glues together optparse.OptionParser and ConfigParser.ConfigParser
+ Configglue is a library that glues together python's optparse.OptionParser
+ and ConfigParser.ConfigParser, so that the same options can be exported to a
+ configuration file and a commandline interface.
+ .
+ This is the Python 3 package.

=== added directory 'debian/patches'
=== added file 'debian/patches/disable-lp1196754.patch'
--- debian/patches/disable-lp1196754.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable-lp1196754.patch	2013-07-02 00:03:01 +0000
@@ -0,0 +1,24 @@
+Description: Disable a test that fails in Python 3 when run under a non-UTF-8
+ locale, as is the case with sbuilds.
+Author: Barry Warsaw <[email protected]>
+Bug: https://bugs.launchpad.net/configglue/+bug/1196754
+Forwarded: not-needed
+
+--- a/configglue/tests/test_parser.py
++++ b/configglue/tests/test_parser.py
+@@ -19,6 +19,7 @@
+ import codecs
+ import os
+ import shutil
++import sys
+ import tempfile
+ import textwrap
+ import unittest
+@@ -1000,6 +1001,7 @@
+         expected = '[__main__]\nfoo = 42'
+         self._check_save_file(expected)
+ 
++    @unittest.skipIf(sys.version_info[0] > 2, 'See http://pad.lv/1196754')
+     def test_save_config_non_ascii(self):
+         expected = '[__main__]\nfoo = fóobâr'
+         self._check_save_file(expected)

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-07-02 00:03:01 +0000
@@ -0,0 +1,1 @@
+disable-lp1196754.patch

=== removed file 'debian/pycompat'
--- debian/pycompat	2009-06-15 14:33:00 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== added file 'debian/python-configglue.install'
--- debian/python-configglue.install	1970-01-01 00:00:00 +0000
+++ debian/python-configglue.install	2013-07-02 00:03:01 +0000
@@ -0,0 +1,1 @@
+usr/lib/python2*

=== added file 'debian/python3-configglue.install'
--- debian/python3-configglue.install	1970-01-01 00:00:00 +0000
+++ debian/python3-configglue.install	2013-07-02 00:03:01 +0000
@@ -0,0 +1,1 @@
+usr/lib/python3

=== modified file 'debian/rules'
--- debian/rules	2011-07-19 08:50:46 +0000
+++ debian/rules	2013-07-02 00:03:01 +0000
@@ -1,4 +1,41 @@
 #!/usr/bin/make -f
 
+PYTHON2=$(shell pyversions -vr)
+PYTHON3=$(shell py3versions -vr)
+
+# Prevent setuptools/distribute from accessing the internet.
+export http_proxy = http://127.0.9.1:9
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+test-python%:
+	python$* setup.py test
+
+override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+endif
+
+build-python%:
+	python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+	dh_auto_build
+
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
+	dh_auto_install
+
+# override_dh_installchangelogs:
+#         dh_installchangelogs -k foo/NEWS.rst
+
+# override_dh_installdocs:
+#         python setup.py build_sphinx
+#         dh_installdocs build/sphinx/html
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build
+	rm -rf *.egg-info

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2013-07-02 00:03:01 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

Reply via email to