Package: dh-make
Version: 0.42
Severity: minor
Tags: patch
Since I am using the dpatch on a regular basis, I thought it would be
nice if it was supported by dh_make directly. The attached patch was
tested for the single package and seems to work.
My lintian test was very critical about the changelog file, mostly
because it expected two blanks between the email address and the day in
the tail lines or to the day of the month. I fixed those bits in the
same patch which of course I should not have done. Please ignore it if
you do not find it pleasant.
Have many thanks for dh_make, I am a fan, best regards
Steffen
-- System Information:
Debian Release: 4.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-3-xen-amd64
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
diff -ru dh-make-0.42/debian/changelog dh-make-0.42.1/debian/changelog
--- dh-make-0.42/debian/changelog 2006-10-31 22:31:01.000000000 +0100
+++ dh-make-0.42.1/debian/changelog 2007-02-04 12:56:06.000000000 +0100
@@ -1,3 +1,9 @@
+dh-make (0.42.1) unstable; urgency=low
+
+ * Offering use of dpatch.
+
+ -- Steffen Moeller <[EMAIL PROTECTED]> Sun, 4 Feb 2007 12:43:06 +0100
+
dh-make (0.42) unstable; urgency=low
* Stopped shiiping the kde examples (Closes: #372287)
@@ -22,7 +28,7 @@
* Kernel module rules use sname Closes: #350938, #354883
* Typo removed from kernel rules on line 67 Closes: #348299
* Removed conffiles.ex Closes: #345109
- * example pre/post inst/rm have space removed from first line closes: #325221
+ * example pre/post inst/rm have space removed from first line Closes: #325221
* Checks and bombs if there are extra options Closes: #337114
* touch in rules file uses $@ variable Closes: #344971
* updated jrv's email address Closes: #351432
@@ -97,7 +103,7 @@
* debianl/control has Section line for source Closes: #290360
* Removed init call in preinst
- -- Craig Small <[EMAIL PROTECTED]> Wed, 2 Mar 2005 08:32:57 +1100
+ -- Craig Small <[EMAIL PROTECTED]> Wed, 2 Mar 2005 08:32:57 +1100
dh-make (0.37) unstable; urgency=low
@@ -154,7 +160,7 @@
* getent correctly looks for username Closes: #211807
-- Craig Small <[EMAIL PROTECTED]> Wed, 24 Sep 2003 14:21:18 +1000
-
+
dh-make (0.34) unstable; urgency=low
* changed -a flag to -s Closes: #194357
@@ -182,7 +188,7 @@
* Better error messages Closes: #183053
* GNU/Linux has been removed, its just Debian now Closes: #182484
- -- Craig Small <[EMAIL PROTECTED]> Wed, 5 Mar 2003 08:32:52 +1100
+ -- Craig Small <[EMAIL PROTECTED]> Wed, 5 Mar 2003 08:32:52 +1100
dh-make (0.32) unstable; urgency=low
@@ -203,7 +209,7 @@
* Library dev files have libtool and pkgconfig files support, if they
exist. Closes: #153791
- -- Craig Small <[EMAIL PROTECTED]> Mon, 6 Jan 2003 09:24:57 +1100
+ -- Craig Small <[EMAIL PROTECTED]> Mon, 6 Jan 2003 09:24:57 +1100
dh-make (0.31) unstable; urgency=low
@@ -275,7 +281,7 @@
* pre/post example scripts exit1 with bad args Closes: #109836
* -e entry in dh_make.1 fixed Closes: #110815
- -- Craig Small <[EMAIL PROTECTED]> Mon, 8 Oct 2001 11:55:17 +1000
+ -- Craig Small <[EMAIL PROTECTED]> Mon, 8 Oct 2001 11:55:17 +1000
dh-make (0.26) unstable; urgency=low
@@ -299,7 +305,7 @@
* deleted add-mail-log info line in changelog as it did evil things.
incidently Closes: #83040
- -- Craig Small <[EMAIL PROTECTED]> Tue, 6 Feb 2001 13:29:05 +1100
+ -- Craig Small <[EMAIL PROTECTED]> Tue, 6 Feb 2001 13:29:05 +1100
dh-make (0.24) unstable; urgency=low
@@ -327,7 +333,7 @@
* Added an add-log-mailing-address to changelog example Closes: #72847
* DH_COMPAT version upped to 2 in rules templates, Closes: #72883
- -- Craig Small <[EMAIL PROTECTED]> Fri, 7 Jul 2000 09:27:17 +1000
+ -- Craig Small <[EMAIL PROTECTED]> Fri, 7 Jul 2000 09:27:17 +1000
dh-make (0.22) unstable; urgency=low
@@ -347,10 +353,10 @@
* Removed useless install-stamp Closes: #49576
* Added Jim's patch for infodir and example man page
- * Closes: #51350, #51755
+ * Closes: #51350, #51755
* Added Jim's patch for libraries Closes: #51580
- -- Craig Small <[EMAIL PROTECTED]> Thu, 2 Dec 1999 09:58:31 +1100
+ -- Craig Small <[EMAIL PROTECTED]> Thu, 2 Dec 1999 09:58:31 +1100
dh-make (0.20) unstable; urgency=low
@@ -364,7 +370,7 @@
* Fixed typo for native packages Closes: #45746
* Updated rules files so they follow debhelper closer
- -- Craig Small <[EMAIL PROTECTED]> Fri, 1 Oct 1999 11:03:06 +1000
+ -- Craig Small <[EMAIL PROTECTED]> Fri, 1 Oct 1999 11:03:06 +1000
dh-make (0.18) unstable; urgency=low
@@ -376,7 +382,7 @@
* Fixed rules file Closes: #42651
* Removes the old perl dependency
- -- Craig Small <[EMAIL PROTECTED]> Mon, 6 Sep 1999 14:18:39 +1000
+ -- Craig Small <[EMAIL PROTECTED]> Mon, 6 Sep 1999 14:18:39 +1000
dh-make (0.17) unstable; urgency=low
@@ -393,15 +399,15 @@
* changelog uses #DATE# Closes: #40865
* Now locates info files Closes: #35660
- -- Craig Small <[EMAIL PROTECTED]> Thu, 8 Jul 1999 11:02:50 +1000
+ -- Craig Small <[EMAIL PROTECTED]> Thu, 8 Jul 1999 11:02:50 +1000
dh-make (0.15) unstable; urgency=low
- * Changed Perl dependency to perl5
+ * Changed Perl dependency to perl5
* Misc file changes using supplied patch (Bug #40680)
* Added dh_perl lines to examples
- -- Craig Small <[EMAIL PROTECTED]> Mon, 5 Jul 1999 08:57:42 +1000
+ -- Craig Small <[EMAIL PROTECTED]> Mon, 5 Jul 1999 08:57:42 +1000
dh-make (0.14) unstable; urgency=low
@@ -410,7 +416,7 @@
* Case insensitve checks on users input for package type
* dh_shlibdeps before gencontrol in libs type (Bug #39131)
- -- Craig Small <[EMAIL PROTECTED]> Fri, 2 Jul 1999 17:13:30 +1000
+ -- Craig Small <[EMAIL PROTECTED]> Fri, 2 Jul 1999 17:13:30 +1000
dh-make (0.13) unstable; urgency=low
@@ -422,7 +428,7 @@
dh-make (0.12) unstable; urgency=low
- * Totally re-wrote dh_make binary to use perl
+ * Totally re-wrote dh_make binary to use perl
* dh_make less horribly broken (Bug #39985 )
* Updated man pages and other suggested files (Bug #37678 )
* Now use $LOGNAME instead of $USER (Bug #38797 )
@@ -439,7 +445,7 @@
* Fixed stupid syntax error (Bug #37048 #37156)
* Added more patches to cleanup some code (Bug #37087 )
- -- Craig Small <[EMAIL PROTECTED]> Thu, 6 May 1999 23:44:05 +1000
+ -- Craig Small <[EMAIL PROTECTED]> Thu, 6 May 1999 23:44:05 +1000
dh-make (0.10) unstable; urgency=low
@@ -466,7 +472,8 @@
dh-make (0.8) unstable; urgency=low
- * Remove examples of stuff that doesn't work with debhelper (bug #29466
#31413 )
+ * Remove examples of stuff that doesn't work with debhelper
+ (Bug #29466 #31413 )
* Fixed typo in single rules file (Bug #27749 )
* rules templates now follow debhelper examples (Bug #26415 )
@@ -481,7 +488,8 @@
dh-make (0.6) unstable; urgency=low
- * Fixed problems with multi packages not using the -i and -a flags. (Bug
#26415)
+ * Fixed problems with multi packages not using the -i and -a flags.
+ (Bug #26415)
* Added upstream author into copyright template (Bug #25622 )
* Upstream changelogs handled by dh_installchangelogs rather than
dh_installdocs (Bug #25961 )
@@ -519,8 +527,5 @@
* Initial Release.
- -- Craig Small <[EMAIL PROTECTED]> Thu, 5 Mar 1998 12:18:10 +1100
+ -- Craig Small <[EMAIL PROTECTED]> Thu, 5 Mar 1998 12:18:10 +1100
-Local variables:
-mode: debian-changelog
-End:
diff -ru dh-make-0.42/dh_make dh-make-0.42.1/dh_make
--- dh-make-0.42/dh_make 2006-10-30 04:16:02.000000000 +0100
+++ dh-make-0.42.1/dh_make 2007-02-04 16:31:25.000000000 +0100
@@ -17,11 +17,12 @@
our $POLICY_VERSION="3.7.2";
our $DH_MAKE_VERSION="0.42";
my %PACKAGE_TYPES = ( 's' => 'Single', 'l' => 'Library', 'm' => 'Multi-Binary',
- 'k' => 'Kernel Module', 'b' => 'cdbs');
+ 'k' => 'Kernel Module', 'b' => 'cdbs', 'd' => 'using
dpatch');
our $DASHLINE="";
our $license="";
+our $dpatch="";
our $username="";
our $package_name="";
our $cap_package_name="";
@@ -79,6 +80,9 @@
$line =~ s/#DASHLINE#/$main::DASHLINE/g;
$line =~ s/#PHONY_CONFIGURE#/$main::PHONY_CONFIGURE/g;
$line =~ s/#CDBS_CLASS#/$main::CDBS_CLASS/g;
+ $line =~ s/#PATCH_CLASS#/$main::PATCH_CLASS/g;
+ $line =~ s/#PATCH_CLEAN#/$main::PATCH_CLEAN/g;
+ $line =~ s/#PATCH_STAMP#/$main::PATCH_STAMP/g;
$line =~ s/#BUILD_DEPS#/$main::BUILD_DEPS/g;
print OUT $line;
@@ -101,6 +105,7 @@
Usage: dh_make [options]
-c, --copyright <type> use <type> of license in copyright file
(gpl|lgpl|artistic|bsd)
+ --dpatch using dpatch to maintain patches
-e, --email <address> use <address> as the maintainer e-mail address
-n, --native the program is Debian native, don\'t generate .orig
-f, --file <file> specify file to use as the original source archive
@@ -128,6 +133,7 @@
{
my ($dohelp,$doversion, $single,$multi,$library, $kmod,$cdbs );
if (GetOptions('copyright|c=s' => \$main::license,
+ 'dpatch' => \$dpatch,
'email|e=s' => \$main::email,
'file|f=s' => \$main::source_file,
'createorig|r' => \$main::copy_dir_for_orig,
@@ -340,6 +346,7 @@
print "License : $license";
print 'blank' if $license eq '';
print "\n";
+print "Using dpatch : ",($dpatch?"yes":"no"),"\n";
print "Type of Package : ";
if (exists $PACKAGE_TYPES{$package_type})
{
@@ -469,13 +476,25 @@
$PRESERVE="$PRESERVE --exclude $orig";
}
-
our ($CONFIG_STATUS, $CONFIGURE_STAMP, $PHONY_CONFIGURE, $CONFIGURE,
$DPKG_ARCH, $INSTALL, $CLEAN, $CDBS_CLASS );
our $BUILD_DEPS = 'debhelper (>= 5)';
if ($package_type eq "b") {
$BUILD_DEPS = 'cdbs, '.$BUILD_DEPS;
}
+our ($PATCH_CLASS,$PATCH_STAMP,$PATCH_CLEAN);
+if ($dpatch) {
+ if ($package_type eq "b") {
+ $PATCH_CLASS = "include /usr/share/cdbs/1/rules/dpatch.mk";
+ }
+ else {
+ $PATCH_CLASS = "include /usr/share/dpatch/dpatch.make";
+ $PATCH_STAMP = "patch-stamp";
+ $PATCH_CLEAN = "unpatch";
+ $BUILD_DEPS = 'dpatch, '.$BUILD_DEPS;
+ }
+}
+
# Setup debian/rules
if (-x "./configure" )
{
diff -ru dh-make-0.42/lib/debianb/rules dh-make-0.42.1/lib/debianb/rules
--- dh-make-0.42/lib/debianb/rules 2006-10-30 04:16:02.000000000 +0100
+++ dh-make-0.42.1/lib/debianb/rules 2007-02-02 02:06:47.000000000 +0100
@@ -2,5 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
#CDBS_CLASS#
+#PATCH_CLASS#
# Add here any variable or target overrides you need.
diff -ru dh-make-0.42/lib/debiank/rules dh-make-0.42.1/lib/debiank/rules
--- dh-make-0.42/lib/debiank/rules 2006-06-02 13:02:45.000000000 +0200
+++ dh-make-0.42.1/lib/debiank/rules 2007-02-02 02:10:17.000000000 +0100
@@ -46,7 +46,9 @@
-include $(MA_DIR)/include/generic.make
# load default rules, including kdist, kdist_image, ...
-include $(MA_DIR)/include/common-rules.make
-
+
+#PATCH_CLASS#
+
# module assistant calculates all needed things for us and sets
# following variables:
# KSRC (kernel source directory), KVERS (kernel version string), KDREV
@@ -72,7 +74,7 @@
#CONFIGURE#
build-arch: #CONFIGURE_STAMP# #CONFIG_STATUS# build-arch-stamp
-build-arch-stamp:
+build-arch-stamp: #PATCH_STAMP#
dh_testdir
# Add here command to compile/build the package.
@@ -107,7 +109,7 @@
dh_clean -k
build-indep: #CONFIG_STATUS# #CONFIGURE_STAMP# build-indep-stamp
-build-indep-stamp:
+build-indep-stamp: #PATCH_STAMP#
dh_testdir
# Add here command to compile/build the arch indep package.
@@ -119,7 +121,7 @@
build: build-arch build-indep
-clean:
+clean: #PATCH_CLEAN#
dh_testdir
#dh_testroot
rm -f build-arch-stamp build-indep-stamp #CONFIGURE_STAMP#
diff -ru dh-make-0.42/lib/debianl/rules dh-make-0.42.1/lib/debianl/rules
--- dh-make-0.42/lib/debianl/rules 2006-06-02 13:02:45.000000000 +0200
+++ dh-make-0.42.1/lib/debianl/rules 2007-02-02 02:12:16.000000000 +0100
@@ -20,6 +20,8 @@
CFLAGS += -O2
endif
+#PATCH_CLASS#
+
# shared library versions, option 1
version=2.0.5
major=2
@@ -32,7 +34,7 @@
#CONFIGURE#
build: build-stamp
-build-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS#
+build-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS# #PATCH_STAMP#
dh_testdir
# Add here commands to compile the package.
@@ -40,7 +42,7 @@
touch $@
-clean:
+clean: #PATCH_CLEAN#
dh_testdir
dh_testroot
rm -f build-stamp #CONFIGURE_STAMP#
diff -ru dh-make-0.42/lib/debianm/rules dh-make-0.42.1/lib/debianm/rules
--- dh-make-0.42/lib/debianm/rules 2006-06-02 13:02:45.000000000 +0200
+++ dh-make-0.42.1/lib/debianm/rules 2007-02-02 02:12:30.000000000 +0100
@@ -26,26 +26,29 @@
CFLAGS += -O2
endif
+
+#PATCH_CLASS#
+
#CONFIGURE#
#Architecture
build: build-arch build-indep
build-arch: build-arch-stamp
-build-arch-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS#
+build-arch-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS# #PATCH_STAMP#
# Add here commands to compile the arch part of the package.
#$(MAKE)
touch $@
build-indep: build-indep-stamp
-build-indep-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS#
+build-indep-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS# #PATCH_STAMP#
# Add here commands to compile the indep part of the package.
#$(MAKE) doc
touch $@
-clean:
+clean: #PATCH_CLEAN#
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
diff -ru dh-make-0.42/lib/debians/rules dh-make-0.42.1/lib/debians/rules
--- dh-make-0.42/lib/debians/rules 2006-06-02 13:02:45.000000000 +0200
+++ dh-make-0.42.1/lib/debians/rules 2007-02-02 02:11:20.000000000 +0100
@@ -11,6 +11,7 @@
#DPKG_ARCH#
+#PATCH_CLASS#
CFLAGS = -Wall -g
@@ -24,7 +25,7 @@
build: build-stamp
-build-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS#
+build-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS# #PATCH_STAMP#
dh_testdir
# Add here commands to compile the package.
@@ -33,7 +34,7 @@
touch $@
-clean:
+clean: #PATCH_CLEAN#
dh_testdir
dh_testroot
rm -f build-stamp #CONFIGURE_STAMP#
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
