Reimport 0.7.1-3, release 0.8.0-1.

debian/changelog

@@ -1,10 +1,18 @@
-dulwich (0.8.0-1) UNRELEASED; urgency=low
+dulwich (0.8.0-1) unstable; urgency=low
 
   * New upstream release.
    + Adds support for IPv6 to git:// client. Closes: #631490
    + Fixes use of ~username in git:// URLs. Closes: #631483
+  * Bump standards version to 3.9.2 (no changes).
 
- -- Jelmer Vernooij <jelmer@debian.org>  Sun, 07 Aug 2011 15:03:19 +0200
+ -- Jelmer Vernooij <jelmer@debian.org>  Sun, 07 Aug 2011 15:03:44 +0200
+
+dulwich (0.7.1-3) unstable; urgency=low
+
+  * Bump standards version to 3.9.2 (no changes).
+  * Add python-dulwich-dbg package.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Sat, 18 Jun 2011 17:04:43 +0200
 
 dulwich (0.7.1-2) unstable; urgency=low
 

debian/control

@@ -3,8 +3,8 @@ Section: python
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer@debian.org>
 Homepage: http://samba.org/~jelmer/dulwich
-Build-Depends: python-all-dev (>= 2.6.6-3), debhelper (>= 7.0.50~), python-testtools, git (>= 1:1.7.0.4-2) | git-core, python-fastimport (>= 0.9.0~bzr293)
-Standards-Version: 3.9.1
+Build-Depends: python-all-dev (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3), debhelper (>= 7.0.50~), python-unittest2, git (>= 1:1.7.0.4-2) | git-core, python-fastimport (>= 0.9.0~bzr293)
+Standards-Version: 3.9.2
 X-Python-Version: >= 2.4
 Vcs-Bzr: http://bzr.debian.org/users/jelmer/dulwich/unstable
 
@@ -12,13 +12,33 @@ Package: python-dulwich
 Architecture: any
 Provides: ${python:Provides}
 Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Breaks: bzr-git (<< 0.6.2)
+Suggests: python-dulwich-dbg
 Recommends: python-fastimport
 Description: Python Git library
- Dulwich is a Python implementation of the file formats and protocols 
- used by the Git version control system. It can currently read from and write 
- to existing Git repositories and implements the protocol for pushing and 
+ Dulwich is a Python implementation of the file formats and protocols
+ used by the Git version control system. It can currently read from and write
+ to existing Git repositories and implements the protocol for pushing and
  receiving packs from remote servers.
  .
- All functionality is available in pure Python, but for improved performance 
- replacements of some modules written in C are also available. This package 
+ All functionality is available in pure Python, but for improved performance
+ replacements of some modules written in C are also available. This package
  includes the high performance versions.
+
+Package: python-dulwich-dbg
+Architecture: any
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, python-dbg, python-dulwich (= ${binary:Version})
+Priority: extra
+Section: debug
+Provides: ${python:Provides}
+Description: Python Git library - Debug Extension
+ Dulwich is a Python implementation of the file formats and protocols
+ used by the Git version control system. It can currently read from and write
+ to existing Git repositories and implements the protocol for pushing and
+ receiving packs from remote servers.
+ .
+ All functionality is available in pure Python, but for improved performance
+ replacements of some modules written in C are also available. This package
+ includes the high performance versions.
+ .
+ This package contains the extensions built for the python debug interpreter.

debian/rules

@@ -1,9 +1,34 @@
 #!/usr/bin/make -f
 
+# Get the supported Python versions
+PYVERS = $(shell pyversions -r -v)
+# Get the default Python version
+PYVERSION = $(shell pyversions -d -v)
+
+# Callable functions to determine the correct PYTHONPATH
+pythonpath = $$(ls -d $(CURDIR)/build/lib.*-$(1))
+pythonpath_dbg = $$(ls -d $(CURDIR)/build/lib_d.*-$(1) 2>/dev/null || ls -d $(CURDIR)/build/lib.*$(1)-pydebug)
+
 %:
 	dh --buildsystem=python_distutils --with python2 $*
 
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/tmp
+	# Install everything excluding the *_d.so debug extensions to python-dulwich
+	dh_install -X"*_d.so" "debian/tmp/*" -p python-dulwich
+	# Install the debug extensions to python-dulwich-dbg
+	dh_install "debian/tmp/usr/lib/python*/*-packages/dulwich/*_d.so" -p python-dulwich-dbg
+
+override_dh_installdocs:
+	dh_installdocs --link-doc=python-dulwich
+	dh_installdocs -ppython-dulwich docs/tutorial  -X.gitignore -XMakefile
+
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) check TESTRUNNER=testtools.run
+	$(MAKE) check
+endif
+
+override_dh_strip:
+ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	dh_strip --dbg-package=python-dulwich-dbg
 endif