From 79a3a56c3458d79a855d78daa1e82ef582202aab Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Sun, 24 Jul 2011 22:28:23 +0200 Subject: [PATCH] Move changes in upstream makefile to patch --- Makefile | 16 ++++++++-------- debian/patches/31_package_rename.patch | 29 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 debian/patches/31_package_rename.patch diff --git a/Makefile b/Makefile index c62aabd..4e579a3 100644 --- a/Makefile +++ b/Makefile @@ -45,18 +45,18 @@ install: mkdir -p $(DESTDIR)/sbin cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin - mkdir -p $(DESTDIR)/usr/share/live-boot-grml - cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot-grml + mkdir -p $(DESTDIR)/usr/share/live-boot + cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot mkdir -p $(DESTDIR)/usr/share/initramfs-tools cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools # Installing docs - mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml - cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot-grml + mkdir -p $(DESTDIR)/usr/share/doc/live-boot + cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot - mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml/examples - cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot-grml/examples + mkdir -p $(DESTDIR)/usr/share/doc/live-boot/examples + cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot/examples # (FIXME) # Installing manpages @@ -80,7 +80,7 @@ uninstall: rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin - rm -rf $(DESTDIR)/usr/share/live-boot-grml + rm -rf $(DESTDIR)/usr/share/live-boot rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live* @@ -94,7 +94,7 @@ uninstall: rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr # Uninstalling docs - rm -rf $(DESTDIR)/usr/share/doc/live-boot-grml + rm -rf $(DESTDIR)/usr/share/doc/live-boot rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr diff --git a/debian/patches/31_package_rename.patch b/debian/patches/31_package_rename.patch new file mode 100644 index 0000000..04198cf --- /dev/null +++ b/debian/patches/31_package_rename.patch @@ -0,0 +1,29 @@ +Index: b/Makefile +=================================================================== +--- a/Makefile 2011-07-24 22:58:34.000000000 +0200 ++++ b/Makefile 2011-07-24 22:59:00.000000000 +0200 +@@ -52,11 +52,11 @@ + cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools + + # Installing docs +- mkdir -p $(DESTDIR)/usr/share/doc/live-boot +- cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot ++ mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml ++ cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot-grml + +- mkdir -p $(DESTDIR)/usr/share/doc/live-boot/examples +- cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot/examples ++ mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml/examples ++ cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot-grml/examples + # (FIXME) + + # Installing manpages +@@ -85,7 +85,7 @@ + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr + + # Uninstalling docs +- rm -rf $(DESTDIR)/usr/share/doc/live-boot ++ rm -rf $(DESTDIR)/usr/share/doc/live-boot-grml + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr diff --git a/debian/patches/series b/debian/patches/series index cfc8b5d..64af07d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,3 +17,4 @@ 28_remove_localized_manpages.patch 29_support_dns_in_initramfs.patch 30_support_multiarch_dns.patch +31_package_rename.patch -- 2.1.4