From 364bdc04570adf8ba755cdd5f8a2648d585df17b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 25 Sep 2012 18:27:35 +0100 Subject: [PATCH 1/4] Use xz compression for all binaries to save up some space on CD images (closes: #688773). --- debian/changelog | 4 ++++ debian/rules | 3 +++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3bc37d51a..e80acac31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ grub2 (1.99-23) UNRELEASED; urgency=low * Romanian (Andrei POPESCU). Closes: #685477 * Finnish (Timo Jyrinki). + [ Cyril Brulebois ] + * Use xz compression for all binaries to save up some space on CD images + (closes: #688773). + -- Christian Perrier Sat, 02 Jun 2012 19:51:35 +0200 grub2 (1.99-22.1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index d5ce2d9ac..fb1ae3400 100755 --- a/debian/rules +++ b/debian/rules @@ -256,6 +256,9 @@ override_dh_installdocs: override_dh_strip: dh_strip -X/usr/bin/grub-emu +override_dh_builddeb: + dh_builddeb -- -Zxz + override_dh_auto_clean: -rm -rf build -rm -f contrib grub-core/contrib From cb51936d164463684394aafe193a8abb46911912 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 25 Sep 2012 18:50:25 +0100 Subject: [PATCH 2/4] Autogenerate packaging files for grub-emu (closes: #688727), in order that its postinst does not contain unexpanded @PACKAGE@ symbols. --- debian/changelog | 4 ++++ .../{grub-emu.install => grub-emu.install.in} | 0 ...{grub-emu.postinst => grub-emu.postinst.in} | 2 +- debian/rules | 18 ++++++++++++++++-- 4 files changed, 21 insertions(+), 3 deletions(-) rename debian/{grub-emu.install => grub-emu.install.in} (100%) rename debian/{grub-emu.postinst => grub-emu.postinst.in} (86%) diff --git a/debian/changelog b/debian/changelog index e80acac31..20c1554c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,10 @@ grub2 (1.99-23) UNRELEASED; urgency=low * Use xz compression for all binaries to save up some space on CD images (closes: #688773). + [ Colin Watson ] + * Autogenerate packaging files for grub-emu (closes: #688727), in order + that its postinst does not contain unexpanded @PACKAGE@ symbols. + -- Christian Perrier Sat, 02 Jun 2012 19:51:35 +0200 grub2 (1.99-22.1) unstable; urgency=low diff --git a/debian/grub-emu.install b/debian/grub-emu.install.in similarity index 100% rename from debian/grub-emu.install rename to debian/grub-emu.install.in diff --git a/debian/grub-emu.postinst b/debian/grub-emu.postinst.in similarity index 86% rename from debian/grub-emu.postinst rename to debian/grub-emu.postinst.in index d5d90a693..96c3f5dcd 100644 --- a/debian/grub-emu.postinst +++ b/debian/grub-emu.postinst.in @@ -3,7 +3,7 @@ set -e case "$1" in configure) - if dpkg --compare-versions "$2" lt-nl 1.99-1; then + if dpkg --compare-versions "$2" lt-nl 1.99-23; then # Force dpkg to replace this directory with a symlink. if [ ! -L /usr/share/doc/@PACKAGE@ ] && [ -d /usr/share/doc/@PACKAGE@ ]; then if rmdir /usr/share/doc/@PACKAGE@ 2>/dev/null; then diff --git a/debian/rules b/debian/rules index fb1ae3400..833611cdf 100755 --- a/debian/rules +++ b/debian/rules @@ -173,7 +173,21 @@ platform_subst = \ install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-ieee1275 install/grub-coreboot install/grub-emu install/grub-yeeloong: dh_auto_install --destdir=debian/tmp-$(package) - if [ "$@" != "install/grub-emu" ] ; then \ + if [ "$@" = "install/grub-emu" ] ; then \ + set -e ; \ + for i in $(AUTOGEN_DEB_FILES) ; do \ + > debian/$(package).$$i; \ + $(call platform_subst,$(package).$$i.in,$(package),$$i); \ + $(call platform_subst,$(package).$$i.$(DEB_HOST_ARCH_CPU).in,$(package),$$i); \ + $(call platform_subst,$(package).$$i.$(DEB_HOST_ARCH_OS).in,$(package),$$i); \ + [ -s debian/$(package).$$i ] || rm -f debian/$(package).$$i; \ + > debian/$(package_dbg).$$i; \ + $(call platform_subst,$(package_dbg).$$i.in,$(package_dbg),$$i); \ + $(call platform_subst,$(package_dbg).$$i.$(DEB_HOST_ARCH_CPU).in,$(package_dbg),$$i); \ + $(call platform_subst,$(package_dbg).$$i.$(DEB_HOST_ARCH_OS).in,$(package_dbg),$$i); \ + [ -s debian/$(package_dbg).$$i ] || rm -f debian/$(package_dbg).$$i; \ + done ; \ + else \ set -e ; \ cpu_platform=$$(find debian/tmp-$(package)/usr/lib/grub \ -mindepth 1 -maxdepth 1 -type d -printf '%P\n') ; \ @@ -269,7 +283,7 @@ override_dh_clean: debian/legacy/update-grub debian/grub-extras chmod +x debian/{script,grub.d/*,legacy/*,kernel/*} for i in $(AUTOGEN_DEB_FILES) ; do \ - rm -f debian/grub-{pc,efi-*,ieee1275,coreboot,yeeloong}{,-bin}.$$i ; \ + rm -f debian/grub-{pc,efi-*,ieee1275,coreboot,yeeloong,emu}{,-bin}.$$i ; \ done rm -rf debian/tmp-*/ From a619b95e5f8802f1ae3a4040cf5d19a5da3db3b6 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 25 Sep 2012 18:52:09 +0100 Subject: [PATCH 3/4] Manually expand @PACKAGE@ symbols in grub-efi.postinst (closes: #688725), grub-linuxbios.postinst (closes: #688726), and grub2.postinst (closes: #688724). --- debian/changelog | 3 +++ debian/grub-efi.postinst | 8 ++++---- debian/grub-linuxbios.postinst | 8 ++++---- debian/grub2.postinst | 8 ++++---- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 20c1554c6..b01ed14e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ grub2 (1.99-23) UNRELEASED; urgency=low [ Colin Watson ] * Autogenerate packaging files for grub-emu (closes: #688727), in order that its postinst does not contain unexpanded @PACKAGE@ symbols. + * Manually expand @PACKAGE@ symbols in grub-efi.postinst (closes: + #688725), grub-linuxbios.postinst (closes: #688726), and grub2.postinst + (closes: #688724). -- Christian Perrier Sat, 02 Jun 2012 19:51:35 +0200 diff --git a/debian/grub-efi.postinst b/debian/grub-efi.postinst index d5d90a693..cb5f5e338 100644 --- a/debian/grub-efi.postinst +++ b/debian/grub-efi.postinst @@ -3,11 +3,11 @@ set -e case "$1" in configure) - if dpkg --compare-versions "$2" lt-nl 1.99-1; then + if dpkg --compare-versions "$2" lt-nl 1.99-23; then # Force dpkg to replace this directory with a symlink. - if [ ! -L /usr/share/doc/@PACKAGE@ ] && [ -d /usr/share/doc/@PACKAGE@ ]; then - if rmdir /usr/share/doc/@PACKAGE@ 2>/dev/null; then - ln -sf grub-common /usr/share/doc/@PACKAGE@ + if [ ! -L /usr/share/doc/grub-efi ] && [ -d /usr/share/doc/grub-efi ]; then + if rmdir /usr/share/doc/grub-efi 2>/dev/null; then + ln -sf grub-common /usr/share/doc/grub-efi fi fi fi diff --git a/debian/grub-linuxbios.postinst b/debian/grub-linuxbios.postinst index d5d90a693..bf87b0d47 100644 --- a/debian/grub-linuxbios.postinst +++ b/debian/grub-linuxbios.postinst @@ -3,11 +3,11 @@ set -e case "$1" in configure) - if dpkg --compare-versions "$2" lt-nl 1.99-1; then + if dpkg --compare-versions "$2" lt-nl 1.99-23; then # Force dpkg to replace this directory with a symlink. - if [ ! -L /usr/share/doc/@PACKAGE@ ] && [ -d /usr/share/doc/@PACKAGE@ ]; then - if rmdir /usr/share/doc/@PACKAGE@ 2>/dev/null; then - ln -sf grub-common /usr/share/doc/@PACKAGE@ + if [ ! -L /usr/share/doc/grub-linuxbios ] && [ -d /usr/share/doc/grub-linuxbios ]; then + if rmdir /usr/share/doc/grub-linuxbios 2>/dev/null; then + ln -sf grub-common /usr/share/doc/grub-linuxbios fi fi fi diff --git a/debian/grub2.postinst b/debian/grub2.postinst index d5d90a693..234dd7188 100644 --- a/debian/grub2.postinst +++ b/debian/grub2.postinst @@ -3,11 +3,11 @@ set -e case "$1" in configure) - if dpkg --compare-versions "$2" lt-nl 1.99-1; then + if dpkg --compare-versions "$2" lt-nl 1.99-23; then # Force dpkg to replace this directory with a symlink. - if [ ! -L /usr/share/doc/@PACKAGE@ ] && [ -d /usr/share/doc/@PACKAGE@ ]; then - if rmdir /usr/share/doc/@PACKAGE@ 2>/dev/null; then - ln -sf grub-common /usr/share/doc/@PACKAGE@ + if [ ! -L /usr/share/doc/grub2 ] && [ -d /usr/share/doc/grub2 ]; then + if rmdir /usr/share/doc/grub2 2>/dev/null; then + ln -sf grub-common /usr/share/doc/grub2 fi fi fi From d6ddc32c7fcc02bdb122c3d41e51e47743be158b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 25 Sep 2012 22:38:56 +0100 Subject: [PATCH 4/4] releasing version 1.99-23 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b01ed14e2..ea1ec9dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -grub2 (1.99-23) UNRELEASED; urgency=low +grub2 (1.99-23) unstable; urgency=low [ Debconf translations ] * Lithuanian (Rimas Kudelis). Closes: #675628 @@ -19,7 +19,7 @@ grub2 (1.99-23) UNRELEASED; urgency=low #688725), grub-linuxbios.postinst (closes: #688726), and grub2.postinst (closes: #688724). - -- Christian Perrier Sat, 02 Jun 2012 19:51:35 +0200 + -- Colin Watson Tue, 25 Sep 2012 18:59:18 +0100 grub2 (1.99-22.1) unstable; urgency=low