Imported Debian patch 1.3.6-2

4 files changed, 49 insertions, 88 deletions

diff --git a/debian/changelog b/debian/changelog
index 546d8f9..3142a65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+blist (1.3.6-2) unstable; urgency=medium
+
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+  [ Michael Gilbert ]
+  * Fix some lintian warnings.
+  * Use pybuild and build a python3 package (closes: #748346).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Wed, 13 Aug 2014 21:55:33 +0000
+
 blist (1.3.6-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 8cde202..581ee25 100644
--- a/debian/control
+++ b/debian/control
@@ -6,22 +6,39 @@ Uploaders:
  Michael Gilbert <mgilbert@debian.org>
 Build-Depends:
  debhelper (>= 9),
+ dh-python,
+ python-all,
+ python3-all,
  python-setuptools,
- python-all-dev (>= 2.6.6-3~),
+ python3-setuptools,
 Standards-Version: 3.9.5
 XS-Python-Version: all
 Homepage: http://pypi.python.org/pypi/blist
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/blist/trunk
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/blist/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/blist/trunk
 
 Package: python-blist
 Architecture: any
 Depends:
+ ${misc:Depends},
  ${shlibs:Depends},
+ ${python:Depends},
+Provides:
+ ${python:Provides},
+Description: List-like type for Python with better asymptotic performance
+ This package is a drop-in replacement for Python lists providing better
+ performance when modifying large lists (provides sortedlist, sortedset,
+ weaksortedlist, weaksortedset, sorteddict, and btuple types).
+
+Package: python3-blist
+Architecture: any
+Depends:
  ${misc:Depends},
- ${python:Depends}
-Description: List-like type for python with better asymptotic performance
- This package is a drop-in replacement for the Python list the provides better
- performance when modifying large lists. The blist package also provides
- sortedlist, sortedset, weaksortedlist, weaksortedset, sorteddict, and btuple
- types.
+ ${shlibs:Depends},
+ ${python3:Depends},
+Provides:
+ ${python3:Provides},
+Description: List-like type for Python 3 with better asymptotic performance
+ This package is a drop-in replacement for Python 3 lists providing better
+ performance when modifying large lists (provides sortedlist, sortedset,
+ weaksortedlist, weaksortedset, sorteddict, and btuple types).
diff --git a/debian/copyright b/debian/copyright
index 8b3bf87..c961800 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
-Upstream-Name: blist
 Source: http://pypi.python.org/pypi/blist 
 
 Files: *
-Copyright: 2007-2010 Stutzbach Enterprises, LLC <daniel@stutzbachenterprises.com>
+Copyright:
+ 2007-2010 Stutzbach Enterprises, LLC <daniel@stutzbachenterprises.com>
 License: BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
@@ -32,8 +32,9 @@ License: BSD
  POSSIBILITY OF SUCH DAMAGE.
 
 Files: test/*
-Copyright: PYTHON SOFTWARE FOUNDATION (http://python.org)
-Copyright: 2007-2010 Stutzbach Enterprises, LLC <daniel@stutzbachenterprises.com>
+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
@@ -82,80 +83,13 @@ License: Python
  Agreement.
 
 Files: test/unittest.py
-Copyright: 1999-2003 Steve Purcell <stephen_purcell@yahoo.com> (http://pyunit.sourceforge.net)
-Copyright: 2007-2010 Stutzbach Enterprises, LLC <daniel@stutzbachenterprises.com>
+Copyright:
+ 1999-2003 Steve Purcell <stephen_purcell@yahoo.com> (http://pyunit.sourceforge.net)
+ 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
- otherwise using this software ("Python") in source or binary form and
- its associated documentation.
- .
- 2. Subject to the terms and conditions of this License Agreement, PSF
- hereby grants Licensee a nonexclusive, royalty-free, world-wide
- license to reproduce, analyze, test, perform and/or display publicly,
- prepare derivative works, distribute, and otherwise use Python
- alone or in any derivative version, provided, however, that PSF's
- License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
- 2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation;
- All Rights Reserved" are retained in Python alone or in any derivative
- version prepared by Licensee.
- .
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Python or any part thereof, and wants to make
- the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to Python.
- .
- 4. PSF is making Python available to Licensee on an "AS IS"
- basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
- .
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
- FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- .
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
- .
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between PSF and
- Licensee.  This License Agreement does not grant permission to use PSF
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
- .
- 8. By copying, installing or otherwise using Python, Licensee
- agrees to be bound by the terms and conditions of this License
- Agreement.
+ See above.
 
 Files: debian/*
-Copyright: 2012 Michael Gilbert <mgilbert@debian.org>
+Copyright: 2012-2014 Michael Gilbert <mgilbert@debian.org>
 License: BSD
- 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 name of the author may not be used to endorse or promote
-       products derived from this software without specific prior written
-       permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ See above.
diff --git a/debian/rules b/debian/rules
index 9d9e085..e10a719 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 
-export CC=gcc
-export LDSHARED=gcc -shared -Wl,-O1 -Wl,-Bsymbolic-functions
 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
+	dh $@ --with=python2,python3 --buildsystem=pybuild