On Wed, 16 Jul 2008 09:04:14 +1000, Craig Small <[EMAIL PROTECTED]> wrote:
> On Tue, Jul 15, 2008 at 01:23:12PM +0000, Sune Vuorela wrote:
>> Please support quilt for patch management as well as dpatch.
>> A attached patch implements this similar to the dpatch way.
> You missed attaching the patch.
Let me try again then.
/Sune
diff -Nru dh-make-0.46+nmu1/debian/changelog dh-make-0.46+nmu2/debian/changelog
--- dh-make-0.46+nmu1/debian/changelog 2008-07-15 14:43:04.000000000 +0200
+++ dh-make-0.46+nmu2/debian/changelog 2008-07-15 15:17:15.000000000 +0200
@@ -1,3 +1,10 @@
+dh-make (0.46+nmu2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * quilt support
+
+ -- Sune Vuorela <[EMAIL PROTECTED]> Tue, 15 Jul 2008 15:04:33 +0200
+
dh-make (0.46+nmu1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru dh-make-0.46+nmu1/dh_make dh-make-0.46+nmu2/dh_make
--- dh-make-0.46+nmu1/dh_make 2008-07-15 15:02:35.000000000 +0200
+++ dh-make-0.46+nmu2/dh_make 2008-07-15 15:17:30.000000000 +0200
@@ -23,6 +23,7 @@
our $license="";
our $dpatch="";
+our $quilt="";
our $username="";
our $package_name="";
our $cap_package_name="";
@@ -107,6 +108,7 @@
-c, --copyright <type> use <type> of license in copyright file
(gpl|lgpl|artistic|bsd)
--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
@@ -135,6 +137,7 @@
my ($dohelp,$doversion, $single,$multi,$library, $kmod,$cdbs );
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,
@@ -347,6 +350,7 @@
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})
{
@@ -500,6 +504,16 @@
$PATCH_CLEAN = "unpatch";
$BUILD_DEPS = 'dpatch, '.$BUILD_DEPS;
}
+} elsif ($quilt) {
+ 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, '.$BUILD_DEPS;
+ }
}
# Setup debian/rules
