Package: dh-make
Version: 0.41
Severity: normal
Tags: patch

Here are a couple of fixes for the cdbs template in dh-make.

- Use #BUILD_DEPS# in control template, to pick up debhelper >=5 and
  other dependencies.

- Remove use of tarball rules.  Since dh-make carefully creates an orig
  tarball, using this rule file would be idosyncratic.

- Put the class file after debhelper, as recommended by cdbs documentation.

- Similarly, put comment inviting customization in the right place.

- Don't put in simple-patchsys; people can pick their own patch system.
diff -Nru /tmp/It5brMQKzw/dh-make-0.41/lib/debianb/control 
/tmp/cnrP1xlGjs/dh-make-0.41/lib/debianb/control
--- /tmp/It5brMQKzw/dh-make-0.41/lib/debianb/control    2006-06-02 
13:02:45.000000000 +0200
+++ /tmp/cnrP1xlGjs/dh-make-0.41/lib/debianb/control    2006-08-08 
15:06:54.000000000 +0200
@@ -2,7 +2,7 @@
 Section: unknown
 Priority: optional
 Maintainer: #USERNAME# <#EMAIL#>
-Build-Depends: cdbs, debhelper (>= 4.1.0)
+Build-Depends: cdbs, #BUILD_DEPS#
 Standards-Version: #POLICY#
 
 Package: #PACKAGE#
diff -Nru /tmp/It5brMQKzw/dh-make-0.41/lib/debianb/rules 
/tmp/cnrP1xlGjs/dh-make-0.41/lib/debianb/rules
--- /tmp/It5brMQKzw/dh-make-0.41/lib/debianb/rules      2006-06-02 
13:02:45.000000000 +0200
+++ /tmp/cnrP1xlGjs/dh-make-0.41/lib/debianb/rules      2006-08-08 
14:51:26.000000000 +0200
@@ -1,14 +1,6 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
-# This file is public domain.
   
-DEB_TAR_SRCDIR                  := #PACKAGE#-#VERSION#
-DEB_AUTO_CLEANUP_RCS            := yes
-
-# Add here any variable or target overrides you need
-
-  
-#CDBS_CLASS#
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/tarball.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#CDBS_CLASS#
+
+# Add here any variable or target overrides you need.

Reply via email to