Author: dnusinow Date: 2006-02-19 10:53:44 -0500 (Sun, 19 Feb 2006) New Revision: 1234
Added: branches/modular/font/font-util-X11R7.0-1.0.0/debian/patches/ branches/modular/font/font-util-X11R7.0-1.0.0/debian/patches/001_mkfontdir_location_fix.diff branches/modular/font/font-util-X11R7.0-1.0.0/debian/patches/series Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/changelog branches/modular/font/font-util-X11R7.0-1.0.0/debian/control branches/modular/font/font-util-X11R7.0-1.0.0/debian/copyright branches/modular/font/font-util-X11R7.0-1.0.0/debian/rules branches/modular/font/font-util-X11R7.0-1.0.0/debian/xfonts-utils.install Log: Add various fixes from Eugene Konev to xfonts-utils Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/changelog =================================================================== --- branches/modular/font/font-util-X11R7.0-1.0.0/debian/changelog 2006-02-19 15:45:30 UTC (rev 1233) +++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/changelog 2006-02-19 15:53:44 UTC (rev 1234) @@ -1,5 +1,13 @@ xfonts-utils (1:1.0.0-1) experimental; urgency=low - * First upload to Debian + [ David Nusinow ] + * First modular upload to Debian - -- David Nusinow <[EMAIL PROTECTED]> Wed, 15 Feb 2006 20:39:04 -0500 + [ Eugene Konev ] + * Add patch to allow mkfontdir to build properly + * Move mkfontdir, mkfontscale, bdf2pcf from xutils to xfonts-utils. + * Start moving fonts to /usr/share/fonts. + * Fix update-fonts-* + * Fix update-fonts-dir to reference proper encodings dir. + + -- David Nusinow <[EMAIL PROTECTED]> Tue, 31 Jan 2006 21:37:49 -0500 Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/control =================================================================== --- branches/modular/font/font-util-X11R7.0-1.0.0/debian/control 2006-02-19 15:45:30 UTC (rev 1233) +++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/control 2006-02-19 15:53:44 UTC (rev 1234) @@ -3,12 +3,20 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.0.0), pkg-config +Build-Depends: debhelper (>= 4.0.0), pkg-config, quilt, libxfont-dev Standards-Version: 3.6.1.0 Package: xfonts-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common -Description: utilities to set up fonts for the X11 - This package contains various items for running any font in X11. As such, - it is pre-depended on by many xfont packages. +Replaces: xutils (<< 1:1.0.1-2) +Description: X Window System font utility programs + xfonts-utils provides a set of utility programs shipped with the X Window + System that are needed for font management. + . + The programs in this package include: + - bdftopcf, which converts BDF fonts to PCF fonts; + - bdftruncate and ucs2any, tools to generate fonts with various encodings + from ISO 10646-encoded fonts + - mkfontdir, a program to generate fonts.dir files; + - mkfontscale, a program to generate fonts.scale files; Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/copyright =================================================================== --- branches/modular/font/font-util-X11R7.0-1.0.0/debian/copyright 2006-02-19 15:45:30 UTC (rev 1233) +++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/copyright 2006-02-19 15:53:44 UTC (rev 1234) @@ -1,3 +1,33 @@ +Copyright 1987, 1990, 1991, 1993, 1998 The Open Group +Copyright (c) 2001-2003 by Juliusz Chroboczek +Copyright (c) 2002 by Tomohiro KUBOTA +Copyright (c) 1993 Quarterdeck Office Systems +Copyright 2002-2004 by Roland Mainz <[EMAIL PROTECTED]> +Copyright 1990 Network Computing Devices; +Copyright 1987 by Digital Equipment Corporation + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from The Open Group. + Copyright 2002-2004 Red Hat Inc., Durham, North Carolina. All Rights Reserved. Added: branches/modular/font/font-util-X11R7.0-1.0.0/debian/patches/001_mkfontdir_location_fix.diff =================================================================== --- branches/modular/font/font-util-X11R7.0-1.0.0/debian/patches/001_mkfontdir_location_fix.diff 2006-02-19 15:45:30 UTC (rev 1233) +++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/patches/001_mkfontdir_location_fix.diff 2006-02-19 15:53:44 UTC (rev 1234) @@ -0,0 +1,26 @@ +Index: xutils/mkfontdir-X11R7.0-1.0.1/Makefile.am +=================================================================== +--- xutils.orig/mkfontdir-X11R7.0-1.0.1/Makefile.am 2006-01-31 21:24:39.000000000 -0500 ++++ xutils/mkfontdir-X11R7.0-1.0.1/Makefile.am 2006-01-31 21:35:39.000000000 -0500 +@@ -24,7 +24,7 @@ + appman_PRE = mkfontdir.man + + mkfontdir: mkfontdir.cpp +- $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@ ++ $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < ${srcdir}/mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@ + + EXTRA_DIST = mkfontdir.cpp + CLEANFILES = $(bin_SCRIPTS) +Index: xutils/mkfontdir-X11R7.0-1.0.1/Makefile.in +=================================================================== +--- xutils.orig/mkfontdir-X11R7.0-1.0.1/Makefile.in 2006-01-31 21:24:39.000000000 -0500 ++++ xutils/mkfontdir-X11R7.0-1.0.1/Makefile.in 2006-01-31 21:35:53.000000000 -0500 +@@ -451,7 +451,7 @@ + + + mkfontdir: mkfontdir.cpp +- $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@ ++ $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < ${srcdir}/mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@ + + .man.$(APP_MAN_SUFFIX): + sed $(MAN_SUBSTS) < $< > $@ Added: branches/modular/font/font-util-X11R7.0-1.0.0/debian/patches/series =================================================================== --- branches/modular/font/font-util-X11R7.0-1.0.0/debian/patches/series 2006-02-19 15:45:30 UTC (rev 1233) +++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/patches/series 2006-02-19 15:53:44 UTC (rev 1234) @@ -0,0 +1 @@ +001_mkfontdir_location_fix.diff Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/rules =================================================================== --- branches/modular/font/font-util-X11R7.0-1.0.0/debian/rules 2006-02-19 15:45:30 UTC (rev 1233) +++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/rules 2006-02-19 15:53:44 UTC (rev 1234) @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# debian/rules for the Debian libdmx package. +# debian/rules for the Debian xfonts-utils package. # Copyright © 2004 Scott James Remnant <[EMAIL PROTECTED]> # Copyright © 2005 Daniel Stone <[EMAIL PROTECTED]> # Copyright © 2005 David Nusinow <[EMAIL PROTECTED]> @@ -8,10 +8,14 @@ #export DH_VERBOSE=1 # set this to the name of the main shlib's binary package -PACKAGE = fontutil +PACKAGE = xfonts-utils include debian/xsfbs/xsfbs.mk +# 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="bdftopcf-X11R7.0-1.0.0 mkfontdir-X11R7.0-1.0.1 mkfontscale-X11R7.0-1.0.1 font-util-X11R7.0-1.0.0" + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -32,20 +36,22 @@ endif -build: build-stamp +build: genscripts patch build-stamp build-stamp: dh_testdir + for FILE in "$(SUBDIRS)"; do \ + mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \ + (cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \ + ../"$$FILE"/configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(confflags) \ + --with-mapdir=\$${prefix}/share/fonts/X11/util \ + CFLAGS="$(CFLAGS)" && \ + $(MAKE)) || exit 1; \ + done - mkdir obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ - ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info $(confflags) \ - CFLAGS="$(CFLAGS)" - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) - touch build-stamp -clean: +clean: xsfclean dh_testdir dh_testroot rm -f build-stamp @@ -54,7 +60,7 @@ rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* + rm -rf *-obj-* dh_clean @@ -64,7 +70,10 @@ dh_clean -k dh_installdirs - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + for FILE in "$(SUBDIRS)"; do \ + cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \ + cd ..; \ + done # Build architecture-dependent files here. binary-arch: build install @@ -72,7 +81,7 @@ dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp + dh_install --sourcedir=debian/tmp --fail-missing dh_installchangelogs dh_link dh_strip --dbg-package=$(PACKAGE) Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/xfonts-utils.install =================================================================== --- branches/modular/font/font-util-X11R7.0-1.0.0/debian/xfonts-utils.install 2006-02-19 15:45:30 UTC (rev 1233) +++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/xfonts-utils.install 2006-02-19 15:53:44 UTC (rev 1234) @@ -1,7 +1,14 @@ -usr/bin/* +usr/bin/bdftopcf +usr/bin/bdftruncate +usr/bin/mkfontdir +usr/bin/mkfontscale +usr/bin/ucs2any +usr/share/man/man1/bdftopcf.1x +usr/share/man/man1/bdftruncate.1x +usr/share/man/man1/mkfontdir.1x +usr/share/man/man1/mkfontscale.1x +usr/share/man/man1/ucs2any.1x usr/share/aclocal/fontutil.m4 -usr/share/man/man1/* -usr/lib/X11/fonts/util/* usr/lib/pkgconfig/fontutil.pc ../local/update-fonts-alias usr/bin ../local/update-fonts-dir usr/bin @@ -9,3 +16,20 @@ ../local/update-fonts-alias.8 usr/share/man/man8 ../local/update-fonts-dir.8 usr/share/man/man8 ../local/update-fonts-scale.8 usr/share/man/man8 +usr/share/fonts/X11/util/map-ISO8859-1 +usr/share/fonts/X11/util/map-ISO8859-2 +usr/share/fonts/X11/util/map-ISO8859-3 +usr/share/fonts/X11/util/map-ISO8859-4 +usr/share/fonts/X11/util/map-ISO8859-5 +usr/share/fonts/X11/util/map-ISO8859-6 +usr/share/fonts/X11/util/map-ISO8859-7 +usr/share/fonts/X11/util/map-ISO8859-8 +usr/share/fonts/X11/util/map-ISO8859-9 +usr/share/fonts/X11/util/map-ISO8859-10 +usr/share/fonts/X11/util/map-ISO8859-11 +usr/share/fonts/X11/util/map-ISO8859-13 +usr/share/fonts/X11/util/map-ISO8859-14 +usr/share/fonts/X11/util/map-ISO8859-15 +usr/share/fonts/X11/util/map-ISO8859-16 +usr/share/fonts/X11/util/map-JISX0201.1976-0 +usr/share/fonts/X11/util/map-KOI8-R -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
