Imported Debian patch 1.3.6-4

8 files changed, 36 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index bbff703..533eeb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+blist (1.3.6-4) unstable; urgency=medium
+
+  * Update debian/watch.
+  * Update debian/copyright.
+  * Add XB-Python-Version fields.
+  * Increase standards version to 3.9.6.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Mon, 20 Apr 2015 01:13:10 +0000
+
 blist (1.3.6-3) unstable; urgency=medium
 
   * Depend on python-all-dev (closes: #758175).
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..d9c2ff0
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+blist/*.so
diff --git a/debian/control b/debian/control
index c7debf0..b8e12ac 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  python3-all-dev,
  python-setuptools,
  python3-setuptools,
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 XS-Python-Version: all
 Homepage: http://pypi.python.org/pypi/blist
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/blist/trunk
@@ -19,6 +19,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/blist/trunk
 
 Package: python-blist
 Architecture: any
+XB-Python-Version: ${python:Versions}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
@@ -32,6 +33,7 @@ Description: List-like type for Python with better asymptotic performance
 
 Package: python3-blist
 Architecture: any
+XB-Python-Version: ${python3:Versions}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/debian/copyright b/debian/copyright
index c961800..24c8d5d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,25 @@ Source: http://pypi.python.org/pypi/blist
 Files: *
 Copyright:
  2007-2010 Stutzbach Enterprises, LLC <daniel@stutzbachenterprises.com>
-License: BSD
+License: BSD-3-clause
+
+Files: blist/test/*
+Copyright:
+ PYTHON SOFTWARE FOUNDATION (http://python.org)
+ 2007-2010 Stutzbach Enterprises, LLC <daniel@stutzbachenterprises.com>
+License: Python
+
+Files: blist/test/unittest.py
+Copyright:
+ 1999-2003 Steve Purcell <stephen_purcell@yahoo.com> (http://pyunit.sourceforge.net)
+ 2007-2010 Stutzbach Enterprises, LLC <daniel@stutzbachenterprises.com>
+License: Python
+
+Files: debian/*
+Copyright: 2012-2015 Michael Gilbert <mgilbert@debian.org>
+License: BSD-3-clause
+
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -31,10 +49,6 @@ License: BSD
  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-Files: test/*
-Copyright:
- PYTHON SOFTWARE FOUNDATION (http://python.org)
- 2007-2010 Stutzbach Enterprises, LLC <daniel@stutzbachenterprises.com>
 License: Python
  1. This LICENSE AGREEMENT is between the Python Software Foundation
  ("PSF"), and the Individual or Organization ("Licensee") accessing and
@@ -81,15 +95,3 @@ License: Python
  8. By copying, installing or otherwise using Python, Licensee
  agrees to be bound by the terms and conditions of this License
  Agreement.
-
-Files: test/unittest.py
-Copyright:
- 1999-2003 Steve Purcell <stephen_purcell@yahoo.com> (http://pyunit.sourceforge.net)
- 2007-2010 Stutzbach Enterprises, LLC <daniel@stutzbachenterprises.com>
-License: Python
- See above.
-
-Files: debian/*
-Copyright: 2012-2014 Michael Gilbert <mgilbert@debian.org>
-License: BSD
- See above.
diff --git a/debian/python-blist.lintian-overrides b/debian/python-blist.lintian-overrides
new file mode 100644
index 0000000..fc882fe
--- /dev/null
+++ b/debian/python-blist.lintian-overrides
@@ -0,0 +1 @@
+no-upstream-changelog
diff --git a/debian/python3-blist.lintian-overrides b/debian/python3-blist.lintian-overrides
new file mode 100644
index 0000000..fc882fe
--- /dev/null
+++ b/debian/python3-blist.lintian-overrides
@@ -0,0 +1 @@
+no-upstream-changelog
diff --git a/debian/rules b/debian/rules
index e10a719..b82ed19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,5 @@
 export DH_VERBOSE=1
 export PYBUILD_NAME=blist
 
-override_dh_clean:
-	dh_clean -- blist.egg-info/PKG-INFO blist.egg-info/SOURCES.txt
-
 %:
 	dh $@ --with=python2,python3 --buildsystem=pybuild
diff --git a/debian/watch b/debian/watch
index 6723d64..2bc50f5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://pypi.python.org/packages/source/b/blist/blist-(.+)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/blist/blist-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))