--- python-bsddb3-6.0.1.orig/debian/changelog +++ python-bsddb3-6.0.1/debian/changelog @@ -0,0 +1,194 @@ +python-bsddb3 (6.0.1-1build1) trusty; urgency=medium + + * No-change rebuild to drop Python 3.3 support. + + -- Matthias Klose Sun, 23 Mar 2014 15:28:16 +0000 + +python-bsddb3 (6.0.1-1) unstable; urgency=medium + + * New upstream release. + + -- Matthias Klose Wed, 19 Feb 2014 14:37:43 +0100 + +python-bsddb3 (5.3.0-4) unstable; urgency=low + + * Build using libdb5.1-dev on s390, no db5.3 packages yet available. + + -- Matthias Klose Fri, 10 May 2013 00:42:08 +0200 + +python-bsddb3 (5.3.0-3) unstable; urgency=low + + * Drop explicit build dependency on python3.2-dev. + * Build-depend on libdb5.3-dev for jessie. + + -- Matthias Klose Mon, 06 May 2013 21:21:45 +0200 + +python-bsddb3 (5.3.0-2) unstable; urgency=low + + * Build-depend on python3.2-dev (>= 3.2.3-7). Closes: #700996. + * Build-depend on libdb5.1-dev. + + -- Matthias Klose Wed, 20 Feb 2013 16:16:16 +0100 + +python-bsddb3 (5.3.0-1) unstable; urgency=low + + * New upstream release. + + -- Matthias Klose Tue, 17 Apr 2012 15:10:52 +0200 + +python-bsddb3 (5.2.0-1) unstable; urgency=low + + * New upstream release. + * Fix build failure with multiarch locations. Closes: #634604. + + -- Matthias Klose Thu, 18 Aug 2011 11:35:50 +0200 + +python-bsddb3 (5.1.2-1) unstable; urgency=low + + * New upstream version, supporting bsddb 5.1. Closes: #621458. + * Don't compress object.inv. Closes: #608767. + * Don't use XS-Python-Version for Python3. Closes: #614850. + + -- Matthias Klose Fri, 22 Apr 2011 11:35:39 +0200 + +python-bsddb3 (4.8.3-3) unstable; urgency=low + + * Upload to unstable. + + -- Matthias Klose Thu, 23 Sep 2010 20:04:39 +0200 + +python-bsddb3 (4.8.3-2) experimental; urgency=low + + * Build using dh_python2/dh_python3 instead of dh_pycentral. + * Fix typo in package description. Closes: #586898. + + -- Matthias Klose Sun, 12 Sep 2010 20:17:08 +0200 + +python-bsddb3 (4.8.3-1) unstable; urgency=low + + * New upstream version. + * Keep the documentation from the 4.8.0 release. + * Build a python3-bsddb3 package. + + -- Matthias Klose Sun, 14 Mar 2010 16:00:58 +0100 + +python-bsddb3 (4.8.0-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/rules: Remove hard-coded Python versions 2.4 and 2.5 + to allow building with all future versions (closes: #555799) + + -- Jonathan Wiltshire Tue, 17 Nov 2009 22:20:48 +0000 + +python-bsddb3 (4.8.0-2) unstable; urgency=low + + * Use the installed python-sphinx. Closes: #549820. + + -- Matthias Klose Sun, 11 Oct 2009 21:18:09 +0200 + +python-bsddb3 (4.8.0-1) unstable; urgency=low + + * New upstream version, supporting Berkeley DB 4.8. + * Build-depend on the versioned libdbX.Y-dev package to avoid unintended + updates of databases. + * Upload to unstable. Closes: #501014. + * Intent to remove the module from the python standard library and let + the python package depend on it. + + -- Matthias Klose Sat, 26 Sep 2009 20:19:19 +0200 + +python-bsddb3 (4.7.6-0ubuntu1) karmic; urgency=low + + * New upstream version. + * Build the module for python3, not shipping anymore with bsddb3. + + -- Matthias Klose Tue, 15 Sep 2009 22:30:31 +0000 + +python-bsddb3 (4.7.5-0ubuntu2) jaunty; urgency=low + + * New upstream version. + + -- Matthias Klose Mon, 16 Feb 2009 23:52:53 +0000 + +python-bsddb3 (4.7.3-0ubuntu1) intrepid; urgency=low + + * New upstream version. + * Separate package; not included anymore in python3.0. + + -- Matthias Klose Fri, 24 Oct 2008 00:28:08 +0200 + +python-bsddb3 (3.3.0-6ubuntu1) hoary; urgency=low + + * Replace package built against python-2.2 with python-2.4 + + -- Chris Halls Mon, 24 Jan 2005 14:52:54 +0000 + +python-bsddb3 (3.3.0-6) unstable; urgency=low + + * Orphaning this package. + + -- Nathan Hawkins Mon, 9 Aug 2004 18:55:35 -0500 + +python-bsddb3 (3.3.0-5.3) unstable; urgency=low + + * NMU. + * Rebuild against python 2.3 (closes: #204702). + * Use dh_python. + * Standards-Version is 3.6.0. + * Correct copyright file. + * bsddb3/dbshelve.py: remove interpreter line. + + -- Josselin Mouette Thu, 14 Aug 2003 12:57:36 +0200 + +python-bsddb3 (3.3.0-5.2) unstable; urgency=low + + * Fix python dependency (closes: #185372). + + -- Matthias Klose Thu, 10 Apr 2003 19:48:41 +0200 + +python-bsddb3 (3.3.0-5.1) unstable; urgency=low + + * Fix python dependency (closes: #168447). + + -- Matthias Klose Tue, 25 Feb 2003 12:49:01 +0100 + +python-bsddb3 (3.3.0-5) unstable; urgency=low + + * Fixed build dependacies to include python2.1, python2.2 and python. + Closes: #165999. + + -- Nathan Hawkins Wed, 23 Oct 2002 09:45:11 -0400 + +python-bsddb3 (3.3.0-4) unstable; urgency=low + + * Fixed dbobj.DBEnv.set_flags. Closes: #160273. + * Made debian/rules run dh_strip, removes lintian error about _db.so. + * Moved documentation into python-bsddb3-doc. It was incorrectly being + installed into python-bsddb3. + + -- Nathan Hawkins Tue, 10 Sep 2002 11:41:51 -0400 + +python-bsddb3 (3.3.0-3) unstable; urgency=low + + * Now supporting both python 2.2 and 2.1. Split into three binary packages, + python-bsddb3 (dependacy package), python2.1-bsddb3 and python2.2-bsddb3. + * Removed .pyc files which were improperly being included in the .deb. + + -- Nathan P. Hawkins III Sat, 15 Jun 2002 20:40:04 -0400 + +python-bsddb3 (3.3.0-2) unstable; urgency=low + + * Fixed build-depends, added package preinst/prerm scripts and moved to + interpreters section. Closes: #126490. + + -- Nathan Hawkins Wed, 26 Dec 2001 12:39:20 -0500 + +python-bsddb3 (3.3.0-1) unstable; urgency=low + + * Initial Release. + + -- Nathan P. Hawkins III Tue, 27 Nov 2001 10:47:06 -0500 + +Local variables: +mode: debian-changelog +End: --- python-bsddb3-6.0.1.orig/debian/compat +++ python-bsddb3-6.0.1/debian/compat @@ -0,0 +1 @@ +5 --- python-bsddb3-6.0.1.orig/debian/control +++ python-bsddb3-6.0.1/debian/control @@ -0,0 +1,86 @@ +Source: python-bsddb3 +Section: python +Priority: optional +Maintainer: Matthias Klose +Build-Depends: debhelper (>= 6), libdb5.3-dev [!s390], libdb5.1-dev [s390], python-all-dev (>= 2.6.6-1~), python-all-dbg, python3-all-dev (>= 3.2.3-7~), python3-all-dbg +Build-Depends-Indep: python-sphinx +Standards-Version: 3.9.5 +Homepage: http://pypi.python.org/pypi/bsddb3/ + +Package: python-bsddb3 +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} +Suggests: python-bsddb3-dbg +Provides: ${python:Provides} +Description: Python interface for Berkeley DB + This module provides a nearly complete wrapping of the Oracle/Sleepycat C API + for the Database Environment, Database, Cursor, Sequence and Transaction + objects, and each of these is exposed as a Python Type in the bsddb3.db + module. The database objects can use various access methods: btree, hash, + recno and queue. Complete support of Berkeley DB distributed transactions. + Complete support for Berkeley DB Replication Manager. Complete support for + Berkeley DB Base Replication. Support for RPC. + +Package: python-bsddb3-dbg +Architecture: any +Section: debug +Priority: extra +Depends: python-bsddb3 (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} +Provides: ${python:Provides} +Description: Python interface for Berkeley DB (debug extension) + This module provides a nearly complete wrapping of the Oracle/Sleepycat C API + for the Database Environment, Database, Cursor, Sequence and Transaction + objects, and each of these is exposed as a Python Type in the bsddb3.db + module. The database objects can use various access methods: btree, hash, + recno and queue. Complete support of Berkeley DB distributed transactions. + Complete support for Berkeley DB Replication Manager. Complete support for + Berkeley DB Base Replication. Support for RPC. + . + This package contains the extension built for the python debug interpreter. + +Package: python3-bsddb3 +Architecture: any +Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends} +Suggests: python3-bsddb3-dbg +Provides: ${python3:Provides} +Description: Python interface for Berkeley DB (Python 3.x) + This module provides a nearly complete wrapping of the Oracle/Sleepycat C API + for the Database Environment, Database, Cursor, Sequence and Transaction + objects, and each of these is exposed as a Python Type in the bsddb3.db + module. The database objects can use various access methods: btree, hash, + recno and queue. Complete support of Berkeley DB distributed transactions. + Complete support for Berkeley DB Replication Manager. Complete support for + Berkeley DB Base Replication. Support for RPC. + +Package: python3-bsddb3-dbg +Architecture: any +Section: debug +Priority: extra +Depends: python3-bsddb3 (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, ${misc:Depends} +Provides: ${python3:Provides} +Description: Python interface for Berkeley DB (debug extension, Python 3.x) + This module provides a nearly complete wrapping of the Oracle/Sleepycat C API + for the Database Environment, Database, Cursor, Sequence and Transaction + objects, and each of these is exposed as a Python Type in the bsddb3.db + module. The database objects can use various access methods: btree, hash, + recno and queue. Complete support of Berkeley DB distributed transactions. + Complete support for Berkeley DB Replication Manager. Complete support for + Berkeley DB Base Replication. Support for RPC. + . + This package contains the extension built for the python debug interpreter. + +Package: python-bsddb3-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, libjs-jquery +Suggests: python-bsddb3 | python3-bsddb +Description: Documentation for the python Berkeley DB interface module + This module provides a nearly complete wrapping of the Oracle/Sleepycat C API + for the Database Environment, Database, Cursor, Sequence and Transaction + objects, and each of these is exposed as a Python Type in the bsddb3.db + module. The database objects can use various access methods: btree, hash, + recno and queue. Complete support of Berkeley DB distributed transactions. + Complete support for Berkeley DB Replication Manager. Complete support for + Berkeley DB Base Replication. Support for RPC. + . + This package contains the documentation for python-bsddb3 and python3-bsddb. --- python-bsddb3-6.0.1.orig/debian/copyright +++ python-bsddb3-6.0.1/debian/copyright @@ -0,0 +1,46 @@ +This package was debianized by Nathan Hawkins on +Tue, 27 Nov 2001 10:47:06 -0500. +Updated for the 4.7.x versions by Matthias Klose . + +It was downloaded from http://pypi.python.org/pypi/bsddb3/ + +Upstream Authors: Robin Dunn, Andrew Kuchling, Gregory Smith + +Copyright: + + Copyright (c) 1999-2001, Digital Creations, Fredericksburg, VA, USA + and Andrew Kuchling. All rights reserved. + Copyright (C) 2000, 2001 by Autonomous Zone Industries + Copyright (C) 2002 Gregory P. Smith + Copyright (c) 1997-2001 by Total Control Software + Copyright: 2007 by Georg Brandl + Copyright 2008 Jesus Cea Avion + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + o Redistributions of source code must retain the above copyright + notice, this list of conditions, and the disclaimer that follows. + + o 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. + + o Neither the name of Digital Creations nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS AND CONTRIBUTORS *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 DIGITAL + CREATIONS OR CONTRIBUTORS 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. --- python-bsddb3-6.0.1.orig/debian/python3-bsddb3.prerm +++ python-bsddb3-6.0.1/debian/python3-bsddb3.prerm @@ -0,0 +1,11 @@ +#! /bin/sh + +set -e + +case "$1" in remove) + rm -f /usr/lib/python3.[01]/*-packages/bsddb3/*.py[co] +esac + +#DEBHELPER# + +exit 0 --- python-bsddb3-6.0.1.orig/debian/rules +++ python-bsddb3-6.0.1/debian/rules @@ -0,0 +1,141 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PYVERS := $(shell pyversions -vs) +PYVER := $(shell pyversions -vd) +PY3VERS := $(shell py3versions -vs) + +p = python-bsddb3 +d = debian/$(p) +p3 = python3-bsddb3 +d3 = debian/$(p3) + +build: build-stamp +build-arch: build-stamp +build-indep: build-stamp +build-stamp: $(PYVERS:%=build-python%) $(PYVERS:%=dbg-build-python%) $(PY3VERS:%=build3-python%) $(PY3VERS:%=dbg-build3-python%) + touch $@ + +build-python%: + python$* setup2.py build $(build_args) + touch $@ + +dbg-build-python%: + python$*-dbg setup2.py build $(build_args) + touch $@ + +build3-python%: + python$* setup3.py build $(build_args) + touch $@ + +dbg-build3-python%: + python$*-dbg setup3.py build $(build_args) + touch $@ + +build-stamp-doc: + $(MAKE) -C docs html + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp* build*-python* dbg-build*-python* + rm -rf build docs/build + find -name '*.py[co]' | xargs -r rm -f + dh_clean + +install: build install-prereq $(PYVERS:%=install-python%) $(PYVERS:%=dbg-install-python%) $(PY3VERS:%=install3-python%) $(PY3VERS:%=dbg-install3-python%) + find debian -name '*.py[co]' | xargs -r rm -f + +install-prereq: + dh_testdir + dh_testroot + dh_clean -k + +install-python%: + mkdir -p $(d)/usr/bin +# mkdir -p $(d)/usr/lib/python$*/site-packages + python$* setup2.py install \ + --root=$(CURDIR)/$(d) --install-layout=deb $(build_args) + rm -rf $(d)/usr/lib/python$*/*-packages/bsddb3/tests + +dbg-install-python%: + mkdir -p $(d)/usr/bin +# mkdir -p $(d)-dbg/usr/lib/python$*/site-packages + python$*-dbg setup2.py install \ + --root=$(CURDIR)/$(d)-dbg --install-layout=deb $(build_args) + find debian/python-*-dbg/usr/lib ! -type d ! -name '*.so' \ + | xargs -r rm -f + find debian/python-*-dbg -depth -empty -exec rmdir {} \; + rm -rf $(d)-dbg/usr/include/python$* + mkdir -p $(d)-dbg/usr/include/python$*_d + ln -sf ../python$*/bsddb3 $(d)-dbg/usr/include/python$*_d/bsddb3 + +install3-python%: + python$* setup3.py install \ + --root=$(CURDIR)/$(d3) --install-layout=deb $(build_args) + rm -rf $(d3)/usr/lib/python$*/*-packages/bsddb3/tests + +dbg-install3-python%: + python$*-dbg setup3.py install \ + --root=$(CURDIR)/$(d3)-dbg --install-layout=deb $(build_args) + find debian/python3-*-dbg/usr/lib ! -type d ! -name '*.so' \ + | xargs -r rm -f + find debian/python3-*-dbg -depth -empty -exec rmdir {} \; + rm -rf $(d3)-dbg/usr/include/python$* + mkdir -p $(d3)-dbg/usr/include/python$*dmu + ln -sf ../python$*mu/bsddb3 $(d3)-dbg/usr/include/python$*dmu/bsddb3 + + +# Build architecture-independent files here. +binary-indep: build-stamp-doc + dh_testdir + dh_testroot + dh_installdocs -i README.txt TODO.txt + mkdir -p $(d)-doc/usr/share/doc/$(p) + cp -pr docs/html $(d)-doc/usr/share/doc/$(p)/ + rm -rf $(d)-doc/usr/share/doc/python-bsddb3/html/static/jquery.js + dh_link -p$(p)-doc \ + /usr/share/javascript/jquery/jquery.js \ + /usr/share/doc/python-bsddb3/html/static/jquery.js + ln -sf ../$(p)/html $(d)-doc/usr/share/doc/$(p)-doc + dh_link -p$(p)-doc \ + /usr/share/javascript/jquery/jquery.js \ + /usr/share/doc/$(p)/html/_static/jquery.js + dh_installchangelogs -i ChangeLog + dh_python2 -i + dh_python3 -i + dh_compress -i -X.js -X.json -X.inv + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs -a README.txt TODO.txt + dh_installchangelogs -a ChangeLog + dh_python2 -a + dh_python3 -a + dh_link -a + dh_strip -p$(p) --dbg-package=$(p)-dbg + dh_strip -p$(p3) --dbg-package=$(p3)-dbg + rm -rf $(d)-dbg/usr/share/doc/$(p)-dbg + ln -s $(p) $(d)-dbg/usr/share/doc/$(p)-dbg + rm -rf $(d3)-dbg/usr/share/doc/$(p3)-dbg + ln -s $(p3) $(d3)-dbg/usr/share/doc/$(p3)-dbg + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- python-bsddb3-6.0.1.orig/setup2.py +++ python-bsddb3-6.0.1/setup2.py @@ -122,6 +122,18 @@ lflags_arg = [] +multiarch = None +def set_multiarch_path(): + from subprocess import Popen, PIPE + global multiarch + # Debian/Ubuntu multiarch support. + # https://wiki.ubuntu.com/MultiarchSpec + try: + output = Popen(["dpkg-architecture", "-qDEB_HOST_MULTIARCH"], + stdout=PIPE).communicate()[0] + multiarch = output.strip() + except: + pass if os.name == 'posix': # Allow setting the DB dir and additional link flags either in @@ -132,6 +144,7 @@ BERKELEYDB_DIR = os.environ.get('BERKELEYDB_DIR', '') LFLAGS = os.environ.get('LFLAGS', []) LIBS = os.environ.get('LIBS', []) + set_multiarch_path() # ...then the command line. # Handle --berkeley-db=[PATH] and --lflags=[FLAGS] @@ -208,6 +221,9 @@ '/lib64', '/usr/lib64', '/lib', '/usr/lib', ] + if multiarch: + lib_dirs.append('/usr/lib/%s' % multiarch) + inc_dirs = compiler.include_dirs + ['/usr/include'] # See whether there is a Oracle or Sleepycat header in the standard @@ -273,7 +289,8 @@ if debug: print "db: lib dir", db_libdir, "inc dir", db_incdir incdir = db_incdir - libdir = db_libdir + if not db_libdir in lib_dirs: + libdir = db_libdir else: # this means Berkeley DB could not be found pass @@ -491,8 +508,8 @@ sources = ['Modules/_bsddb.c'], depends = ['Modules/bsddb.h'], include_dirs = [ incdir ], - library_dirs = [ libdir ], - runtime_library_dirs = [ libdir ], + #library_dirs = [ libdir ], + #runtime_library_dirs = [ libdir ], libraries = libname, extra_link_args = lflags_arg, )], --- python-bsddb3-6.0.1.orig/setup3.py +++ python-bsddb3-6.0.1/setup3.py @@ -119,9 +119,20 @@ #---------------------------------------------------------------------- debug = '--debug' in sys.argv or '-g' in sys.argv - lflags_arg = [] +multiarch = None +def set_multiarch_path(): + from subprocess import Popen, PIPE + global multiarch + # Debian/Ubuntu multiarch support. + # https://wiki.ubuntu.com/MultiarchSpec + try: + output = Popen(["dpkg-architecture", "-qDEB_HOST_MULTIARCH"], + stdout=PIPE).communicate()[0] + multiarch = output.decode('utf-8').strip() + except: + pass if os.name == 'posix': # Allow setting the DB dir and additional link flags either in @@ -132,6 +143,7 @@ BERKELEYDB_DIR = os.environ.get('BERKELEYDB_DIR', '') LFLAGS = os.environ.get('LFLAGS', []) LIBS = os.environ.get('LIBS', []) + set_multiarch_path() # ...then the command line. # Handle --berkeley-db=[PATH] and --lflags=[FLAGS] @@ -208,6 +220,9 @@ '/lib64', '/usr/lib64', '/lib', '/usr/lib', ] + if multiarch: + lib_dirs.append(os.path.join('/usr/lib', multiarch)) + inc_dirs = compiler.include_dirs + ['/usr/include'] # See whether there is a Oracle or Sleepycat header in the standard @@ -252,7 +267,7 @@ os.path.join(db_incdir, '..', '..', 'lib'), ] db_dirs_to_check = list(filter(os.path.isdir, db_dirs_to_check)) - + print("XXX", db_dirs_to_check, lib_dirs) # Look for a version specific db-X.Y before an ambiguoius dbX # XXX should we -ever- look for a dbX name? Do any # systems really not name their library by version and @@ -273,7 +288,8 @@ if debug: print("db: lib dir", db_libdir, "inc dir", db_incdir) incdir = db_incdir - libdir = db_libdir + if not db_libdir in lib_dirs: + libdir = db_libdir else: # this means Berkeley DB could not be found pass @@ -491,8 +507,8 @@ sources = ['Modules/_bsddb.c'], depends = ['Modules/bsddb.h'], include_dirs = [ incdir ], - library_dirs = [ libdir ], - runtime_library_dirs = [ libdir ], + #library_dirs = [ libdir ], + #runtime_library_dirs = [ libdir ], libraries = libname, extra_link_args = lflags_arg, )],