Author: dnusinow
Date: 2006-08-26 16:53:35 -0400 (Sat, 26 Aug 2006)
New Revision: 3032
Modified:
branches/7.1/font/xfonts-encodings/debian/changelog
branches/7.1/font/xfonts-encodings/debian/control
branches/7.1/font/xfonts-encodings/debian/patches/01_encodings_dir_absolute_paths.diff
branches/7.1/font/xfonts-encodings/debian/xfonts-encodings.links
branches/7.1/font/xfonts-encodings/large/Makefile.in
Log:
Merge dato's NMU to the 7.1 branch so it's not lost
Modified: branches/7.1/font/xfonts-encodings/debian/changelog
===================================================================
--- branches/7.1/font/xfonts-encodings/debian/changelog 2006-08-26 20:49:55 UTC
(rev 3031)
+++ branches/7.1/font/xfonts-encodings/debian/changelog 2006-08-26 20:53:35 UTC
(rev 3032)
@@ -5,6 +5,18 @@
-- Andres Salomon <[EMAIL PROTECTED]> Mon, 17 Jul 2006 00:29:26 -0400
+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ó <[EMAIL PROTECTED]> 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
Modified: branches/7.1/font/xfonts-encodings/debian/control
===================================================================
--- branches/7.1/font/xfonts-encodings/debian/control 2006-08-26 20:49:55 UTC
(rev 3031)
+++ branches/7.1/font/xfonts-encodings/debian/control 2006-08-26 20:53:35 UTC
(rev 3032)
@@ -5,7 +5,7 @@
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5.0.0), quilt
Build-Depends-Indep: pkg-config, xfonts-utils
-Standards-Version: 3.7.2
+Standards-Version: 3.7.2.0
Package: xfonts-encodings
Architecture: all
Modified:
branches/7.1/font/xfonts-encodings/debian/patches/01_encodings_dir_absolute_paths.diff
===================================================================
---
branches/7.1/font/xfonts-encodings/debian/patches/01_encodings_dir_absolute_paths.diff
2006-08-26 20:49:55 UTC (rev 3031)
+++
branches/7.1/font/xfonts-encodings/debian/patches/01_encodings_dir_absolute_paths.diff
2006-08-26 20:53:35 UTC (rev 3032)
@@ -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 < $< > $@
@@ -11,3 +11,22 @@
encodings_DATA = $(COMPRESSED) encodings.dir
CLEANFILES = $(COMPRESSED) encodings.dir
+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
Modified: branches/7.1/font/xfonts-encodings/debian/xfonts-encodings.links
===================================================================
--- branches/7.1/font/xfonts-encodings/debian/xfonts-encodings.links
2006-08-26 20:49:55 UTC (rev 3031)
+++ branches/7.1/font/xfonts-encodings/debian/xfonts-encodings.links
2006-08-26 20:53:35 UTC (rev 3032)
@@ -1 +1,2 @@
usr/share/fonts/X11/encodings/encodings.dir
usr/X11R6/lib/X11/fonts/encodings/encodings.dir
+usr/share/fonts/X11/encodings/large/encodings.dir
usr/X11R6/lib/X11/fonts/encodings/large/encodings.dir
Modified: branches/7.1/font/xfonts-encodings/large/Makefile.in
===================================================================
--- branches/7.1/font/xfonts-encodings/large/Makefile.in 2006-08-26
20:49:55 UTC (rev 3031)
+++ branches/7.1/font/xfonts-encodings/large/Makefile.in 2006-08-26
20:53:35 UTC (rev 3032)
@@ -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:
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
