Author: dnusinow
Date: 2006-02-20 20:19:55 -0500 (Mon, 20 Feb 2006)
New Revision: 1254
Removed:
branches/modular/font/xfonts-base/font-misc-ethiopic-X11R7.0-1.0.0/
Modified:
branches/modular/font/xfonts-base/debian/control
branches/modular/font/xfonts-base/debian/rules
branches/modular/font/xfonts-base/debian/xfonts-base.install
Log:
Apply Eugene Konev's fixes and also remove the ethiopic fonts from this package
for later inclusion elsewhere
Modified: branches/modular/font/xfonts-base/debian/control
===================================================================
--- branches/modular/font/xfonts-base/debian/control 2006-02-21 01:16:58 UTC
(rev 1253)
+++ branches/modular/font/xfonts-base/debian/control 2006-02-21 01:19:55 UTC
(rev 1254)
@@ -9,6 +9,7 @@
Package: xfonts-base
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-utils
+Suggests: xfs | xserver
Description: standard fonts for X
xfonts-base provides a standard set of low-resolution bitmapped fonts. In
most cases it is desirable to have the X font server (xfs) and/or an X server
Modified: branches/modular/font/xfonts-base/debian/rules
===================================================================
--- branches/modular/font/xfonts-base/debian/rules 2006-02-21 01:16:58 UTC
(rev 1253)
+++ branches/modular/font/xfonts-base/debian/rules 2006-02-21 01:19:55 UTC
(rev 1254)
@@ -14,7 +14,7 @@
# This package contains multiple modules as shipped by upstream. Each module
is # contained in a subdirectory in the root dir of the package. You must list
each
# subdirectory explicitly so that the build system knows what to build
-SUBDIRS="font-arabic-misc-X11R7.0-1.0.0 font-cursor-misc-X11R7.0-1.0.0
font-daewoo-misc-X11R7.0-1.0.0 font-dec-misc-X11R7.0-1.0.0
font-isas-misc-X11R7.0-1.0.0 font-jis-misc-X11R7.0-1.0.0
font-micro-misc-X11R7.0-1.0.0 font-misc-ethiopic-X11R7.0-1.0.0
font-misc-misc-X11R7.0-1.0.0 font-mutt-misc-X11R7.0-1.0.0
font-schumacher-misc-X11R7.0-1.0.0 font-sony-misc-X11R7.0-1.0.0
font-sun-misc-X11R7.0-1.0.0"
+SUBDIRS="font-arabic-misc-X11R7.0-1.0.0 font-cursor-misc-X11R7.0-1.0.0
font-daewoo-misc-X11R7.0-1.0.0 font-dec-misc-X11R7.0-1.0.0
font-isas-misc-X11R7.0-1.0.0 font-jis-misc-X11R7.0-1.0.0
font-micro-misc-X11R7.0-1.0.0 font-misc-misc-X11R7.0-1.0.0
font-mutt-misc-X11R7.0-1.0.0 font-schumacher-misc-X11R7.0-1.0.0
font-sony-misc-X11R7.0-1.0.0 font-sun-misc-X11R7.0-1.0.0"
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -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/misc/xfonts-base.alias
+ install -D debian/fonts.alias \
+ debian/tmp/etc/X11/fonts/X11R7/misc/xfonts-base.alias
# Build architecture-dependent files here.
binary-arch: build install
@@ -83,8 +84,7 @@
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --fail-missing --exclude fonts.dir \
- --exclude fonts.scale --exclude fonts.cache-1
+ dh_install --sourcedir=debian/tmp --fail-missing --exclude fonts.dir
dh_installchangelogs
dh_link
dh_strip --dbg-package=$(PACKAGE)
Modified: branches/modular/font/xfonts-base/debian/xfonts-base.install
===================================================================
--- branches/modular/font/xfonts-base/debian/xfonts-base.install
2006-02-21 01:16:58 UTC (rev 1253)
+++ branches/modular/font/xfonts-base/debian/xfonts-base.install
2006-02-21 01:19:55 UTC (rev 1254)
@@ -1,4 +1,4 @@
-etc/X11/fonts/misc/xfonts-base.alias
+etc/X11/fonts/X11R7/misc/xfonts-base.alias
usr/share/fonts/X11/misc/arabic24.pcf.gz
usr/share/fonts/X11/misc/cursor.pcf.gz
usr/share/fonts/X11/misc/hanglg16.pcf.gz
@@ -408,5 +408,3 @@
usr/share/fonts/X11/misc/olgl12.pcf.gz
usr/share/fonts/X11/misc/olgl14.pcf.gz
usr/share/fonts/X11/misc/olgl19.pcf.gz
-usr/lib/X11/fonts/OTF/GohaTibebZemen.otf
-usr/lib/X11/fonts/TTF/GohaTibebZemen.ttf
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
