* Recover if debian/source doesnt exist Closes: #574918

  * init.d template follows skeleton Closes: #552461
  * Vcs example lines in template control files Closes: #574005

debian/changelog

@@ -1,3 +1,13 @@
+dh-make (0.53) unstable; urgency=low
+
+  * Increased debhelper dependency to 7.0.50
+  * Removed quilt option and marked dpatch as deprecated
+  * Recover if debian/source doesnt exist Closes: #574918
+  * init.d template follows skeleton Closes: #552461
+  * Vcs example lines in template control files Closes: #574005
+
+ -- Craig Small <csmall@debian.org>  Fri, 26 Mar 2010 21:48:07 +1100
+
 dh-make (0.52) unstable; urgency=low
 
   * Minor dh_make.1 improvements Closes: #572408

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

dh_make

@@ -16,15 +16,14 @@ $Getopt::Long::autoabbrev = 0;
 # Some important parameters
 our $DHLIB="/usr/share/debhelper/dh_make";
 our $POLICY_VERSION="3.8.4";
-our $DH_MAKE_VERSION="0.52";
+our $DH_MAKE_VERSION="0.53";
 my %PACKAGE_TYPES = ( 's' => 'Single', 'l' => 'Library', 'm' => 'Multi-Binary',
 					 'k' => 'Kernel Module', 'b' => 'cdbs', 'n' => 'Kernel Patch');
 
 our $DASHLINE="";
 
 our $license="";
 our $dpatch="";
-our $quilt="";
 our $username="";
 our $package_name="";
 our $cap_package_name="";
@@ -111,6 +110,11 @@ sub output_source_format
 		}
 	}
 
+	if ( ! -d 'debian/source' )
+	{
+		mkdir 'debian/source', 0755 or die "Unable to make debian/source subdirectory: $! \n";
+	}
+
 	open OUT, ">$outfile" or die "Unable to open file $outfile for writing: $! \n";
 	if ($debian_native)
    	{
@@ -138,7 +142,6 @@ sub show_help
   -c, --copyright <type>    use <type> of license in copyright file
                             (apache|artistic|bsd|gpl|gpl2|gpl3|lgpl|lgpl2|lgpl3)
       --dpatch              using dpatch to maintain patches
-      --quilt               using quilt 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
@@ -170,7 +173,6 @@ sub parse_args
 	if (GetOptions(
 			'copyright|c=s' => \$main::license,
 		  	'dpatch' => \$dpatch,
-			'quilt' => \$quilt,
 			'email|e=s' => \$main::email,
 			'file|f=s' => \$main::source_file,
 			'createorig|r' => \$main::copy_dir_for_orig,
@@ -410,7 +412,6 @@ sub print_confirmation
 	print 'blank' if $license eq '';
 	print "\n";
 	print "Using dpatch	 : ",($dpatch?"yes":"no"),"\n";
-	print "Using quilt	  : ",($quilt?"yes":"no"),"\n";
 	print "Type of Package : ";
 	if (exists $PACKAGE_TYPES{$package_type})
 	{
@@ -535,7 +536,7 @@ foreach $orig (@ORIG)
 }
 
 our ($CONFIG_STATUS, $CONFIGURE_STAMP, $PHONY_CONFIGURE, $CONFIGURE, $DPKG_ARCH, $INSTALL, $CLEAN, $MAKE, $CDBS_CLASS );
-our $BUILD_DEPS = 'debhelper (>= 7)';
+our $BUILD_DEPS = 'debhelper (>= 7.0.50)';
 our $DH7_ADDON = '';
 if ($package_type eq "b") {
 	$BUILD_DEPS = 'cdbs, '.$BUILD_DEPS;
@@ -562,26 +563,6 @@ if ($dpatch)
 		$PATCH_CLEAN = "unpatch";
 		$BUILD_DEPS = 'dpatch, '.$BUILD_DEPS;
 	}
-} elsif ($quilt) {
-	$SOURCE_EXTRADOCS=
-	"This package uses quilt to manage all modifications to the upstream\n".
-	"source.  Changes are stored in the source package as diffs in\n".
-	"debian/patches and applied during the build.  Please see:\n".
-	"\n".
-	"	 /usr/share/doc/quilt/README.source\n".
-	"\n".
-	"for more information on how to apply the patches, modify patches, or\n".
-	"remove a patch.\n";
-	if ($package_type eq "b")
-   	{
-		$PATCH_CLASS = "include /usr/share/cdbs/1/rules/patchsys-quilt.mk";
-	} else {
-		$PATCH_CLASS = "include /usr/share/quilt/quilt.make";
-		$PATCH_STAMP = "\$(QUILT_STAMPFN)";
-		$PATCH_CLEAN = "unpatch";
-		$BUILD_DEPS = 'quilt (>= 0.46-7~), '.$BUILD_DEPS;
- 		$DH7_ADDON = '--with quilt '.$DH7_ADDON;
-	}
 }
 
 # Setup debian/rules
@@ -696,7 +677,6 @@ if ( $add_missing )
 	if ( ! -d 'debian')
 	{
 		mkdir 'debian', 0755 or die "Unable to make debian subdirectory: $! \n";
-		mkdir 'debian/source', 0755 or die "Unable to make debian/source subdirectory: $! \n";
 	} else {
 		print "You already have a debian/ subdirectory in the source tree.\n";
 		print "dh_make will not try to overwrite anything.\n";

dh_make.1

@@ -9,7 +9,7 @@ dh_make \- prepare Debian packaging for an original source archive
 [\-\-library] [\-\-single] [\-\-indep] [\-\-multi] [\-\-kmod] [\-\-kpatch] 
 [\-\-addmissing]
 [\-\-templates directory] [\-\-defaultless] [\-\-overlay directory]
-[\-\-packagename name] [\-\-dpatch] [\-\-quilt]
+[\-\-packagename name] [\-\-dpatch] 
 [\-\-help] [\-\-version]
 .SH DESCRIPTION
 .B dh_make
@@ -170,10 +170,9 @@ Display the name, version, available options and authors, and exit
 successfully.
 .TP
 .I \-\-dpatch
-The new package will use dpatch to manage patches.
-.TP
-.I \-\-quilt
-The new package will use quilt to manage patches.
+The new package will use dpatch to manage patches. This option is deprecated
+and will be removed in future versions of \fBdh\_make\fR. Use the quilt
+patch system which is built into the source package.
 .TP
 .I \-v, \-\-version
 Show the program name and version, and exit successfully.