Use quilt instead of dpatch

diff --git a/debian/control b/debian/control
index 996533e..c1ed2da 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: live-boot
 Section: misc
 Priority: optional
 Maintainer: Grml Team <team@grml.org>
-Build-Depends: debhelper (>= 8), dpatch
+Build-Depends: debhelper (>= 8), quilt
 Standards-Version: 3.9.2
 Homepage: http://live.debian.net/devel/live-boot/
 Vcs-Browser: http://git.grml.org/?p=live-boot-grml.git

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index fa8205e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,15 +0,0 @@
-03_grml_version_file_hook.dpatch
-05_boot_failure_message_grml.dpatch
-07_support_findiso.dpatch
-08_grml_defaults.dpatch
-10_validateroot.dpatch
-11_dhcphostname.dpatch
-12_uuid_support.dpatch
-13_always_display_warnings_and_failures.dpatch
-14_no_blkid_on_lenny.dpatch
-15_networking_grml.dpatch
-16_nodhcp.dpatch
-19_revert_toram_bootoption_to_expected_behaviour.dpatch
-25_support_lvm_for_live-media.dpatch
-26_support_dns_bootoption.dpatch
-27_support_static_ip.dpatch

diff --git a/debian/patches/03_grml_version_file_hook.dpatch b/debian/patches/03_grml_version_file_hook.patch
old mode 100755 (executable)
new mode 100644 (file)
similarity index 76%
rename from debian/patches/03_grml_version_file_hook.dpatch
rename to debian/patches/03_grml_version_file_hook.patch
index 5909885..df27676
--- a/debian/patches/03_grml_version_file_hook.dpatch
+++ b/debian/patches/03_grml_version_file_hook.patch
@@ -6,12 +6,10 @@
 
 @DPATCH@
 
-diff --git a/hooks/live b/hooks/live
-index b5d43f2..ef95275 100755
 --- a/hooks/live
 +++ b/hooks/live
-@@ -38,6 +38,12 @@ then
-        done
+@@ -40,6 +40,12 @@
+       done
  fi
  
 +# Grml version information:
@@ -22,4 +20,4 @@ index b5d43f2..ef95275 100755
 +
  # Handling live-boot
  
- # Configuration
+ [ "${QUIET}" ] || echo -n " "core

diff --git a/debian/patches/05_boot_failure_message_grml.dpatch b/debian/patches/05_boot_failure_message_grml.patch
similarity index 100%
rename from debian/patches/05_boot_failure_message_grml.dpatch
rename to debian/patches/05_boot_failure_message_grml.patch

diff --git a/debian/patches/07_support_findiso.dpatch b/debian/patches/07_support_findiso.patch
similarity index 100%
rename from debian/patches/07_support_findiso.dpatch
rename to debian/patches/07_support_findiso.patch

diff --git a/debian/patches/08_grml_defaults.dpatch b/debian/patches/08_grml_defaults.patch
similarity index 100%
rename from debian/patches/08_grml_defaults.dpatch
rename to debian/patches/08_grml_defaults.patch

diff --git a/debian/patches/10_validateroot.dpatch b/debian/patches/10_validateroot.patch
similarity index 100%
rename from debian/patches/10_validateroot.dpatch
rename to debian/patches/10_validateroot.patch

diff --git a/debian/patches/11_dhcphostname.dpatch b/debian/patches/11_dhcphostname.patch
similarity index 100%
rename from debian/patches/11_dhcphostname.dpatch
rename to debian/patches/11_dhcphostname.patch

diff --git a/debian/patches/12_uuid_support.dpatch b/debian/patches/12_uuid_support.patch
similarity index 100%
rename from debian/patches/12_uuid_support.dpatch
rename to debian/patches/12_uuid_support.patch

diff --git a/debian/patches/13_always_display_warnings_and_failures.dpatch b/debian/patches/13_always_display_warnings_and_failures.patch
similarity index 100%
rename from debian/patches/13_always_display_warnings_and_failures.dpatch
rename to debian/patches/13_always_display_warnings_and_failures.patch

