From: Christian Hofstaedtler Date: Sun, 24 Jul 2011 19:57:36 +0000 (+0200) Subject: Merge remote-tracking branch 'debian/debian' into ch/new_version X-Git-Tag: v3.0_a19-1+grml.00~1^2~1 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=8cd0e7a9e961e73abe47b0d5c11d3c3a9cbdf802 Merge remote-tracking branch 'debian/debian' into ch/new_version Conflicts: Makefile debian/changelog debian/control debian/rules --- 8cd0e7a9e961e73abe47b0d5c11d3c3a9cbdf802 diff --cc Makefile index c62aabd,a2ab1b9..ed2471f --- a/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 + 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* 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 + 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 + 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/changelog index b4bffb0,fde7ac9..997b433 --- a/debian/changelog +++ b/debian/changelog @@@ -1,48 -1,25 +1,70 @@@ + live-boot (3.0~a19-1) unstable; urgency=low + + * Correct rmdir call in top-level Makefiles uninstall target to not + fail if there was no prior live-boot installation. + * Making references to debian more distribution neutral. + * Replacing reference to old alioth page in live-snapshot. + * Splitting out documentation so that it can be accesses separately + from the initramfs code. + * Adding conflicts/replaces for live-boot to live-boot-doc to not + break upgrades. + + -- Daniel Baumann Wed, 13 Jul 2011 10:28:33 +0200 + + live-boot (3.0~a18-1) unstable; urgency=low + + * Updating and correcting sendsigs.omit support for /run (Closes: + #628188). + * Removing accidentally twice included English files when installing + manpages. + + -- Daniel Baumann Sat, 11 Jun 2011 11:24:15 +0200 + +live-boot (3.0~a17-1+grml.01) unstable; urgency=low + + * [6666658] Do not fail in multiarch environment when + installing libnss_dns.so. + * [ebdefd9] Drop installation of localized manpages + from upstream Makefile. + + -- Michael Prokop Wed, 08 Jun 2011 12:15:23 +0200 + +live-boot (3.0~a17-1+grml.00) unstable; urgency=low + + [ Christian Hofstaedtler ] + * [c9a70fd] Add dpatch support to build process. + * [a9ddc0a] Readd Grml patches. + * [675f2b2] Remove unused boot scripts. + * [c4993d4] Update debian/control for Grml. + * [0716b66] Ensure 10validateroot is executable. + * [b5b937f] Always honor the "nodhcp" boot option. + * [10cf847] Don't mess around with kernel/initramfs-tools' ip=. + * [aa93321] Networking_grml: DNS for systems without resolvconf. + * [2a859b8] Merge dhcphostname support into 23networking-grml. + * [10caf0b] Support DNS in boot environment. + + [ Michael Prokop ] + * [6cd3977] Add patch number 19 to revert the toram bootoption + to expected behaviour. + * [65fa11b] Support dns bootoption. + + [ Ulrich Dangel ] + * [df17b43] Support lvm devices for live-media. + * [8ff045c] Support raid devices as well. + * [2ad3c30] Change output to live-boot.log. + * [34b4518] Explicit specify offset parameter for setup_loop. + [Closes: issue1003] + * [3ac64e5] Remove dba from uploader as this is a Grml project. + * [b289379] Support static ip configuration. + * [1371673] Improve static version. + * [9487c5d] Change nodhcp patch to unset the DHCP option as well. + * [1662374] Support nodhcp bootoption. + * [7847abd] Ignore devices with no file matching the findiso parameter. + * [7158e84] Don't show an error message if /live/image is already + unmounted. + + -- Michael Prokop Sun, 05 Jun 2011 21:29:14 +0200 + live-boot (3.0~a17-1) unstable; urgency=low [ Daniel Baumann ] diff --cc debian/control index f3dfc05,f574af7..14477ca --- a/debian/control +++ b/debian/control @@@ -1,20 -1,18 +1,20 @@@ Source: live-boot Section: misc Priority: optional -Maintainer: Debian Live Project -Uploaders: Daniel Baumann -Build-Depends: debhelper (>= 8) +Maintainer: Grml Team +Build-Depends: debhelper (>= 8), quilt Standards-Version: 3.9.2 Homepage: http://live.debian.net/devel/live-boot/ -Vcs-Browser: http://live.debian.net/gitweb/?p=live-boot.git -Vcs-Git: git://live.debian.net/git/live-boot.git +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-grml-initramfs-tools (=${binary:Version}) -Depends: ${misc:Depends}, live-boot-initramfs-tools | live-boot-backend -Recommends: live-boot-doc, eject, file, rsync, uuid-runtime ++Depends: ${misc:Depends}, live-boot-grml-initramfs-tools ++Recommends: live-boot-grml-doc, eject, file, rsync, uuid-runtime +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 live-boot contains the scripts that configure a Debian Live system during the @@@ -22,12 -20,19 +22,28 @@@ . In addition to live-boot, a backend for the initrd generation is required, such as live-boot-initramfs-tools. + . + 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-boot-doc ++Package: live-boot-grml-doc + Architecture: all + Depends: ${misc:Depends} -Conflicts: live-boot (<< 3.0~a18~) -Replaces: live-boot ++Conflicts: live-boot (<< 3.0~a18~), live-boot-doc ++Replaces: live-boot, live-boot-doc ++Provides: live-boot-doc + Description: Debian Live - System Boot Scripts (documentation) + live-boot contains the scripts that configure a Debian Live system during the + boot process (early userspace). + . + This package contains the documentation. ++ . ++ 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-boot-initramfs-tools +Package: live-boot-grml-initramfs-tools Architecture: all Depends: ${misc:Depends}, busybox | busybox-initramfs, initramfs-tools, udev diff --cc debian/live-boot-grml-doc.install index 0000000,0e373be..0e373be mode 000000,100644..100644 --- a/debian/live-boot-grml-doc.install +++ b/debian/live-boot-grml-doc.install diff --cc debian/live-boot-grml.install index 0000000,79474ce..79474ce mode 000000,100644..100644 --- a/debian/live-boot-grml.install +++ b/debian/live-boot-grml.install diff --cc debian/rules index d2e4e99,2720264..710e6fa --- a/debian/rules +++ b/debian/rules @@@ -1,28 -1,20 +1,31 @@@ #!/usr/bin/make -f +build: + # this is needed because dpatch doesn't do file modes on diffs. + chmod a+rx scripts/live-bottom/* + # regular build. + dh build + %: - dh ${@} + dh ${@} --with quilt override_dh_auto_install: - dh_auto_install -- DESTDIR=debian/live-boot-grml + dh_auto_install -- DESTDIR=debian/tmp # Removing useless files - rm -f debian/live-boot-grml/usr/share/doc/live-boot-grml/COPYING - rm -f debian/tmp/usr/share/doc/live-boot/COPYING ++ rm -f debian/tmp/usr/share/doc/live-boot-grml/COPYING ++ # Some more useless files ++ rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/12fstab ++ rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/23networking ++ rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/24preseed ++ rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/30accessibility # live-boot-initramfs-tools - mkdir -p debian/live-boot-initramfs-tools/usr/share - mv debian/tmp/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-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 ++ mv debian/tmp/usr/share/initramfs-tools debian/live-boot-grml-initramfs-tools/usr/share 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 .' + + override_dh_install: + dh_install --fail-missing