Split package into grml-live and grml-live-addons

diff --git a/debian/changelog b/debian/changelog
index eb2a4f1..f978e84 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,19 @@
 grml-live (0.9.13) UNRELEASED; urgency=low
 
+  * Split package into grml-live and grml-live-addons.
+    Add grml-live-addons to Recommends of package grml-live.
+    Package grml-live-addons provides the templates/boot/addons
+    files that require >7MB of disk space overall so we don't
+    want to ship it with default grml:
+    - allinone.img
+    - balder10.imz
+    - bsd4grml/
+    - chain.c32
+    - hdt.c32
+    - memdisk
+    - menu.c32
+    - pci.ids
+  * Add ${misc:Depends} to binary packages' depend.
   * Bump Standard-Version to 3.8.1 (no further changes).
   * Install /etc/grml/fai/live-initramfs/live.conf only if
     /etc/live.conf does not exist in the target yet.
@@ -22,7 +36,7 @@ grml-live (0.9.13) UNRELEASED; urgency=low
     - Drop clive from GRML_FULL as it depends on a fscking large perl
       package (see #526999).
 
- -- Michael Prokop <mika@grml.org>  Mon, 04 May 2009 23:08:21 +0200
+ -- Michael Prokop <mika@grml.org>  Tue, 05 May 2009 09:30:16 +0200
 
 grml-live (0.9.12) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index ab22e29..ffcee99 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,20 @@ Vcs-Browser: http://git.grml.org/?p=grml-live.git
 
 Package: grml-live
 Architecture: all
-Depends: fai-client (>= 3.2.4), fai-server (>= 3.2.4), memtest86+ [i386 amd64], mkisofs | genisoimage, squashfs-lzma-tools | squashfs-tools, wget, moreutils
+Depends: ${misc:Depends}, fai-client (>= 3.2.4), fai-server (>= 3.2.4), memtest86+ [i386 amd64], mkisofs | genisoimage, squashfs-lzma-tools | squashfs-tools, wget, moreutils
+Recommends: grml-live-addons
 Suggests: fai-doc
 Description: build system for creating a grml (based) live-cd
  This package provides the build system for creating
  a Debian / grml based Linux live cd. It is based on
  FAI (Fully Automatic Installation).
+
+Package: grml-live-addons
+Architecture: all
+Depends: ${misc:Depends}, grml-live
+Conflicts: grml-live (<< 0.9.13)
+Description: templates/boot/addons for grml-live
+ This package provides the boot addons known as the
+ features providing bootoptions bsd, dos, grub and hdt.
+ You can safely skip this package if you don't need
+ the addons.

diff --git a/debian/grml-live-addons.install b/debian/grml-live-addons.install
new file mode 100644 (file)
index 0000000..0d65e9c
--- /dev/null
+++ b/debian/grml-live-addons.install
@@ -0,0 +1 @@
+templates/boot/addons       usr/share/grml-live/templates/boot/

diff --git a/debian/grml-live.dirs b/debian/grml-live.dirs
new file mode 100644 (file)
index 0000000..2745e0d
--- /dev/null
+++ b/debian/grml-live.dirs
@@ -0,0 +1,5 @@
+etc/grml/fai/live-initramfs
+usr/sbin
+usr/share/doc/grml-live
+usr/share/grml-live
+usr/share/grml-live/buildd usr/sbin

diff --git a/debian/grml-live.docs b/debian/grml-live.docs
new file mode 100644 (file)
index 0000000..66f2ad4
--- /dev/null
+++ b/debian/grml-live.docs
@@ -0,0 +1,2 @@
+docs/grml-live.html
+docs/grml-live-remaster.html

diff --git a/debian/grml-live.install b/debian/grml-live.install
new file mode 100644 (file)
index 0000000..0f63fb1
--- /dev/null
+++ b/debian/grml-live.install
@@ -0,0 +1,14 @@
+buildd/grml-buildd.conf     etc/grml/
+buildd/*.sh                 usr/share/grml-live/buildd/
+docs/grml-live.8            usr/share/man/man8/
+docs/grml-live-remaster.8   usr/share/man/man8/
+etc/grml                    etc
+examples                    usr/share/doc/grml-live/
+grml-live                   usr/sbin/
+patches                     usr/share/grml-live/
+remaster/grml-live-remaster usr/sbin/
+scripts                     usr/share/grml-live/
+templates/boot/grub         usr/share/grml-live/templates/boot/
+templates/boot/isolinux     usr/share/grml-live/templates/boot/
+templates/GRML              usr/share/grml-live/templates/
+templates/windows           usr/share/grml-live/templates/

diff --git a/debian/overrides b/debian/overrides.grml-live
similarity index 90%
rename from debian/overrides
rename to debian/overrides.grml-live
index daa471b..170c37d 100644 (file)
--- a/debian/overrides
+++ b/debian/overrides.grml-live
@@ -1,6 +1,7 @@
-grml-live: extra-license-file usr/share/grml-live/templates/GRML/LICENSE.txt
-grml-live: extra-license-file usr/share/grml-live/templates/boot/addons/bsd4grml/LICENCE.TXT
-grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.pif
-grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.inf
+grml-live: depends-on-obsolete-package depends: mkisofs
 grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.bat
+grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.inf
+grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.pif
+grml-live: extra-license-file usr/share/grml-live/templates/boot/addons/bsd4grml/LICENCE.TXT
+grml-live: extra-license-file usr/share/grml-live/templates/GRML/LICENSE.txt
 grml-live: unknown-section grml

diff --git a/debian/overrides.grml-live-addons b/debian/overrides.grml-live-addons
new file mode 100644 (file)
index 0000000..e7975cc
--- /dev/null
+++ b/debian/overrides.grml-live-addons
@@ -0,0 +1,2 @@
+grml-live-addons: extra-license-file usr/share/grml-live/templates/boot/addons/bsd4grml/LICENCE.TXT
+grml-live-addons: unknown-section grml

diff --git a/debian/rules b/debian/rules
index b5a221c..905916b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+b=$(CURDIR)/debian/build
+
 build: build-stamp
 
 build-stamp:
@@ -24,51 +26,63 @@ clean:
        # Add here commands to clean up after the build process.
        cd docs && $(MAKE) clean && cd ../
 
-       dh_clean 
+       dh_clean
+       # clean up the stuff dh_clean leaves behind
+       -rm -rf debian/build
 
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
-       dh_installdirs etc/grml/fai/live-initramfs usr/sbin usr/share/doc/grml-live \
-                      usr/share/grml-live usr/share/grml-live/buildd usr/sbin
+       dh_clean -k
+       dh_installdirs
+
+grml-live: install
+       @echo "--- Building: $@"
+       dh_installdirs       -p$@ -P$(b)/$@
+       dh_link              -p$@ -P$(b)/$@
+       dh_installdocs       -p$@ -P$(b)/$@
+       dh_installchangelogs -p$@ -P$(b)/$@
+       dh_install           -p$@ -P$(b)/$@
+       dh_strip             -p$@ -P$(b)/$@
+       dh_compress          -p$@ -P$(b)/$@
+       mkdir -p $(b)/$(@)/usr/share/lintian/overrides/
+       cp -av debian/overrides.$(@) $(b)/$(@)/usr/share/lintian/overrides/$(@)
+       dh_fixperms          -p$@ -P$(b)/$@
+       # make sure they are executable:
+       chmod 755 $(b)/$(@)/etc/grml/fai/config/hooks/*
+       dh_makeshlibs        -p$@ -P$(b)/$@ -V
+       dh_installdeb        -p$@ -P$(b)/$@
+       dh_shlibdeps         -p$@ -P$(b)/$@
+       dh_installdebconf    -p$@ -P$(b)/$@
+       dh_gencontrol        -p$@ -P$(b)/$@
+       dh_md5sums           -p$@ -P$(b)/$@
+       dh_builddeb          -p$@ -P$(b)/$@
 
-       # Add here commands to install the package into debian/grml-live.
-       cp -a etc         debian/grml-live/
-       cp -a examples    debian/grml-live/usr/share/doc/grml-live/
-       cp -a templates   debian/grml-live/usr/share/grml-live/
-       cp -a scripts     debian/grml-live/usr/share/grml-live/
-       cp -a patches     debian/grml-live/usr/share/grml-live/
-       cp -a buildd/*.sh debian/grml-live/usr/share/grml-live/buildd/
-       install -o root -m 640 buildd/grml-buildd.conf     debian/grml-live/etc/grml/grml-buildd.conf
-       install -o root -m 755 remaster/grml-live-remaster debian/grml-live/usr/sbin/grml-live-remaster
-       install -o root -m 755 grml-live                   debian/grml-live/usr/sbin/grml-live
+grml-live-addons: install
+       @echo "--- Building: $@"
+       dh_installdirs       -p$@ -P$(b)/$@
+       dh_link              -p$@ -P$(b)/$@
+       dh_installdocs       -p$@ -P$(b)/$@
+       dh_installchangelogs -p$@ -P$(b)/$@
+       dh_install           -p$@ -P$(b)/$@
+       dh_strip             -p$@ -P$(b)/$@
+       dh_compress          -p$@ -P$(b)/$@
+       mkdir -p $(b)/$(@)/usr/share/lintian/overrides/
+       cp -av debian/overrides.$(@) $(b)/$(@)/usr/share/lintian/overrides/$(@)
+       dh_fixperms          -p$@ -P$(b)/$@
+       dh_makeshlibs        -p$@ -P$(b)/$@ -V
+       dh_installdeb        -p$@ -P$(b)/$@
+       dh_shlibdeps         -p$@ -P$(b)/$@
+       dh_installdebconf    -p$@ -P$(b)/$@
+       dh_gencontrol        -p$@ -P$(b)/$@
+       dh_md5sums           -p$@ -P$(b)/$@
+       dh_builddeb          -p$@ -P$(b)/$@
 
 # Build architecture-dependent files here.
 binary-all: build install
-# We have nothing to do by default.
 
 # Build architecture-independent files here.
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs docs/grml-live.html docs/grml-live-remaster.html
-       dh_installexamples
-       dh_installman docs/grml-live.8 docs/grml-live-remaster.8
-       dh_link
-       dh_strip
-       dh_compress
-       mkdir -p $(CURDIR)/debian/grml-live/usr/share/lintian/overrides/
-       cp -av debian/overrides $(CURDIR)/debian/grml-live/usr/share/lintian/overrides/grml-live
-       dh_fixperms
-       # make sure they are executable:
-       chmod 755 debian/grml-live/etc/grml/fai/config/hooks/*
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+binary-indep: build install grml-live grml-live-addons
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install