diff --git a/debian/patches/14_no_blkid_on_lenny.dpatch b/debian/patches/14_no_blkid_on_lenny.patch
similarity index 100%
rename from debian/patches/14_no_blkid_on_lenny.dpatch
rename to debian/patches/14_no_blkid_on_lenny.patch

diff --git a/debian/patches/15_networking_grml.dpatch b/debian/patches/15_networking_grml.patch
similarity index 100%
rename from debian/patches/15_networking_grml.dpatch
rename to debian/patches/15_networking_grml.patch

diff --git a/debian/patches/16_nodhcp.dpatch b/debian/patches/16_nodhcp.patch
similarity index 100%
rename from debian/patches/16_nodhcp.dpatch
rename to debian/patches/16_nodhcp.patch

diff --git a/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.dpatch b/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
similarity index 100%
rename from debian/patches/19_revert_toram_bootoption_to_expected_behaviour.dpatch
rename to debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch

diff --git a/debian/patches/25_support_lvm_for_live-media.dpatch b/debian/patches/25_support_lvm_for_live-media.patch
similarity index 100%
rename from debian/patches/25_support_lvm_for_live-media.dpatch
rename to debian/patches/25_support_lvm_for_live-media.patch

diff --git a/debian/patches/26_support_dns_bootoption.dpatch b/debian/patches/26_support_dns_bootoption.patch
similarity index 100%
rename from debian/patches/26_support_dns_bootoption.dpatch
rename to debian/patches/26_support_dns_bootoption.patch

diff --git a/debian/patches/27_support_static_ip.dpatch b/debian/patches/27_support_static_ip.patch
similarity index 100%
rename from debian/patches/27_support_static_ip.dpatch
rename to debian/patches/27_support_static_ip.patch

diff --git a/debian/patches/disabled/09_fix_resolvconf_pxeboot.dpatch b/debian/patches/disabled/09_fix_resolvconf_pxeboot.dpatch
deleted file mode 100755 (executable)
index 89bda0d..0000000
--- a/debian/patches/disabled/09_fix_resolvconf_pxeboot.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_fix_resolvconf_pxeboot.dpatch by Michael Prokop <mika@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix resolvconf handling when booting via PXE
-##
-## When installing grml for PXE boot the system has network after
-## boot but no usable DNS. /etc/resolv.conf is empty except the
-## warning to not edit this file manually but to use the resolvconf
-## tool.
-##
-## The problem is, that the 23networking scripte in the initrd
-## correctly creates the resolv.conf, but it's being overwritten by
-## the resolvconf utility on boot.
-##
-## The fix for now is to remove the symlink so resolvconf breaks
-## early and DNS is working then.
-
-@DPATCH@
-diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
-index 72aaf12..244eeca 100755
---- a/grml/23networking
-+++ b/grml/23networking
-@@ -110,6 +110,11 @@ EOF
-       then
-               if [ -f /netboot.config ]
-               then
-+                      if [ -h /root/etc/resolv.conf ]
-+                      then
-+                              rm /root/etc/resolv.conf
-+                      fi
-+
-                       # create a resolv.conf if it is not present or empty
-                       cp /netboot.config /root/var/log/netboot.config
- 

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..44f3ef1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,15 @@
+03_grml_version_file_hook.patch
+05_boot_failure_message_grml.patch
+07_support_findiso.patch
+08_grml_defaults.patch
+10_validateroot.patch
+11_dhcphostname.patch
+12_uuid_support.patch
+13_always_display_warnings_and_failures.patch
+14_no_blkid_on_lenny.patch
+15_networking_grml.patch
+16_nodhcp.patch
+19_revert_toram_bootoption_to_expected_behaviour.patch
+25_support_lvm_for_live-media.patch
+26_support_dns_bootoption.patch
+27_support_static_ip.patch

diff --git a/debian/rules b/debian/rules
index 3065213..6d9ad98 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,13 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
-
-build: patch-stamp
+build:
        # this is needed because dpatch doesn't do file modes on diffs.
        chmod a+rx scripts/live-bottom/*
        # regular build.
        dh build
 
-clean: unpatch
-       dh clean
-
 %:
-       dh ${@}
+       dh ${@} --with quilt
 
 override_dh_auto_install:
        dh_auto_install -- DESTDIR=debian/live-boot