Bug#912846: grub2: stop depending on ttf-dejavu-core
Hi, In general I am OK with the patch. However, I want to ask you to respot it using "git send-email". Additionally, please add proper commit message and your SOB. Daniel On Sat, May 23, 2020 at 06:02:35PM +0200, Fabian Greffrath wrote: > Control: forwarded -1 grub-de...@gnu.org > Control: tags -1 upstream > > Hi grub devs, > > the attached patch adds /usr/share/fonts/truetype/dejavu to the DejaVu > font search path in configure.ac. This is the directory where the > fonts-dejavu-core package in Debian installs its fonts. > > Thanks! > > - Fabian > > From a696233f623e9c2b480aa3ad10aed537c2890af6 Mon Sep 17 00:00:00 2001 > From: Fabian Greffrath > Date: Tue, 19 May 2020 12:19:26 +0200 > Subject: [PATCH] add /u/s/fonts/truetype/dejavu to the DejaVu fonts search > paths > > --- > configure.ac | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > index b2576b0..41b8758 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1669,7 +1669,7 @@ fi > > if test x"$starfield_excuse" = x; then > for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do > - for dir in . /usr/src /usr/share/fonts/X11/misc > /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu > /usr/share/fonts/truetype; do > + for dir in . /usr/src /usr/share/fonts/X11/misc > /usr/share/fonts/truetype/dejavu /usr/share/fonts/truetype/ttf-dejavu > /usr/share/fonts/dejavu /usr/share/fonts/truetype; do > if test -f "$dir/DejaVuSans.$ext"; then >DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext" >break 2 > -- > 2.26.2
Bug#912846: grub2: stop depending on ttf-dejavu-core
Control: forwarded -1 https://lists.gnu.org/archive/html/grub-devel/2020-05/msg00167.html
Bug#912846: grub2: stop depending on ttf-dejavu-core
Control: forwarded -1 grub-de...@gnu.org Control: tags -1 upstream Hi grub devs, the attached patch adds /usr/share/fonts/truetype/dejavu to the DejaVu font search path in configure.ac. This is the directory where the fonts-dejavu-core package in Debian installs its fonts. Thanks! - Fabian From a696233f623e9c2b480aa3ad10aed537c2890af6 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Tue, 19 May 2020 12:19:26 +0200 Subject: [PATCH] add /u/s/fonts/truetype/dejavu to the DejaVu fonts search paths --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b2576b0..41b8758 100644 --- a/configure.ac +++ b/configure.ac @@ -1669,7 +1669,7 @@ fi if test x"$starfield_excuse" = x; then for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do - for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do + for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/dejavu /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do if test -f "$dir/DejaVuSans.$ext"; then DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext" break 2 -- 2.26.2 signature.asc Description: This is a digitally signed message part
Bug#912846: grub2: stop depending on ttf-dejavu-core
On Fri, May 22, 2020 at 03:59:55PM +0100, Colin Watson wrote: >On Fri, May 22, 2020 at 04:30:16PM +0200, Fabian Greffrath wrote: >> The ttf-dejavu-core package has been a transitional package for 7 years >> (!) now and its removal is going to happen with the next package >> upload, which will be anytime soon. Please adjust your package's build- >> dependencies to fonts-dejavu-core and add the corresponding search path >> to configure.ac. I have already prepared a patch for the latter. > >Hi - thanks for the patch. I expect I can apply this, but could you >please also send it upstream (grub-de...@gnu.org)? I don't see a reason >it couldn't be applied there, and it would make ongoing maintenance >easier. Ah, I've just taken the change and pushed to git... -- Steve McIntyre, Cambridge, UK.st...@einval.com Getting a SCSI chain working is perfectly simple if you remember that there must be exactly three terminations: one on one end of the cable, one on the far end, and the goat, terminated over the SCSI chain with a silver-handled knife whilst burning *black* candles. --- Anthony DeBoer
Bug#912846: grub2: stop depending on ttf-dejavu-core
On Fri, May 22, 2020 at 04:30:16PM +0200, Fabian Greffrath wrote: > The ttf-dejavu-core package has been a transitional package for 7 years > (!) now and its removal is going to happen with the next package > upload, which will be anytime soon. Please adjust your package's build- > dependencies to fonts-dejavu-core and add the corresponding search path > to configure.ac. I have already prepared a patch for the latter. Hi - thanks for the patch. I expect I can apply this, but could you please also send it upstream (grub-de...@gnu.org)? I don't see a reason it couldn't be applied there, and it would make ongoing maintenance easier. -- Colin Watson (he/him) [cjwat...@debian.org]
Bug#912846: grub2: stop depending on ttf-dejavu-core
Control: reassign -1 grub2 Control: found -1 2.04-7 Control: retitle -1 please migrate to fonts-dejavu-core Control: tags -1 =patch I am reassigning this bug back again to the grub2 package. The ttf-dejavu-core package has been a transitional package for 7 years (!) now and its removal is going to happen with the next package upload, which will be anytime soon. Please adjust your package's build- dependencies to fonts-dejavu-core and add the corresponding search path to configure.ac. I have already prepared a patch for the latter. Thanks, - Fabian From a696233f623e9c2b480aa3ad10aed537c2890af6 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Tue, 19 May 2020 12:19:26 +0200 Subject: [PATCH] add /u/s/fonts/truetype/dejavu to the DejaVu fonts search paths --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b2576b0..41b8758 100644 --- a/configure.ac +++ b/configure.ac @@ -1669,7 +1669,7 @@ fi if test x"$starfield_excuse" = x; then for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do - for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do + for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/dejavu /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do if test -f "$dir/DejaVuSans.$ext"; then DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext" break 2 -- 2.26.2 signature.asc Description: This is a digitally signed message part
Bug#912846: grub2: stop depending on ttf-dejavu-core
Control: reassign -1 ttf-dejavu-core
Control: found -1 ttf-dejavu-core/2.37-1
Control: retitle -1 ttf-dejavu-core has a misleading package description
Hi Colin,
On Mon, Nov 05, 2018 at 12:22:11AM +, Colin Watson wrote:
> On Sun, Nov 04, 2018 at 03:57:50PM +0100, Helmut Grohne wrote:
> > grub2 Build-Depends on transitional dummy package ttf-dejavu-core. That
> > package is eventually slated for removal. Please update your dependency
> > to fonts-dejavu-core. ttf-dejavu-core happens to be unsatisfiable during
> > cross compilation. Patch attached.
>
> > diff --minimal -Nru grub2-2.02+dfsg1/debian/control
> > grub2-2.02+dfsg1/debian/control
> > --- grub2-2.02+dfsg1/debian/control 2018-10-29 13:36:47.0 +0100
> > +++ grub2-2.02+dfsg1/debian/control 2018-11-04 15:55:39.0 +0100
> > @@ -26,7 +26,7 @@
> > cpio [i386 kopensolaris-i386 amd64 x32],
> > parted [!hurd-any],
> > libfuse-dev (>= 2.8.4-1.4) [linux-any kfreebsd-any],
> > - ttf-dejavu-core,
> > + fonts-dejavu-core,
> > liblzma-dev,
> > dosfstools [any-i386 any-amd64 any-arm64],
> > mtools [any-i386 any-amd64 any-arm64],
>
> I think this doesn't quite work because ttf-dejavu-core installs the
> relevant font file (DejaVuSans.ttf) to a different path, and it isn't
> one of those that configure.ac looks in; configure.ac will need to be
> patched to look in that path as well, and ideally that patch sent
> upstream first.
Thank you very much for catching my mistake. I was mislead by
ttf-dejavu-core's package description:
Description-en: transitional dummy package
This package is a dummy transitional package. It can be safely removed.
I consider that a lie. The attached patch fixes the lie. It also marks
the transitional packages Multi-Arch: foreign, because that helps grub2
with cross compilation.
Helmut
diff --minimal -Nru fonts-dejavu-2.37/debian/changelog
fonts-dejavu-2.37/debian/changelog
--- fonts-dejavu-2.37/debian/changelog 2016-08-16 20:18:06.0 +0200
+++ fonts-dejavu-2.37/debian/changelog 2018-11-05 05:30:21.0 +0100
@@ -1,3 +1,11 @@
+fonts-dejavu (2.37-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix descriptions of transitional packages. (Closes: #-1)
+ * Mark transitional packages Multi-Arch: foreign.
+
+ -- Helmut Grohne Mon, 05 Nov 2018 05:30:21 +0100
+
fonts-dejavu (2.37-1) unstable; urgency=medium
* Imported Upstream version 2.37.
diff --minimal -Nru fonts-dejavu-2.37/debian/control
fonts-dejavu-2.37/debian/control
--- fonts-dejavu-2.37/debian/control2016-08-16 20:15:26.0 +0200
+++ fonts-dejavu-2.37/debian/control2018-11-05 05:30:19.0 +0100
@@ -127,33 +127,39 @@
ttf-dejavu-extra,
${misc:Depends}
Architecture: all
+Multi-Arch: foreign
Section: oldlibs
Priority: extra
Pre-Depends:
${misc:Pre-Depends}
-Description: transitional dummy package
- This package is a dummy transitional package. It can be safely removed.
+Description: transitional package
+ This package is not a dummy transitional package. It contains symbolic links
+ providing the old locations of font files.
Package: ttf-dejavu-core
Depends:
fonts-dejavu-core,
${misc:Depends}
Architecture: all
+Multi-Arch: foreign
Section: oldlibs
Priority: extra
Pre-Depends:
${misc:Pre-Depends}
-Description: transitional dummy package
- This package is a dummy transitional package. It can be safely removed.
+Description: transitional package
+ This package is not a dummy transitional package. It contains symbolic links
+ providing the old locations of font files.
Package: ttf-dejavu-extra
Depends:
fonts-dejavu-extra,
${misc:Depends}
Architecture: all
+Multi-Arch: foreign
Section: oldlibs
Priority: extra
Pre-Depends:
${misc:Pre-Depends}
-Description: transitional dummy package
- This package is a dummy transitional package. It can be safely removed.
+Description: transitional package
+ This package is not a dummy transitional package. It contains symbolic links
+ providing the old locations of font files.
Bug#912846: grub2: stop depending on ttf-dejavu-core
On Sun, Nov 04, 2018 at 03:57:50PM +0100, Helmut Grohne wrote: > grub2 Build-Depends on transitional dummy package ttf-dejavu-core. That > package is eventually slated for removal. Please update your dependency > to fonts-dejavu-core. ttf-dejavu-core happens to be unsatisfiable during > cross compilation. Patch attached. > diff --minimal -Nru grub2-2.02+dfsg1/debian/control > grub2-2.02+dfsg1/debian/control > --- grub2-2.02+dfsg1/debian/control 2018-10-29 13:36:47.0 +0100 > +++ grub2-2.02+dfsg1/debian/control 2018-11-04 15:55:39.0 +0100 > @@ -26,7 +26,7 @@ > cpio [i386 kopensolaris-i386 amd64 x32], > parted [!hurd-any], > libfuse-dev (>= 2.8.4-1.4) [linux-any kfreebsd-any], > - ttf-dejavu-core, > + fonts-dejavu-core, > liblzma-dev, > dosfstools [any-i386 any-amd64 any-arm64], > mtools [any-i386 any-amd64 any-arm64], I think this doesn't quite work because ttf-dejavu-core installs the relevant font file (DejaVuSans.ttf) to a different path, and it isn't one of those that configure.ac looks in; configure.ac will need to be patched to look in that path as well, and ideally that patch sent upstream first. -- Colin Watson [cjwat...@debian.org]
Bug#912846: grub2: stop depending on ttf-dejavu-core
Source: grub2 Version: 2.02+dfsg1-8 Tags: patch User: helm...@debian.org Usertags: rebootstrap grub2 Build-Depends on transitional dummy package ttf-dejavu-core. That package is eventually slated for removal. Please update your dependency to fonts-dejavu-core. ttf-dejavu-core happens to be unsatisfiable during cross compilation. Patch attached. Helmut diff --minimal -Nru grub2-2.02+dfsg1/debian/changelog grub2-2.02+dfsg1/debian/changelog --- grub2-2.02+dfsg1/debian/changelog 2018-10-29 14:02:08.0 +0100 +++ grub2-2.02+dfsg1/debian/changelog 2018-11-04 15:55:41.0 +0100 @@ -1,3 +1,10 @@ +grub2 (2.02+dfsg1-8.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Transition ttf-dejavu-core dependency to fonts-dejavu-core. (Closes: #-1) + + -- Helmut Grohne Sun, 04 Nov 2018 15:55:41 +0100 + grub2 (2.02+dfsg1-8) unstable; urgency=medium * Revise grub--bin and grub- package descriptions to diff --minimal -Nru grub2-2.02+dfsg1/debian/control grub2-2.02+dfsg1/debian/control --- grub2-2.02+dfsg1/debian/control 2018-10-29 13:36:47.0 +0100 +++ grub2-2.02+dfsg1/debian/control 2018-11-04 15:55:39.0 +0100 @@ -26,7 +26,7 @@ cpio [i386 kopensolaris-i386 amd64 x32], parted [!hurd-any], libfuse-dev (>= 2.8.4-1.4) [linux-any kfreebsd-any], - ttf-dejavu-core, + fonts-dejavu-core, liblzma-dev, dosfstools [any-i386 any-amd64 any-arm64], mtools [any-i386 any-amd64 any-arm64],
