Merge branch 'ch/new_version'

Conflicts:
	Makefile
	31_package_rename.patch

diff --git a/Makefile b/Makefile
index ed2471f..a2ab1b9 100644 (file)
--- 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 || true
 
-       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 || true
 
        # 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 || true
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true

diff --git a/debian/patches/31_package_rename.patch b/debian/patches/31_package_rename.patch
new file mode 100644 (file)
index 0000000..a83724d
--- /dev/null
+++ b/debian/patches/31_package_rename.patch
@@ -0,0 +1,29 @@
+Index: b/Makefile
+===================================================================
+--- a/Makefile 2011-07-24 23:49:55.000000000 +0200
++++ b/Makefile 2011-07-24 23:50:20.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 || true
+ 
+       # 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 || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true

diff --git a/debian/patches/series b/debian/patches/series
index cfc8b5d..64af07d 100644 (file)
--- 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