X Strike Force X.Org X11 SVN commit: r1253 - in branches/modular/font: xfonts-100dpi/debian xfonts-75dpi/debian xfonts-cyrillic/debian
Author: dnusinow
Date: 2006-02-20 20:16:58 -0500 (Mon, 20 Feb 2006)
New Revision: 1253
Modified:
branches/modular/font/xfonts-100dpi/debian/control
branches/modular/font/xfonts-100dpi/debian/rules
branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.install
branches/modular/font/xfonts-75dpi/debian/control
branches/modular/font/xfonts-75dpi/debian/rules
branches/modular/font/xfonts-75dpi/debian/xfonts-75dpi.install
branches/modular/font/xfonts-cyrillic/debian/control
branches/modular/font/xfonts-cyrillic/debian/rules
branches/modular/font/xfonts-cyrillic/debian/xfonts-cyrillic.install
Log:
Various fixes from Eugene Konev
Modified: branches/modular/font/xfonts-100dpi/debian/control
===================================================================
--- branches/modular/font/xfonts-100dpi/debian/control 2006-02-21 01:09:51 UTC (rev 1252)
+++ branches/modular/font/xfonts-100dpi/debian/control 2006-02-21 01:16:58 UTC (rev 1253)
@@ -9,6 +9,7 @@
Package: xfonts-100dpi
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-utils
+Suggests: xfs | xserver
Description: 100 dpi fonts for X
xfonts-100dpi provides a set of bitmapped fonts at 100 dots per inch. In
most cases it is desirable to have the X font server (xfs) and/or an X server
@@ -29,6 +30,7 @@
Package: xfonts-100dpi-transcoded
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-utils
+Suggests: xfs | xserver
Description: 100 dpi fonts for X (transcoded from ISO 10646-1)
xfonts-100dpi-transcoded provides a set of bitmapped fonts at 100 dots per
inch. In most cases it is desirable to have the X font server (xfs)
Modified: branches/modular/font/xfonts-100dpi/debian/rules
===================================================================
--- branches/modular/font/xfonts-100dpi/debian/rules 2006-02-21 01:09:51 UTC (rev 1252)
+++ branches/modular/font/xfonts-100dpi/debian/rules 2006-02-21 01:16:58 UTC (rev 1253)
@@ -75,7 +75,8 @@
cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
- install -D debian/fonts.alias debian/tmp/etc/X11/fonts/100dpi/xfonts-100dpi.alias
+ install -D debian/fonts.alias \
+ debian/tmp/etc/X11/fonts/X11R7/100dpi/xfonts-100dpi.alias
# Build architecture-dependent files here.
binary-arch: build install
Modified: branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.install
===================================================================
--- branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.install 2006-02-21 01:09:51 UTC (rev 1252)
+++ branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.install 2006-02-21 01:16:58 UTC (rev 1253)
@@ -1,4 +1,4 @@
-etc/X11/fonts/100dpi/xfonts-100dpi.alias
+etc/X11/fonts/X11R7/100dpi/xfonts-100dpi.alias
usr/share/fonts/X11/100dpi/courB08.pcf.gz
usr/share/fonts/X11/100dpi/courB10.pcf.gz
usr/share/fonts/X11/100dpi/courB12.pcf.gz
Modified: branches/modular/font/xfonts-75dpi/debian/control
===================================================================
--- branches/modular/font/xfonts-75dpi/debian/control 2006-02-21 01:09:51 UTC (rev 1252)
+++ branches/modular/font/xfonts-75dpi/debian/control 2006-02-21 01:16:58 UTC (rev 1253)
@@ -9,6 +9,7 @@
Package: xfonts-75dpi
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-utils
+Suggests: xfs | xserver
Description: 100 dpi fonts for X
xfonts-75dpi provides a set of bitmapped fonts at 75 dots per inch. In
most cases it is desirable to have the X font server (xfs) and/or an X server
@@ -29,6 +30,7 @@
Package: xfonts-75dpi-transcoded
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-utils
+Suggests: xfs | xserver
Description: 75 dpi fonts for X (transcoded from ISO 10646-1)
xfonts-75dpi-transcoded provides a set of bitmapped fonts at 75 dots per
inch. In most cases it is desirable to have the X font server (xfs)
Modified: branches/modular/font/xfonts-75dpi/debian/rules
===================================================================
--- branches/modular/font/xfonts-75dpi/debian/rules 2006-02-21 01:09:51 UTC (rev 1252)
+++ branches/modular/font/xfonts-75dpi/debian/rules 2006-02-21 01:16:58 UTC (rev 1253)
@@ -36,7 +36,7 @@
endif
-build: build-stamp
+build: genscripts build-stamp
build-stamp:
dh_testdir
for FILE in "$(SUBDIRS)"; do \
@@ -52,7 +52,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
@@ -75,7 +75,8 @@
cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
- install -D debian/fonts.alias debian/tmp/etc/X11/fonts/75dpi/xfonts-75dpi.alias
+ install -D debian/fonts.alias \
+ debian/tmp/etc/X11/fonts/X11R7/75dpi/xfonts-75dpi.alias
# Build architecture-dependent files here.
binary-arch: build install
Modified: branches/modular/font/xfonts-75dpi/debian/xfonts-75dpi.install
===================================================================
--- branches/modular/font/xfonts-75dpi/debian/xfonts-75dpi.install 2006-02-21 01:09:51 UTC (rev 1252)
+++ branches/modular/font/xfonts-75dpi/debian/xfonts-75dpi.install 2006-02-21 01:16:58 UTC (rev 1253)
@@ -1,4 +1,4 @@
-etc/X11/fonts/75dpi/xfonts-75dpi.alias
+etc/X11/fonts/X11R7/75dpi/xfonts-75dpi.alias
usr/share/fonts/X11/75dpi/courB08.pcf.gz
usr/share/fonts/X11/75dpi/courB10.pcf.gz
usr/share/fonts/X11/75dpi/courB12.pcf.gz
Modified: branches/modular/font/xfonts-cyrillic/debian/control
===================================================================
--- branches/modular/font/xfonts-cyrillic/debian/control 2006-02-21 01:09:51 UTC (rev 1252)
+++ branches/modular/font/xfonts-cyrillic/debian/control 2006-02-21 01:16:58 UTC (rev 1253)
@@ -9,6 +9,7 @@
Package: xfonts-cyrillic
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xutils, xfonts-utils
+Suggests: xfs | xserver
Description: Cyrillic fonts for X
xfonts-cyrillic provides a set of fonts using the Cyrillic alphabet for X
servers. In most cases it is desirable to have the X font server (xfs)
Modified: branches/modular/font/xfonts-cyrillic/debian/rules
===================================================================
--- branches/modular/font/xfonts-cyrillic/debian/rules 2006-02-21 01:09:51 UTC (rev 1252)
+++ branches/modular/font/xfonts-cyrillic/debian/rules 2006-02-21 01:16:58 UTC (rev 1253)
@@ -75,7 +75,8 @@
cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
- install -D debian/fonts.alias debian/tmp/etc/X11/fonts/cyrillic/xfonts-cyrillic.alias
+ install -D debian/fonts.alias \
+ debian/tmp/etc/X11/fonts/X11R7/cyrillic/xfonts-cyrillic.alias
# Build architecture-dependent files here.
binary-arch: build install
Modified: branches/modular/font/xfonts-cyrillic/debian/xfonts-cyrillic.install
===================================================================
--- branches/modular/font/xfonts-cyrillic/debian/xfonts-cyrillic.install 2006-02-21 01:09:51 UTC (rev 1252)
+++ branches/modular/font/xfonts-cyrillic/debian/xfonts-cyrillic.install 2006-02-21 01:16:58 UTC (rev 1253)
@@ -1,4 +1,4 @@
-etc/X11/fonts/cyrillic/xfonts-cyrillic.alias
+etc/X11/fonts/X11R7/cyrillic/xfonts-cyrillic.alias
usr/share/fonts/X11/cyrillic/crox1cb.pcf.gz
usr/share/fonts/X11/cyrillic/crox1c.pcf.gz
usr/share/fonts/X11/cyrillic/crox1cbo.pcf.gz
Reply to: