Rename packages to not clash with upstream

diff --git a/Makefile b/Makefile
index 4e579a3..c62aabd 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
-       cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot
+       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/initramfs-tools
        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
@@ -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
+       rm -rf $(DESTDIR)/usr/share/live-boot-grml
 
        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
+       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/control b/debian/control
index c2ebb94..f3dfc05 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,12 @@ Homepage: http://live.debian.net/devel/live-boot/
 Vcs-Browser: http://git.grml.org/?p=live-boot-grml.git
 Vcs-Git: git://git.grml.org/live-boot-grml.git
 
-Package: live-boot
+Package: live-boot-grml
 Architecture: all
-Depends: ${misc:Depends}, live-boot-initramfs-tools (=${binary:Version}) | live-boot-backend (=${binary:Version}) 
+Depends: ${misc:Depends}, live-boot-grml-initramfs-tools (=${binary:Version})
+Conflicts: live-boot
+Replaces: live-boot
+Provides: live-boot
 Recommends: eject, file, rsync, uuid-runtime
 Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget
 Description: Debian Live - System Boot Scripts
@@ -24,7 +27,7 @@ Description: Debian Live - System Boot Scripts
  This is NOT a fork of Debian's live-boot, it's just a customized
  version to better fit Grml's needs.
 
-Package: live-boot-initramfs-tools
+Package: live-boot-grml-initramfs-tools
 Architecture: all
 Depends:
  ${misc:Depends}, busybox | busybox-initramfs, initramfs-tools, udev
@@ -40,15 +43,3 @@ Description: Debian Live - System Boot Scripts (initramfs-tools backend)
  Please notice that this package is maintained by the grml.org team.
  This is NOT a fork of Debian's live-boot, it's just a customized
  version to better fit Grml's needs.
-
-Package: live-initramfs
-Architecture: all
-Depends:
- ${misc:Depends}, live-boot, live-boot-initramfs-tools, live-config,
- live-config-sysvinit
-Description: Debian Live - System Boot Scripts (transitional package)
- Package to ease upgrading from older live-initramfs packages to the new
- live-boot-initramfs-tools package.
- .
- This package can be purged at anytime once the live-boot-initramfs-tools
- package has been installed.

diff --git a/debian/live-boot-initramfs-tools.postinst b/debian/live-boot-grml-initramfs-tools.postinst
similarity index 100%
rename from debian/live-boot-initramfs-tools.postinst
rename to debian/live-boot-grml-initramfs-tools.postinst

diff --git a/debian/live-boot-initramfs-tools.triggers b/debian/live-boot-grml-initramfs-tools.triggers
similarity index 100%
rename from debian/live-boot-initramfs-tools.triggers
rename to debian/live-boot-grml-initramfs-tools.triggers

diff --git a/debian/live-boot.bug-presubj b/debian/live-boot-grml.bug-presubj
similarity index 100%
rename from debian/live-boot.bug-presubj
rename to debian/live-boot-grml.bug-presubj

diff --git a/debian/live-boot.bug-script b/debian/live-boot-grml.bug-script
similarity index 100%
rename from debian/live-boot.bug-script
rename to debian/live-boot-grml.bug-script

diff --git a/debian/live-boot.init b/debian/live-boot-grml.init
similarity index 100%
rename from debian/live-boot.init
rename to debian/live-boot-grml.init

diff --git a/debian/live-boot-grml.lintian-overrides b/debian/live-boot-grml.lintian-overrides
new file mode 100644 (file)
index 0000000..001198f
--- /dev/null
+++ b/debian/live-boot-grml.lintian-overrides
@@ -0,0 +1,4 @@
+# false positives, not applicable to live systems
+live-boot-grml: init.d-script-missing-dependency-on-remote_fs /etc/init.d/live-boot-grml: required-start
+live-boot-grml: init.d-script-missing-dependency-on-remote_fs /etc/init.d/live-boot-grml: required-stop
+live-boot-grml: init.d-script-possible-missing-stop /etc/init.d/live-boot-grml 1

diff --git a/debian/live-boot.lintian-overrides b/debian/live-boot.lintian-overrides
deleted file mode 100644 (file)
index aa345a5..0000000
--- a/debian/live-boot.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# false positives, not applicable to live systems
-live-boot: init.d-script-missing-dependency-on-remote_fs /etc/init.d/live-boot: required-start
-live-boot: init.d-script-missing-dependency-on-remote_fs /etc/init.d/live-boot: required-stop
-live-boot: init.d-script-possible-missing-stop /etc/init.d/live-boot 1

diff --git a/debian/rules b/debian/rules
index 6d9ad98..d2e4e99 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,19 +10,19 @@ build:
        dh ${@} --with quilt
 
 override_dh_auto_install:
-       dh_auto_install -- DESTDIR=debian/live-boot
+       dh_auto_install -- DESTDIR=debian/live-boot-grml
 
        # Removing useless files
-       rm -f debian/live-boot/usr/share/doc/live-boot/COPYING
+       rm -f debian/live-boot-grml/usr/share/doc/live-boot-grml/COPYING
 
        # live-boot-initramfs-tools
-       mkdir -p debian/live-boot-initramfs-tools/usr/share
-       mv debian/live-boot/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share
+       mkdir -p debian/live-boot-grml-initramfs-tools/usr/share
+       mv debian/live-boot-grml/usr/share/initramfs-tools debian/live-boot-grml-initramfs-tools/usr/share
        # Some more useless files
-       rm -f debian/live-boot-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/12fstab
-       rm -f debian/live-boot-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/23networking
-       rm -f debian/live-boot-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/24preseed
-       rm -f debian/live-boot-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/30accessibility
+       rm -f debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/12fstab
+       rm -f debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/23networking
+       rm -f debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/24preseed
+       rm -f debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/30accessibility
 
 override_dh_installinit:
-       dh_installinit -p live-boot --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .'
+       dh_installinit -p live-boot-grml --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .'