diff -Nru debhelper-8.0.0ubuntu1~malept1/autoscripts/maintscript-helper debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/maintscript-helper --- debhelper-8.0.0ubuntu1~malept1/autoscripts/maintscript-helper 1970-01-01 00:00:00.000000000 +0000 +++ debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/maintscript-helper 2011-06-11 23:42:17.000000000 +0000 @@ -0,0 +1 @@ +dpkg-maintscript-helper #PARAMS# -- "$@" diff -Nru debhelper-8.0.0ubuntu1~malept1/autoscripts/postinst-init debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/postinst-init --- debhelper-8.0.0ubuntu1~malept1/autoscripts/postinst-init 2010-04-07 01:52:07.000000000 +0000 +++ debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/postinst-init 2011-06-11 23:42:17.000000000 +0000 @@ -1,8 +1,4 @@ if [ -x "/etc/init.d/#SCRIPT#" ]; then update-rc.d #SCRIPT# #INITPARMS# >/dev/null - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d #SCRIPT# start || #ERROR_HANDLER# - else - /etc/init.d/#SCRIPT# start || #ERROR_HANDLER# - fi + invoke-rc.d #SCRIPT# start || #ERROR_HANDLER# fi diff -Nru debhelper-8.0.0ubuntu1~malept1/autoscripts/postinst-init-restart debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/postinst-init-restart --- debhelper-8.0.0ubuntu1~malept1/autoscripts/postinst-init-restart 2010-04-07 01:52:07.000000000 +0000 +++ debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/postinst-init-restart 2011-06-11 23:42:17.000000000 +0000 @@ -5,9 +5,5 @@ else _dh_action=start fi - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d #SCRIPT# $_dh_action || #ERROR_HANDLER# - else - /etc/init.d/#SCRIPT# $_dh_action || #ERROR_HANDLER# - fi + invoke-rc.d #SCRIPT# $_dh_action || #ERROR_HANDLER# fi diff -Nru debhelper-8.0.0ubuntu1~malept1/autoscripts/postinst-ucf debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/postinst-ucf --- debhelper-8.0.0ubuntu1~malept1/autoscripts/postinst-ucf 1970-01-01 00:00:00.000000000 +0000 +++ debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/postinst-ucf 2011-06-11 23:42:17.000000000 +0000 @@ -0,0 +1,4 @@ +if [ "$1" = "configure" ]; then + ucf #UCFSRC# #UCFDEST# + ucfr #PACKAGE# #UCFDEST# +fi diff -Nru debhelper-8.0.0ubuntu1~malept1/autoscripts/postinst-upstart debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/postinst-upstart --- debhelper-8.0.0ubuntu1~malept1/autoscripts/postinst-upstart 2010-08-10 11:48:26.000000000 +0000 +++ debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/postinst-upstart 2011-07-01 22:04:07.000000000 +0000 @@ -1,4 +1,3 @@ if [ -e "/etc/init/#JOB#.conf" ]; then - # start fails if already running - start #JOB# || : + invoke-rc.d #JOB# start || #ERROR_HANDLER# fi diff -Nru debhelper-8.0.0ubuntu1~malept1/autoscripts/postrm-ucf debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/postrm-ucf --- debhelper-8.0.0ubuntu1~malept1/autoscripts/postrm-ucf 1970-01-01 00:00:00.000000000 +0000 +++ debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/postrm-ucf 2011-06-11 23:42:17.000000000 +0000 @@ -0,0 +1,12 @@ +if [ "$1" = "purge" ]; then + for ext in .ucf-new .ucf-old .ucf-dist ""; do + rm -f #UCFDEST#$ext + done + + if [ -x `which ucf 2>/dev/null` ]; then + ucf --purge #UCFDEST# + fi + if [ -x `which ucfr 2>/dev/null` ]; then + ucfr --purge #PACKAGE# #UCFDEST# + fi +fi diff -Nru debhelper-8.0.0ubuntu1~malept1/autoscripts/prerm-init debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/prerm-init --- debhelper-8.0.0ubuntu1~malept1/autoscripts/prerm-init 2010-04-07 01:52:07.000000000 +0000 +++ debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/prerm-init 2011-06-11 23:42:17.000000000 +0000 @@ -1,7 +1,3 @@ if [ -x "/etc/init.d/#SCRIPT#" ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER# - else - /etc/init.d/#SCRIPT# stop || #ERROR_HANDLER# - fi + invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER# fi diff -Nru debhelper-8.0.0ubuntu1~malept1/autoscripts/prerm-init-norestart debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/prerm-init-norestart --- debhelper-8.0.0ubuntu1~malept1/autoscripts/prerm-init-norestart 2010-04-07 01:52:07.000000000 +0000 +++ debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/prerm-init-norestart 2011-06-11 23:42:17.000000000 +0000 @@ -1,7 +1,3 @@ if [ -x "/etc/init.d/#SCRIPT#" ] && [ "$1" = remove ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER# - else - /etc/init.d/#SCRIPT# stop || #ERROR_HANDLER# - fi + invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER# fi diff -Nru debhelper-8.0.0ubuntu1~malept1/autoscripts/prerm-upstart debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/prerm-upstart --- debhelper-8.0.0ubuntu1~malept1/autoscripts/prerm-upstart 2010-08-10 11:48:26.000000000 +0000 +++ debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/prerm-upstart 2011-07-01 22:04:07.000000000 +0000 @@ -1,4 +1,3 @@ if [ -e "/etc/init/#JOB#.conf" ]; then - # stop fails if not running - stop #JOB# || : + invoke-rc.d #JOB# stop || #ERROR_HANDLER# fi diff -Nru debhelper-8.0.0ubuntu1~malept1/autoscripts/prerm-upstart-norestart debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/prerm-upstart-norestart --- debhelper-8.0.0ubuntu1~malept1/autoscripts/prerm-upstart-norestart 2010-08-10 11:48:26.000000000 +0000 +++ debhelper-8.9.0ubuntu1~ppa1~lucid1/autoscripts/prerm-upstart-norestart 2011-07-01 22:04:07.000000000 +0000 @@ -1,4 +1,3 @@ if [ -e "/etc/init/#JOB#.conf" ] && [ "$1" = remove ]; then - # stop fails if not running - stop #JOB# || : + invoke-rc.d #JOB# stop || #ERROR_HANDLER# fi diff -Nru debhelper-8.0.0ubuntu1~malept1/debhelper.pod debhelper-8.9.0ubuntu1~ppa1~lucid1/debhelper.pod --- debhelper-8.0.0ubuntu1~malept1/debhelper.pod 2010-08-07 11:06:59.000000000 +0000 +++ debhelper-8.9.0ubuntu1~ppa1~lucid1/debhelper.pod 2011-06-17 18:12:46.000000000 +0000 @@ -4,26 +4,26 @@ =head1 SYNOPSIS -BI<*> [B<-v>] [B<-a>] [B<-i>] [B<-s>] [B<--no-act>] [B<-ppackage>] [B<-Npackage] [-Ptmpdir>] +BI<*> [B<-v>] [B<-a>] [B<-i>] [B<-s>] [B<--no-act>] [B<-p>I] [B<-N>I] [B<-P>I] =head1 DESCRIPTION -Debhelper is used to help you build a debian package. The philosophy behind +Debhelper is used to help you build a Debian package. The philosophy behind debhelper is to provide a collection of small, simple, and easily -understood tools that are used in debian/rules to automate various common +understood tools that are used in F to automate various common aspects of building a package. This means less work for you, the packager. -It also, to some degree means that these tools can be changed if debian +It also, to some degree means that these tools can be changed if Debian policy changes, and packages that use them will require only a rebuild to comply with the new policy. -A typical debian/rules file that uses debhelper will call several debhelper +A typical F file that uses debhelper will call several debhelper commands in sequence, or use L to automate this process. Examples of rules files that use debhelper are in F -To create a new debian package using debhelper, you can just copy one of -the sample rules files and edit it by hand. Or you can try the dh-make +To create a new Debian package using debhelper, you can just copy one of +the sample rules files and edit it by hand. Or you can try the B package, which contains a L command that partially -automates the process. For a more gentle introduction, the maint-guide debian +automates the process. For a more gentle introduction, the B Debian package contains a tutorial about making your first package using debhelper. =head1 DEBHELPER COMMANDS @@ -49,7 +49,7 @@ =head2 Other Commands -If a program's name starts with "dh_", and the program is not on the above +If a program's name starts with B, and the program is not on the above lists, then it is not part of the debhelper package, but it should still work like the other programs described on this page. @@ -59,10 +59,10 @@ do. Besides the common F and F, which are in all packages, not just those using debhelper, some additional files can be used to configure the behavior of specific debhelper commands. These -files are typically named debian/package.foo (where "package" of course, +files are typically named debian/I.foo (where I of course, is replaced with the package that is being acted on). -For example, dh_installdocs uses files named debian/package.docs to list +For example, B uses files named F to list the documentation files it will install. See the man pages of individual commands for details about the names and formats of the files they use. Generally, these files will list files to act on, one file per line. Some @@ -70,22 +70,22 @@ complicated formats. Note that if a package is the first (or only) binary package listed in -debian/control, debhelper will use debian/foo if no debian/package.foo +F, debhelper will use F if no F file can be found. In some rare cases, you may want to have different versions of these files -for different architectures or OSes. If files named debian/package.foo.ARCH -or debian/package.foo.OS exist, where "ARCH" and "OS" are the same as the -output of "dpkg-architecture -qDEB_HOST_ARCH" / -"dpkg-architecture -qDEB_HOST_ARCH_OS", +for different architectures or OSes. If files named debian/I.foo.I +or debian/I.foo.I exist, where I and I are the same as the +output of "B" / +"B", then they will be used in preference to other, more general files. In many cases, these config files are used to specify various types of files. Documentation or example files to install, files to move, and so on. When appropriate, in cases like these, you can use standard shell wildcard -characters ('?' and '*' and '[..]' character classes) in the files. +characters (B and B<*> and B<[>I<..>B<]> character classes) in the files. -You can also put comments in these files; lines beginning with "#" are +You can also put comments in these files; lines beginning with B<#> are ignored. =head1 SHARED DEBHELPER OPTIONS @@ -112,19 +112,19 @@ Act on all architecture independent packages. -=item B<->I, B<--package=>I +=item B<-p>I, B<--package=>I -Act on the package named "package". This option may be specified multiple +Act on the package named I. This option may be specified multiple times to make debhelper operate on a given set of packages. =item B<-s>, B<--same-arch> -This used to be a smarter version of the -a flag, but the -a flag is now +This used to be a smarter version of the B<-a> flag, but the B<-a> flag is now equally smart. =item B<-N>I, B<--no-package=>I -Do not act on the specified package even if an -a, -i, or -p option lists +Do not act on the specified package even if an B<-a>, B<-i>, or B<-p> option lists the package as one that should be acted on. =item B<--remaining-packages> @@ -137,26 +137,26 @@ =item B<--ignore=>I -Ignore the specified file. This can be used if debian/ contains a debhelper +Ignore the specified file. This can be used if F contains a debhelper config file that a debhelper command should not act on. Note that -debian/compat, debian/control, and debian/changelog can't be ignored, but +F, F, and F can't be ignored, but then, there should never be a reason to ignore those files. -For example, if upstream ships a debian/init that you don't want -dh_installinit to install, use --ignore=debian/init +For example, if upstream ships a F that you don't want +B to install, use B<--ignore=debian/init> =item B<-P>I, B<--tmpdir=>I -Use "tmpdir" for package build directory. The default is debian/ +Use I for package build directory. The default is debian/I =item B<--mainpackage=>I This little-used option changes the package which debhelper considers the -"main package", that is, the first one listed in debian/control, and the -one for which debian/foo files can be used instead of the usual -debian/package.foo files. +"main package", that is, the first one listed in F, and the +one for which F files can be used instead of the usual +F files. -=item B<-O=>I +=item B<-O=>I