Package: dh-make
Version: 0.41
Severity: minor
Tags: patch
Hi,
in addition to the maintainer script template cleanup (bug #370488),
I looked over all the other templates, too, and fixed the following:
- removed trailing whitespace
- made use of empty lines/comments consistent between the different
variants of the same file (*/rules, */copyright licenses/*)
- added missing dependency on the build-* targets to the respective
install-* target (debianm/rules)
These fixes are included in the attached patch.
The copyright templates use different amount of spaces to indent the
license. If you compare native/copyright, licenses/gpl and licenses/lgpl
you can find indentation of 2, 3 and 4 spaces. 4 spaces are used by
licenses/artistic and licenses/bsd, too.
This is not changed by my patch.
For reasons of consistency I would suggest adding execute permissions to
debiank/rules, too.
Andreas
-- System Information:
Debian Release: testing/unstable
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable'), (300, 'unstable'), (30,
'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-1-vserver-k7
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Versions of packages dh-make depends on:
ii debhelper 5.0.35 helper programs for debian/rules
ii dpkg-dev 1.13.19 package building tools for Debian
ii make 3.81-2 The GNU version of the "make" util
ii perl 5.8.8-4 Larry Wall's Practical Extraction
dh-make recommends no packages.
-- no debconf information
diff -ur lib.orig1/debian/emacsen-install.ex lib/debian/emacsen-install.ex
--- lib.orig1/debian/emacsen-install.ex 2006-06-02 13:02:45.000000000 +0200
+++ lib/debian/emacsen-install.ex 2006-06-11 05:12:33.000000000 +0200
@@ -23,7 +23,7 @@
ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-# Install-info-altdir does not actually exist.
+# Install-info-altdir does not actually exist.
# Maybe somebody will write it.
if test -x /usr/sbin/install-info-altdir; then
echo install/${PACKAGE}: install Info links for ${FLAVOR}
diff -ur lib.orig1/debian/init.d.ex lib/debian/init.d.ex
--- lib.orig1/debian/init.d.ex 2006-06-02 13:02:45.000000000 +0200
+++ lib/debian/init.d.ex 2006-06-11 05:12:59.000000000 +0200
@@ -4,7 +4,7 @@
# This file should be used to construct scripts for /etc/init.d.
#
# Written by Miquel van Smoorenburg <[EMAIL PROTECTED]>.
-# Modified for Debian
+# Modified for Debian
# by Ian Murdock <[EMAIL PROTECTED]>.
#
# Version: @(#)skeleton 1.9 26-Feb-2001 [EMAIL PROTECTED]
diff -ur lib.orig1/debian/manpage.1.ex lib/debian/manpage.1.ex
--- lib.orig1/debian/manpage.1.ex 2006-06-02 13:02:45.000000000 +0200
+++ lib/debian/manpage.1.ex 2006-06-11 05:16:56.000000000 +0200
@@ -31,7 +31,7 @@
commands.
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
\fB#PACKAGE#\fP is a program that...
.SH OPTIONS
diff -ur lib.orig1/debian/manpage.sgml.ex lib/debian/manpage.sgml.ex
--- lib.orig1/debian/manpage.sgml.ex 2006-06-02 13:02:45.000000000 +0200
+++ lib/debian/manpage.sgml.ex 2006-06-11 05:13:37.000000000 +0200
@@ -8,7 +8,7 @@
manpage.1: manpage.sgml
docbook-to-man $< > $@
-
+
The docbook-to-man binary is found in the docbook-to-man package.
Please remember that if you create the nroff version in one of the
debian/rules file targets (such as build), you will need to include
@@ -125,7 +125,7 @@
<para>This manual page was written by &dhusername; &dhemail; for
the &debian; system (but may be used by others). Permission is
granted to copy, distribute and/or modify this document under
- the terms of the &gnu; General Public License, Version 2 any
+ the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
</para>
<para>
diff -ur lib.orig1/debian/manpage.xml.ex lib/debian/manpage.xml.ex
--- lib.orig1/debian/manpage.xml.ex 2006-06-02 13:02:45.000000000 +0200
+++ lib/debian/manpage.xml.ex 2006-06-11 05:13:55.000000000 +0200
@@ -17,7 +17,7 @@
manpage.1: manpage.dbk
$(XP) $(DB2MAN) $<
-
+
The xsltproc binary is found in the xsltproc package. The
XSL files are in docbook-xsl. Please remember that if you
create the nroff version in one of the debian/rules file
@@ -135,7 +135,7 @@
<para>This manual page was written by &dhusername; &dhemail; for
the &debian; system (but may be used by others). Permission is
granted to copy, distribute and/or modify this document under
- the terms of the &gnu; General Public License, Version 2 any
+ the terms of the &gnu; General Public License, Version 2 any
later version published by the Free Software Foundation.
</para>
<para>
diff -ur lib.orig1/debian/package.doc-base.EX lib/debian/package.doc-base.EX
--- lib.orig1/debian/package.doc-base.EX 2006-06-02 13:02:45.000000000
+0200
+++ lib/debian/package.doc-base.EX 2006-06-11 05:14:35.000000000 +0200
@@ -19,4 +19,3 @@
Index: /usr/share/doc/#PACKAGE#/html/index.html
Files: /usr/share/doc/#PACKAGE#/html/*.html
-
diff -ur lib.orig1/debianb/rules lib/debianb/rules
--- lib.orig1/debianb/rules 2006-06-02 13:02:45.000000000 +0200
+++ lib/debianb/rules 2006-06-11 04:34:49.000000000 +0200
@@ -1,13 +1,13 @@
#!/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
diff -ur lib.orig1/debianb/watch.ex lib/debianb/watch.ex
--- lib.orig1/debianb/watch.ex 2006-06-02 13:02:45.000000000 +0200
+++ lib/debianb/watch.ex 2006-06-11 05:15:04.000000000 +0200
@@ -6,7 +6,7 @@
# Compulsory line, this is a version 3 file
version=3
-# Uncomment to examine a Webpage
+# Uncomment to examine a Webpage
# <Webpage URL> <string match>
#http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
diff -ur lib.orig1/debiank/rules lib/debiank/rules
--- lib.orig1/debiank/rules 2006-06-02 13:02:45.000000000 +0200
+++ lib/debiank/rules 2006-06-11 05:19:43.000000000 +0200
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
+# Sample debian/rules that uses debhelper.
+#
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
@@ -12,7 +13,7 @@
# either dep/indep for things like common files or userspace components
# needed for the kernel modules.
-# Uncomment this to turn on verbose mode.
+# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -27,7 +28,7 @@
endif
# some default definitions, important!
-#
+#
# Name of the source package
psource:=#PACKAGE#-source
@@ -46,20 +47,20 @@
-include $(MA_DIR)/include/generic.make
# load default rules, including kdist, kdist_image, ...
-include $(MA_DIR)/include/common-rules.make
-
+
# module assistant calculates all needed things for us and sets
# following variables:
# KSRC (kernel source directory), KVERS (kernel version string), KDREV
# (revision of the Debian kernel-image package), CC (the correct
# compiler), VERSION (the final package version string), PKGNAME (full
# package name with KVERS included), DEB_DESTDIR (path to store DEBs)
-
+
# The kdist_configure target is called by make-kpkg modules_config and
# by kdist* rules by dependency. It should configure the module so it is
# ready for compilation (mostly useful for calling configure).
-# prep-deb-files from module-assistant creates the neccessary debian/ files
+# prep-deb-files from module-assistant creates the neccessary debian/ files
kdist_configure: prep-deb-files
-
+
# the kdist_clean target is called by make-kpkg modules_clean and from
# kdist* rules. It is responsible for cleaning up any changes that have
# been made by the other kdist_commands (except for the .deb files created)
diff -ur lib.orig1/debianl/rules lib/debianl/rules
--- lib.orig1/debianl/rules 2006-06-02 13:02:45.000000000 +0200
+++ lib/debianl/rules 2006-06-11 05:42:24.000000000 +0200
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
+#
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
@@ -73,11 +74,12 @@
dh_installexamples
# dh_install
# dh_installmenu
-# dh_installdebconf
+# dh_installdebconf
# dh_installlogrotate
# dh_installemacsen
# dh_installpam
# dh_installmime
+# dh_python
# dh_installinit
# dh_installcron
# dh_installinfo
@@ -87,7 +89,6 @@
dh_compress
dh_fixperms
# dh_perl
-# dh_python
# dh_makeshlibs
dh_installdeb
dh_shlibdeps
diff -ur lib.orig1/debianl/watch.ex lib/debianl/watch.ex
--- lib.orig1/debianl/watch.ex 2006-06-02 13:02:45.000000000 +0200
+++ lib/debianl/watch.ex 2006-06-11 05:15:49.000000000 +0200
@@ -6,7 +6,7 @@
# Compulsory line, this is a version 3 file
version=3
-# Uncomment to examine a Webpage
+# Uncomment to examine a Webpage
# <Webpage URL> <string match>
#http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
diff -ur lib.orig1/debianm/rules lib/debianm/rules
--- lib.orig1/debianm/rules 2006-06-02 13:02:45.000000000 +0200
+++ lib/debianm/rules 2006-06-11 05:39:52.000000000 +0200
@@ -16,6 +16,7 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
+
#DPKG_ARCH#
CFLAGS = -Wall -g
@@ -28,14 +29,14 @@
#CONFIGURE#
-#Architecture
+#Architecture
build: build-arch build-indep
build-arch: build-arch-stamp
build-arch-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS#
# Add here commands to compile the arch part of the package.
- #$(MAKE)
+ #$(MAKE)
touch $@
build-indep: build-indep-stamp
@@ -56,7 +57,7 @@
dh_clean#PRESERVE#
install: install-indep install-arch
-install-indep:
+install-indep: build-indep
dh_testdir
dh_testroot
dh_clean -k -i#PRESERVE#
@@ -68,17 +69,18 @@
dh_install -i
-install-arch:
+install-arch: build-arch
dh_testdir
dh_testroot
dh_clean -k -s#PRESERVE#
dh_installdirs -s
- # Add here commands to install the arch part of the package into
+ # Add here commands to install the arch part of the package into
# debian/tmp.
#INSTALL#
dh_install -s
+
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
# in another 'make' thread.
@@ -89,8 +91,8 @@
dh_installdocs
dh_installexamples
# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
+# dh_installdebconf
+# dh_installlogrotate
# dh_installemacsen
# dh_installpam
# dh_installmime
@@ -101,7 +103,7 @@
dh_installman
dh_link
dh_strip
- dh_compress
+ dh_compress
dh_fixperms
# dh_perl
dh_makeshlibs
@@ -110,6 +112,7 @@
dh_gencontrol
dh_md5sums
dh_builddeb
+
# Build architecture independant packages using the common target.
binary-indep: build-indep install-indep
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
diff -ur lib.orig1/debianm/watch.ex lib/debianm/watch.ex
--- lib.orig1/debianm/watch.ex 2006-06-02 13:02:45.000000000 +0200
+++ lib/debianm/watch.ex 2006-06-11 05:16:03.000000000 +0200
@@ -6,7 +6,7 @@
# Compulsory line, this is a version 3 file
version=3
-# Uncomment to examine a Webpage
+# Uncomment to examine a Webpage
# <Webpage URL> <string match>
#http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
diff -ur lib.orig1/debians/rules lib/debians/rules
--- lib.orig1/debians/rules 2006-06-02 13:02:45.000000000 +0200
+++ lib/debians/rules 2006-06-11 05:35:20.000000000 +0200
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
+#
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
@@ -23,7 +24,6 @@
#CONFIGURE#
build: build-stamp
-
build-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS#
dh_testdir
@@ -66,7 +66,7 @@
dh_installexamples
# dh_install
# dh_installmenu
-# dh_installdebconf
+# dh_installdebconf
# dh_installlogrotate
# dh_installemacsen
# dh_installpam
diff -ur lib.orig1/debians/watch.ex lib/debians/watch.ex
--- lib.orig1/debians/watch.ex 2006-06-02 13:02:45.000000000 +0200
+++ lib/debians/watch.ex 2006-06-11 05:16:12.000000000 +0200
@@ -6,7 +6,7 @@
# Compulsory line, this is a version 3 file
version=3
-# Uncomment to examine a Webpage
+# Uncomment to examine a Webpage
# <Webpage URL> <string match>
#http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
diff -ur lib.orig1/licenses/artistic lib/licenses/artistic
--- lib.orig1/licenses/artistic 2006-06-02 13:40:50.000000000 +0200
+++ lib/licenses/artistic 2006-06-11 05:09:19.000000000 +0200
@@ -13,17 +13,17 @@
This program is free software; you can redistribute it and/or modify it
under the terms of the "Artistic License" which comes with Debian.
- THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES
+ THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES
OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-On Debian systems, the complete text of the Artistic License
+On Debian systems, the complete text of the Artistic License
can be found in `/usr/share/common-licenses/Artistic'.
+
The Debian packaging is (C) #YEAR#, #USERNAME# <#EMAIL#> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
-
diff -ur lib.orig1/licenses/blank lib/licenses/blank
--- lib.orig1/licenses/blank 2006-06-02 13:40:50.000000000 +0200
+++ lib/licenses/blank 2006-06-11 05:07:02.000000000 +0200
@@ -19,4 +19,3 @@
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
-
diff -ur lib.orig1/licenses/bsd lib/licenses/bsd
--- lib.orig1/licenses/bsd 2006-06-02 13:40:50.000000000 +0200
+++ lib/licenses/bsd 2006-06-11 05:02:18.000000000 +0200
@@ -9,6 +9,7 @@
copyright holder(s) here>
License:
+
Redistribution and use in source and binary forms, with or without
modification, are permitted under the terms of the BSD License.
@@ -24,7 +25,7 @@
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-On Debian systems, the complete text of the BSD License can be
+On Debian systems, the complete text of the BSD License can be
found in `/usr/share/common-licenses/BSD'.
@@ -34,4 +35,3 @@
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
-
diff -ur lib.orig1/licenses/gpl lib/licenses/gpl
--- lib.orig1/licenses/gpl 2006-06-02 13:40:50.000000000 +0200
+++ lib/licenses/gpl 2006-06-11 05:09:30.000000000 +0200
@@ -27,6 +27,7 @@
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
+
The Debian packaging is (C) #YEAR#, #USERNAME# <#EMAIL#> and
is licensed under the GPL, see above.
