X Strike Force X.Org X11 SVN commit: r1396 - in branches/modular/font/xfonts-cyrillic/debian: . patches
Author: dnusinow
Date: 2006-03-05 21:16:48 -0500 (Sun, 05 Mar 2006)
New Revision: 1396
Added:
branches/modular/font/xfonts-cyrillic/debian/patches/
branches/modular/font/xfonts-cyrillic/debian/patches/01_cyrillic_fonts_aliases.diff
branches/modular/font/xfonts-cyrillic/debian/patches/series
Modified:
branches/modular/font/xfonts-cyrillic/debian/changelog
branches/modular/font/xfonts-cyrillic/debian/rules
Log:
* Port patches from trunk
+ general/046_fix_cyrillic_font_aliases.diff
Modified: branches/modular/font/xfonts-cyrillic/debian/changelog
===================================================================
--- branches/modular/font/xfonts-cyrillic/debian/changelog 2006-03-06 02:11:46 UTC (rev 1395)
+++ branches/modular/font/xfonts-cyrillic/debian/changelog 2006-03-06 02:16:48 UTC (rev 1396)
@@ -1,3 +1,10 @@
+xfonts-cyrillic (1:1.0.0-2) experimental; urgency=low
+
+ * Port patches from trunk
+ + general/046_fix_cyrillic_font_aliases.diff
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 5 Mar 2006 21:15:34 -0500
+
xfonts-cyrillic (1:1.0.0-1) experimental; urgency=low
[ Eugene Konev ]
Added: branches/modular/font/xfonts-cyrillic/debian/patches/01_cyrillic_fonts_aliases.diff
===================================================================
--- branches/modular/font/xfonts-cyrillic/debian/patches/01_cyrillic_fonts_aliases.diff 2006-03-06 02:11:46 UTC (rev 1395)
+++ branches/modular/font/xfonts-cyrillic/debian/patches/01_cyrillic_fonts_aliases.diff 2006-03-06 02:16:48 UTC (rev 1396)
@@ -0,0 +1,81 @@
+$Id: 046_fix_cyrillic_font_aliases.diff 486 2005-08-03 04:51:11Z dnusinow $
+
+Prevent font alias collisions between KOI8-R encodings and the stock ones.
+
+This patch by Branden Robinson.
+
+Not submitted upstream. Not sure they'd like it.
+
+Yes, I know this is crack, patching something in the debian directory, but
+since I just ripped the original fonts.alias from an upstream tarball
+anyway, we may as well treat it like it's outside of the debian dir.
+Ideally upstream will just accept this and we won't have to do this crap
+ - David
+
+Index: debian/fonts.alias
+===================================================================
+--- debian/fonts.alias.orig 2005-08-02 22:00:38.000000000 -0400
++++ debian/fonts.alias 2005-08-02 23:45:30.000000000 -0400
+@@ -9,31 +9,31 @@
+ !
+ ! $XFree86$
+ !
+-fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
+-variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r
+-5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r
+-6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r
+-6x10 -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r
+-6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
+-6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r
+-7x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r
+-7x14b -misc-fixed-bold-r-normal--14-130-75-75-c-70-koi8-r
+-8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r
+-8x16 -misc-fixed-medium-r-normal--16-160-75-75-c-80-koi8-r
+-8x16bold -misc-fixed-bold-r-normal--16-160-75-75-c-80-koi8-r
+-9x15 -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r
+-9x15bold -misc-fixed-bold-r-normal--15-140-75-75-c-90-koi8-r
+-9x18 -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r
+-9x18bold -misc-fixed-bold-r-normal--18-120-100-100-c-90-koi8-r
+-10x16bold -cronyx-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r
+-10x20 -cronyx-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r
+-12x24 -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r
+-12x24bold -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r
+-nil2 -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r
++fixed-cyrillic -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
++variable-cyrillic -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r
++5x8-cyrillic -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r
++6x9-cyrillic -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r
++6x10-cyrillic -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r
++6x13-cyrillic -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
++6x13bold-cyrillic -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r
++7x14-cyrillic -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r
++7x14b-cyrillic -misc-fixed-bold-r-normal--14-130-75-75-c-70-koi8-r
++8x13-cyrillic -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r
++8x16-cyrillic -misc-fixed-medium-r-normal--16-160-75-75-c-80-koi8-r
++8x16bold-cyrillic -misc-fixed-bold-r-normal--16-160-75-75-c-80-koi8-r
++9x15-cyrillic -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r
++9x15bold-cyrillic -misc-fixed-bold-r-normal--15-140-75-75-c-90-koi8-r
++9x18-cyrillic -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r
++9x18bold-cyrillic -misc-fixed-bold-r-normal--18-120-100-100-c-90-koi8-r
++10x16bold-cyrillic -cronyx-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r
++10x20-cyrillic -cronyx-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r
++12x24-cyrillic -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r
++12x24bold-cyrillic -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r
++nil2-cyrillic -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r
+ koi-fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
+ koi-variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r
+-koi5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r
+-koi6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r
++koi5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r
++koi6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r
+ koi6x10 -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r
+ koi6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
+ koi6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r
+@@ -51,5 +51,5 @@
+ koi12x24 -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r
+ koi12x24bold -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r
+ koinil2 -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r
+-screen8x16 -screen-fixed-medium-r-normal--16-120-100-100-c-80-koi8-r
+-screen8x16b -screen-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r
++screen8x16-cyrillic -screen-fixed-medium-r-normal--16-120-100-100-c-80-koi8-r
++screen8x16b-cyrillic -screen-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r
Added: branches/modular/font/xfonts-cyrillic/debian/patches/series
===================================================================
--- branches/modular/font/xfonts-cyrillic/debian/patches/series 2006-03-06 02:11:46 UTC (rev 1395)
+++ branches/modular/font/xfonts-cyrillic/debian/patches/series 2006-03-06 02:16:48 UTC (rev 1396)
@@ -0,0 +1 @@
+01_cyrillic_fonts_aliases.diff -p0
Modified: branches/modular/font/xfonts-cyrillic/debian/rules
===================================================================
--- branches/modular/font/xfonts-cyrillic/debian/rules 2006-03-06 02:11:46 UTC (rev 1395)
+++ branches/modular/font/xfonts-cyrillic/debian/rules 2006-03-06 02:16:48 UTC (rev 1396)
@@ -36,7 +36,7 @@
endif
-build: genscripts build-stamp
+build: genscripts patch build-stamp
build-stamp:
dh_testdir
for FILE in $(SUBDIRS); do \
Reply to: