Include grml-live-remaster; Bump Standard-Version

diff --git a/debian/changelog b/debian/changelog
index dbd51c3..8a822ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 grml-live (0.0.14) unstable; urgency=low
 
+  * Include initial version of the grml-live-remaster script,
+    contributed by Michael Schierl (thanks!) [Closes: issue331]
+  * Bump Standard-Version to 3.7.3 (no further changes).
   * Set debconf configuration for postfix via
     /etc/grml/fai/config/scripts/GRMLBASE/05-hostname
   * Improve check for presence of FAI log directory in

diff --git a/debian/control b/debian/control
index fe46d25..0f0556f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: grml
 Priority: extra
 Maintainer: Michael Prokop <mika@grml.org>
 Build-Depends: debhelper (>= 5), asciidoc, xsltproc, docbook-xsl
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Homepage: http://hg.grml.org/grml-live/
 XS-Vcs-hg: http://hg.grml.org/grml-live/
 XS-Vcs-Browser: http://hg.grml.org/grml-live/

diff --git a/debian/rules b/debian/rules
index b6f13d9..7895772 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ install: build
        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/share/grml-live usr/share/grml-live/buildd usr/sbin
 
        # Add here commands to install the package into debian/grml-live.
        cp -a etc         debian/grml-live/
@@ -40,6 +40,7 @@ install: build
        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/
+       cp remaster/grml-live-remaster debian/grml-live/usr/sbin/grml-live-remaster
        install -o root -m 640 buildd/grml-buildd.conf debian/grml-live/etc/grml/grml-buildd.conf
        install -o root -m 755 grml-live debian/grml-live/usr/sbin/grml-live