proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-08-14 02:42:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge 1.99-23

Browse Source
This commit is contained in:
Colin Watson 2012-09-25 22:46:55 +01:00
commit 7df5156829
6 changed files with 54 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
debian/changelog vendored
View File

@ -7,6 +7,21 @@ grub2 (2.00-6) UNRELEASED; urgency=low
kfreebsd-i386 and hurd-i386 don't have gcc-4.6-multilib. Instead, make
sure to only install efiemu32.o and efiemu64.o on (linux-)i386,
kopensolaris-i386, and any-amd64.
* Manually expand @PACKAGE@ symbols in grub-efi.postinst (closes:
#688725), grub-linuxbios.postinst (closes: #688726), and grub2.postinst
(closes: #688724).
[ Debconf translations ]
* Lithuanian (Rimas Kudelis). Closes: #675628
* Galician (Jorge Barreiro). Closes: #677389
* Welsh (Daffyd Tomos).
* Greek (galaxico). Closes: #685201
* 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).
-- Colin Watson <cjwatson@debian.org> Fri, 21 Sep 2012 17:20:21 +0100
@ -134,6 +149,29 @@ grub2 (2.00-1) experimental; urgency=low
-- Colin Watson <cjwatson@debian.org> Thu, 06 Sep 2012 19:04:21 +0100
grub2 (1.99-23) unstable; urgency=low
[ Debconf translations ]
* Lithuanian (Rimas Kudelis). Closes: #675628
* Galician (Jorge Barreiro). Closes: #677389
* Welsh (Daffyd Tomos).
* Greek (galaxico). Closes: #685201
* 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).
[ 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).
-- Colin Watson <cjwatson@debian.org> Tue, 25 Sep 2012 18:59:18 +0100
grub2 (1.99-22.1) unstable; urgency=low
* Non-maintainer upload.

8
debian/grub-efi.postinst vendored
View File

@ -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 2.00-6; 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

2
debian/grub-emu.postinst.in vendored
View File

@ -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 2.00-2; 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

8
debian/grub-linuxbios.postinst vendored
View File

@ -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 2.00-6; 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

8
debian/grub2.postinst vendored
View File

@ -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 2.00-6; 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

3
debian/rules vendored
View File

@ -312,6 +312,9 @@ override_dh_strip:
override_dh_shlibdeps:
dh_shlibdeps -X.module
override_dh_builddeb:
dh_builddeb -- -Zxz
override_dh_auto_clean:
-rm -rf build
-rm -f contrib grub-core/contrib