grub2 1.96+20080724-7
Robert Millan
rmh at aybabtu.com
Sun Aug 10 19:03:24 UTC 2008
Hi,
Please consider approving grub2 1.96+20080724-7 (debdiff attached).
Note: part of the change is resyncing grub2's copy of grub's update-grub,
whose changes you already approved for grub 0.97-46 (the same file is
included in both packages).
--
Robert Millan
The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
how) you may access your data; but nobody's threatening your freedom: we
still allow you to remove your data and not access it at all."
-------------- next part --------------
diff -u grub2-1.96+20080724/debian/changelog grub2-1.96+20080724/debian/changelog
--- grub2-1.96+20080724/debian/changelog
+++ grub2-1.96+20080724/debian/changelog
@@ -1,3 +1,23 @@
+grub2 (1.96+20080724-7) unstable; urgency=high
+
+ * Make build-dependency on unifont-bin versioned (<< 1:5.1.20080706-1)
+ (or unifont >= 1:5.1.20080808-2) to avoid being hit by #494473.
+ (Closes: #494460)
+ * patches/02_dpkg_version_comparison.diff: Replace with
+ patches/901_dpkg_version_comparison.diff (new patch), based on the
+ implementation in grub 0.97-46. (Closes: #494158)
+
+ -- Robert Millan <rmh at aybabtu.com> Sat, 9 Aug 2008 21:21:00 +0200
+
+grub2 (1.96+20080724-6) unstable; urgency=high
+
+ * patches/02_old_linux_version_comparison.diff: Replace with ...
+ * patches/02_dpkg_version_comparison.diff: ... this.
+ Use dpkg --compare-versions in update-grub. (Closes: #494158)
+ * fixed 2 double slashes in the spanish translation (es.po) (Closes: #493744)
+
+ -- Felix Zielcke <fzielcke at z-51.de> Sun, 03 Aug 2008 17:53:33 +0200
+
grub2 (1.96+20080724-5) unstable; urgency=high
[ Felix Zielcke ]
diff -u grub2-1.96+20080724/debian/control grub2-1.96+20080724/debian/control
--- grub2-1.96+20080724/debian/control
+++ grub2-1.96+20080724/debian/control
@@ -4,12 +4,13 @@
Maintainer: GRUB Maintainers <pkg-grub-devel at lists.alioth.debian.org>
Uploaders: Jason Thomas <jason at debian.org>, Otavio Salvador <otavio at debian.org>, Robert Millan <rmh at aybabtu.com>
Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), patchutils (>= 0.2.25), autoconf,
- ruby, bison, dpkg-dev (>= 1.13.12), unifont-bin, po-debconf,
+ ruby, bison, dpkg-dev (>= 1.13.12), po-debconf,
genisoimage [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64],
libc6-dev-i386 [amd64], libc0.1-dev-i386 [kfreebsd-amd64], libc6-dev-powerpc [ppc64],
gcc-multilib [amd64 kfreebsd-amd64 ppc64] | gcc-4.1 (<< 4.1.2) [amd64 kfreebsd-amd64 ppc64],
libncurses5-dev,
liblzo2-dev (>= 2.03) [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64] | liblzo-dev [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64],
+ unifont (>= 1:5.1.20080808-2) | unifont-bin (<< 1:5.1.20080706-1),
help2man
Build-Conflicts: autoconf2.13, liblzo2-dev (<< 2.02)
Standards-Version: 3.8.0
diff -u grub2-1.96+20080724/debian/po/es.po grub2-1.96+20080724/debian/po/es.po
--- grub2-1.96+20080724/debian/po/es.po
+++ grub2-1.96+20080724/debian/po/es.po
@@ -18,19 +18,20 @@
# - La gu?a de traducci?n de po's de debconf:
# /usr/share/doc/po-debconf/README-trans
# o http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: grub2 1.96\n"
"Report-Msgid-Bugs-To: pkg-grub-devel at lists.alioth.debian.org\n"
"POT-Creation-Date: 2008-02-13 14:53+0100\n"
"PO-Revision-Date: 2008-06-26 09:34-0430\n"
-"Last-Translator: Maria Germana Oliveira Blazetic <germanaoliveirab at gmail.com>\n"
+"Last-Translator: Maria Germana Oliveira Blazetic <germanaoliveirab at gmail."
+"com>\n"
"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#. Type: note
#. Description
@@ -49,10 +50,10 @@
"partition as the /dev/sda1 device node."
msgstr ""
"GRUB 2 ha cambiado el esquema de numeraci?n, como en la versi?n 1.95. Ahora "
-"las particiones comenzar?n desde el 1 en vez de 0. Esto se hace para hacerlo consistente "
-"con los nombres de dispositivo de Linux y otros n?cleos usados en Debian. Por ejemplo, "
-"cuando se usa Linux como kernel, \\"(hd0, 1)\\" se refiere a la misma partici?n que el dispositivo "
-"/dev/sda1."
+"las particiones comenzar?n desde el 1 en vez de 0. Esto se hace para hacerlo "
+"consistente con los nombres de dispositivo de Linux y otros n?cleos usados "
+"en Debian. Por ejemplo, cuando se usa Linux como kernel, \"(hd0, 1)\" se "
+"refiere a la misma partici?n que el dispositivo /dev/sda1."
#. Type: note
#. Description
@@ -63,9 +64,9 @@
"installed GRUB won't yet be able to parse correctly. To ensure your system "
"will be able to boot, you have to:"
msgstr ""
-"Por esto, existe la posibilidad de que su sistema no sea capaz de iniciar "
-"si se ejecuta update-grup(8) antes de actualizar GRUB, ya que se generar?a "
-"un archivo grub.cfg que su versi?n instalada de GRUB no ser?a capaz de leer "
+"Por esto, existe la posibilidad de que su sistema no sea capaz de iniciar si "
+"se ejecuta update-grup(8) antes de actualizar GRUB, ya que se generar?a un "
+"archivo grub.cfg que su versi?n instalada de GRUB no ser?a capaz de leer "
"correctamente. Para asegurar que su sistema inicie correctamente, debe:"
#. Type: note
@@ -82,15 +83,15 @@
#. Description
#: ../grub-pc.templates:1001
msgid "Chainload from menu.lst?"
-msgstr ""
-"?Desea realizar la carga en cadena desde menu.lst?"
+msgstr "?Desea realizar la carga en cadena desde menu.lst?"
#. Type: boolean
#. Description
#: ../grub-pc.templates:1001
msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub."
-msgstr "Los scripts de actualizaci?n han detectado en /boot/grub "
-"una configuraci?n heredada de una versi?n anterior de GRUB."
+msgstr ""
+"Los scripts de actualizaci?n han detectado en /boot/grub una configuraci?n "
+"heredada de una versi?n anterior de GRUB."
#. Type: boolean
#. Description
@@ -101,8 +102,8 @@
"your existing GRUB Legacy setup. This step may be automaticaly performed "
"now."
msgstr ""
-"Para reemplazar la versi?n anterior de GRUB en su sistema, se recomienda "
-"que se ajuste /boot/grub/menu.lst para que cargue en cadena a partir de su "
+"Para reemplazar la versi?n anterior de GRUB en su sistema, se recomienda que "
+"se ajuste /boot/grub/menu.lst para que cargue en cadena a partir de su "
"configuraci?n preexistente de GRUB. Este paso deber?a hacerse ahora de forma "
"autom?tica."
@@ -114,9 +115,9 @@
"verify that your new GRUB 2 setup is functional for you, before you install "
"it directly to your MBR (Master Boot Record)."
msgstr ""
-"Antes de instalar GRUB 2 directamente en el MBR (?Master Boot Record?) "
-"se recomienda que acepte cargarlo en cadena desde el menu.lst y que "
-"verifique que puede utilizar la nueva configuraci?n de GRUB 2."
+"Antes de instalar GRUB 2 directamente en el MBR (?Master Boot Record?) se "
+"recomienda que acepte cargarlo en cadena desde el menu.lst y que verifique "
+"que puede utilizar la nueva configuraci?n de GRUB 2."
#. Type: boolean
#. Description
@@ -128,9 +129,8 @@
-"En cualquier caso, cuando quiera que GRUB 2 se inicie directamente desde el MBR, "
-"puede hacerlo usando (como root) la siguiente orden:"
+"En cualquier caso, cuando quiera que GRUB 2 se inicie directamente desde el "
+"MBR, puede hacerlo usando (como root) la siguiente orden:"
#. Type: boolean
#. Description
#: ../grub-pc.templates:1001
msgid "upgrade-from-grub-legacy"
msgstr "upgrade-from-grub-legacy"
-
reverted:
--- grub2-1.96+20080724/debian/patches/02_old_linux_version_comparison.diff
+++ grub2-1.96+20080724.orig/debian/patches/02_old_linux_version_comparison.diff
@@ -1,113 +0,0 @@
-
-# Copyright 2001 Wichert Akkerman <wichert at linux.com>
-# Copyright 2005 Kristian Edlund <edlund at groenstue.dk>
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
-
-Index: util/grub.d/10_linux.in
-===================================================================
---- util/grub.d/10_linux.in (revision 1691)
-+++ util/grub.d/10_linux.in (working copy)
-@@ -1,4 +1,4 @@
--#! /bin/sh -e
-+#! /bin/bash -e
-
- # update-grub helper script.
- # Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
-@@ -65,20 +65,75 @@
- fi
- }
-
-+### This function taken from GRUB Legacy's update-grub
-+
-+# Compares two version strings A and B
-+# Returns -1 if A<B
-+# 0 if A==B
-+# 1 if A>B
-+# This compares version numbers of the form
-+# 2.4.14.2 > 2.4.14
-+# 2.4.14random = 2.4.14-random > 2.4.14-ac10 > 2.4.14 > 2.4.14-pre2 >
-+# 2.4.14-pre1 > 2.4.13-ac99
-+CompareVersions()
-+{
-+ #Changes the line something-x.y.z into somthing-x.y.z.q
-+ #This is to ensure that kernels with a .q is treated as higher than the ones without
-+ #First a space is put after the version number
-+ v1=$(echo $1 | sed -e 's!^\(.*-\([0-9]\+\.\)\{2,3\}[0-9]\+\)\(.*\)!\1 \3!g')
-+ v2=$(echo $2 | sed -e 's!^\(.*-\([0-9]\+\.\)\{2,3\}[0-9]\+\)\(.*\)!\1 \3!g')
-+ #If the version number only has 3 digits then put in another .0
-+ v1=$(echo $v1 | sed -e 's!^\(.*-\([0-9]\+\.\)\{2\}[0-9]\+\)\( .*\|$\)!\1.0 \3!g')
-+ v2=$(echo $v2 | sed -e 's!^\(.*-\([0-9]\+\.\)\{2\}[0-9]\+\)\( .*\|$\)!\1.0 \3!g')
-+
-+ # Then split the version number and remove any '.' 's or dashes
-+ v1=$(echo $v1 | sed -e 's![-\.]\+! !g' -e 's!\([0-9]\)\([[:alpha:]]\)!\1 \2!')
-+ v2=$(echo $v2 | sed -e 's![-\.]\+! !g' -e 's!\([0-9]\)\([[:alpha:]]\)!\1 \2!')
-+
-+ # we weight different kernel suffixes here
-+ # ac = 50
-+ # pre = -50
-+ # rc = -40
-+ # test = -60
-+ # others are given 99
-+ v1=$(echo $v1 | sed -e 's! k7! 786 !g' -e 's! ac! 50 !g' -e 's! rc! -40 !g' -e 's! pre! -50 !g' -e 's! test! -60 !g' -e 's![^ ]*[^-0-9 ][^ ]*!99!g')
-+
-+ v2=$(echo $v2 | sed -e 's! k7! 786 !g' -e 's! ac! 50 !g' -e 's! rc! -40 !g' -e 's! pre! -50 !g' -e 's! test! -60 !g' -e 's![^ ]*[^-0-9 ][^ ]*!99!g')
-+
-+ result=0; v1finished=0; v2finished=0;
-+ while [ $result -eq 0 ] && [ $v1finished -eq 0 ] && [ $v2finished -eq 0 ];
-+ do
-+ if [ "$v1" = "" ]; then
-+ v1comp=0; v1finished=1
-+ else
-+ set -- $v1; v1comp=$1; shift; v1=$*
-+ fi
-+
-+ if [ "$v2" = "" ]; then
-+ v2comp=0; v2finished=1
-+ else
-+ set -- $v2; v2comp=$1; shift; v2=$*
-+ fi
-+
-+ set +e
-+ result=`expr $v1comp - $v2comp`
-+ result=`expr substr $result 1 2`
-+ set -e
-+
-+ if [ $result -gt 0 ]; then result=1
-+ elif [ $result -lt 0 ]; then result=-1
-+ fi
-+ done
-+
-+ # finally return the result
-+ echo $result
-+}
-+
- test_gt ()
- {
- local a=`echo $1 | sed -e "s/vmlinu[zx]-//g"`
- local b=`echo $2 | sed -e "s/vmlinu[zx]-//g"`
-- local cmp=gt
-- if [ "x$b" = "x" ] ; then
-- return 0
-- fi
-- case $a:$b in
-- *.old:*.old) ;;
-- *.old:*) a=`echo -n $a | sed -e s/\.old$//g` ; cmp=gt ;;
-- *:*.old) b=`echo -n $b | sed -e s/\.old$//g` ; cmp=ge ;;
-- esac
-- test_numeric $a $cmp $b
-+ [ `CompareVersions "$a" "$b"` == 1 ]
- return $?
- }
-
diff -u grub2-1.96+20080724/debian/legacy/update-grub grub2-1.96+20080724/debian/legacy/update-grub
--- grub2-1.96+20080724/debian/legacy/update-grub
+++ grub2-1.96+20080724/debian/legacy/update-grub
@@ -384,56 +384,15 @@
# 2.4.14-pre1 > 2.4.13-ac99
CompareVersions()
{
- #Changes the line something-x.y.z into somthing-x.y.z.q
- #This is to ensure that kernels with a .q is treated as higher than the ones without
- #First a space is put after the version number
- v1=$(echo $1 | sed -e 's!^\(.*-\([0-9]\+\.\)\{2,3\}[0-9]\+\)\(.*\)!\1 \3!g')
- v2=$(echo $2 | sed -e 's!^\(.*-\([0-9]\+\.\)\{2,3\}[0-9]\+\)\(.*\)!\1 \3!g')
- #If the version number only has 3 digits then put in another .0
- v1=$(echo $v1 | sed -e 's!^\(.*-\([0-9]\+\.\)\{2\}[0-9]\+\)\( .*\|$\)!\1.0 \3!g')
- v2=$(echo $v2 | sed -e 's!^\(.*-\([0-9]\+\.\)\{2\}[0-9]\+\)\( .*\|$\)!\1.0 \3!g')
-
- # Then split the version number and remove any '.' 's or dashes
- v1=$(echo $v1 | sed -e 's![-\.]\+! !g' -e 's!\([0-9]\)\([[:alpha:]]\)!\1 \2!')
- v2=$(echo $v2 | sed -e 's![-\.]\+! !g' -e 's!\([0-9]\)\([[:alpha:]]\)!\1 \2!')
-
- # we weight different kernel suffixes here
- # ac = 50
- # pre = -50
- # rc = -40
- # test = -60
- # others are given 99
- v1=$(echo $v1 | sed -e 's! k7! 786 !g' -e 's! ac! 50 !g' -e 's! rc! -40 !g' -e 's! pre! -50 !g' -e 's! test! -60 !g' -e 's![^ ]*[^-0-9 ][^ ]*!99!g')
-
- v2=$(echo $v2 | sed -e 's! k7! 786 !g' -e 's! ac! 50 !g' -e 's! rc! -40 !g' -e 's! pre! -50 !g' -e 's! test! -60 !g' -e 's![^ ]*[^-0-9 ][^ ]*!99!g')
-
- result=0; v1finished=0; v2finished=0;
- while [ $result -eq 0 ] && [ $v1finished -eq 0 ] && [ $v2finished -eq 0 ];
- do
- if [ "$v1" = "" ]; then
- v1comp=0; v1finished=1
- else
- set -- $v1; v1comp=$1; shift; v1=$*
- fi
-
- if [ "$v2" = "" ]; then
- v2comp=0; v2finished=1
- else
- set -- $v2; v2comp=$1; shift; v2=$*
- fi
-
- set +e
- result=`expr $v1comp - $v2comp`
- result=`expr substr $result 1 2`
- set -e
-
- if [ $result -gt 0 ]; then result=1
- elif [ $result -lt 0 ]; then result=-1
- fi
- done
-
- # finally return the result
- echo $result
+ local a=`echo $1 | sed -e "s,.*/vmlinu[zx]-,,g;s/[._-]\(pre\|rc\|test\|git\)/~\1/g"`
+ local b=`echo $2 | sed -e "s,.*/vmlinu[zx]-,,g;s/[._-]\(pre\|rc\|test\|git\)/~\1/g"`
+ if [ "$a" = "$b" ] ; then
+ echo 0
+ elif dpkg --compare-versions "$a" gt "$b" ; then
+ echo 1
+ else
+ echo -1
+ fi
}
# looks in the directory specified for an initrd image with the version specified
only in patch2:
unchanged:
--- grub2-1.96+20080724.orig/debian/patches/901_dpkg_version_comparison.diff
+++ grub2-1.96+20080724/debian/patches/901_dpkg_version_comparison.diff
@@ -0,0 +1,25 @@
+diff -ur grub2/util/grub.d/10_linux.in grub2.new/util/grub.d/10_linux.in
+--- grub2/util/grub.d/10_linux.in 2008-06-26 09:03:26.000000000 +0200
++++ grub2.new/util/grub.d/10_linux.in 2008-08-10 20:01:49.000000000 +0200
+@@ -67,18 +67,12 @@
+
+ test_gt ()
+ {
+- local a=`echo $1 | sed -e "s/vmlinu[zx]-//g"`
+- local b=`echo $2 | sed -e "s/vmlinu[zx]-//g"`
+- local cmp=gt
++ local a=`echo $1 | sed -e "s,.*/vmlinu[zx]-,,g;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"`
++ local b=`echo $2 | sed -e "s,.*/vmlinu[zx]-,,g;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"`
+ if [ "x$b" = "x" ] ; then
+ return 0
+ fi
+- case $a:$b in
+- *.old:*.old) ;;
+- *.old:*) a=`echo -n $a | sed -e s/\.old$//g` ; cmp=gt ;;
+- *:*.old) b=`echo -n $b | sed -e s/\.old$//g` ; cmp=ge ;;
+- esac
+- test_numeric $a $cmp $b
++ dpkg --compare-versions "$a" gt "$b"
+ return $?
+ }
+
More information about the Pkg-grub-devel
mailing list