Bug#369510: NMU diff for xfonts-encodings 1:1.0.0-5.1
tag 369510 + patch
thanks
Hi,
Attached is the diff for my xfonts-encodings 1:1.0.0-5.1 NMU.
--
Adeodato Simó dato at net.com.org.es
Debian Developer adeodato at debian.org
If you want the holes in your knowledge showing up try teaching someone.
-- Alan Cox
diff -u xfonts-encodings-1.0.0/debian/changelog xfonts-encodings-1.0.0/debian/changelog
--- xfonts-encodings-1.0.0/debian/changelog
+++ xfonts-encodings-1.0.0/debian/changelog
@@ -1,3 +1,15 @@
+xfonts-encodings (1:1.0.0-5.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload since it blocks RC bugfixes in x-ttcidfont-conf_23
+ from reaching testing.
+ * Complete the fix for #365403 in 1.0.0-3 by shipping a compatibility link
+ for the large/ subdir as well (/usr/X11R6/lib/X11/fonts/encodings/large).
+ Update 01_encodings_dir_absolute_paths.diff to include large/Makefile.am.
+ (Closes: #369510)
+
+ -- Adeodato Simó <dato@net.com.org.es> Thu, 8 Jun 2006 18:07:01 +0200
+
xfonts-encodings (1:1.0.0-5) unstable; urgency=low
* Replace old xfonts-base rather than conflict with them. Thanks Steve
diff -u xfonts-encodings-1.0.0/debian/patches/01_encodings_dir_absolute_paths.diff xfonts-encodings-1.0.0/debian/patches/01_encodings_dir_absolute_paths.diff
--- xfonts-encodings-1.0.0/debian/patches/01_encodings_dir_absolute_paths.diff
+++ xfonts-encodings-1.0.0/debian/patches/01_encodings_dir_absolute_paths.diff
@@ -1,7 +1,7 @@
Index: xfonts-encodings/Makefile.am
===================================================================
---- xfonts-encodings.orig/Makefile.am 2006-05-09 23:34:03.000000000 -0400
-+++ xfonts-encodings/Makefile.am 2006-05-09 23:34:09.000000000 -0400
+--- xfonts-encodings.orig/Makefile.am
++++ xfonts-encodings/Makefile.am
@@ -48,7 +48,7 @@
@GZIP@ -c < $< > $@
@@ -13,0 +14,19 @@
+Index: xfonts-encodings/large/Makefile.am
+===================================================================
+--- xfonts-encodings.orig/large/Makefile.am
++++ xfonts-encodings/large/Makefile.am
+@@ -1,4 +1,4 @@
+-encodingsdir = @ENCODINGSDIR@/large
++encodingsdir = @ENCODINGSDIR@/large/
+
+ ENCODING_FILES = \
+ big5.eten-0.enc \
+@@ -28,7 +28,7 @@
+ @GZIP@ -c < $< > $@
+
+ encodings.dir:
+- @MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . .
++ @MKFONTSCALE@ -b -s -l -n -p $(encodingsdir) -e . .
+
+ encodings_DATA = $(COMPRESSED) encodings.dir
+ CLEANFILES = $(COMPRESSED) encodings.dir
diff -u xfonts-encodings-1.0.0/debian/xfonts-encodings.links xfonts-encodings-1.0.0/debian/xfonts-encodings.links
--- xfonts-encodings-1.0.0/debian/xfonts-encodings.links
+++ xfonts-encodings-1.0.0/debian/xfonts-encodings.links
@@ -1,0 +2 @@
+usr/share/fonts/X11/encodings/large/encodings.dir usr/X11R6/lib/X11/fonts/encodings/large/encodings.dir
only in patch2:
unchanged:
--- xfonts-encodings-1.0.0.orig/large/Makefile.in
+++ xfonts-encodings-1.0.0/large/Makefile.in
@@ -89,7 +89,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-encodingsdir = @ENCODINGSDIR@/large
+encodingsdir = @ENCODINGSDIR@/large/
ENCODING_FILES = \
big5.eten-0.enc \
@@ -281,7 +281,7 @@
@GZIP@ -c < $< > $@
encodings.dir:
- @MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . .
+ @MKFONTSCALE@ -b -s -l -n -p $(encodingsdir) -e . .
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Reply to: