Merge branch 'ch/new_version'

Conflicts:
	Makefile
	31_package_rename.patch

diff --cc Makefile
index 4e579a3,ed2471f..a2ab1b9
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -78,26 -78,26 +78,26 @@@ install
  uninstall:
        # Uninstalling executables
        rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin
+       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*
        rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/live
  
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+       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
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+       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
  
        # Uninstalling manpages
        for MANPAGE in manpages/en/*; \

diff --cc debian/patches/31_package_rename.patch
index 04198cf,0000000..a83724d
mode 100644,000000..100644
--- 1/debian/patches/31_package_rename.patch
--- /dev/null
+++ b/debian/patches/31_package_rename.patch
@@@ -1,29 -1,0 +1,29 @@@
- --- a/Makefile        2011-07-24 22:58:34.000000000 +0200
- +++ b/Makefile        2011-07-24 22:59:00.000000000 +0200
 +Index: b/Makefile
 +===================================================================
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
++--- 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/share/doc
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
++      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