Browse Source

Switch to debhelper 7, drop cdbs.

Jelmer Vernooij 14 years ago
parent
commit
6de2980c96
3 changed files with 5 additions and 13 deletions
  1. 1 0
      debian/changelog
  2. 1 1
      debian/control
  3. 3 12
      debian/rules

+ 1 - 0
debian/changelog

@@ -1,6 +1,7 @@
 dulwich (0.7.0-3) UNRELEASED; urgency=low
 
   * Add missing Breaks: field to python-dulwich.
+  * Switch to debhelper 7, drop cdbs.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Mon, 07 Mar 2011 04:26:27 +0100
 

+ 1 - 1
debian/control

@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer@debian.org>
 Homepage: http://samba.org/~jelmer/dulwich
-Build-Depends: cdbs (>= 0.4.90~), python-all-dev (>= 2.6.6-3), debhelper (>= 5.0.37.2), python-testtools, git (>= 1:1.7.0.4-2) | git-core, python-fastimport (>= 0.9.0~bzr293)
+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
 X-Python-Version: >= 2.4
 Vcs-Bzr: http://bzr.debian.org/users/jelmer/dulwich/unstable

+ 3 - 12
debian/rules

@@ -1,18 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-DEB_PYTHON_BUILD_ARGS += --executable=/usr/bin/python
+%:
+	dh --buildsystem=python_distutils $*
 
+override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-common-build-arch common-build-indep:: debian/stamp-check
-debian/stamp-check: 
 	$(MAKE) check TESTRUNNER=testtools.run
-	touch $@
 endif
-
-clean::
-	rm -f debian/stamp-check
-	rm -f dulwich/*.so
-	rm -rf *.egg-info