Author: dnusinow Date: 2006-02-19 19:28:11 -0500 (Sun, 19 Feb 2006) New Revision: 1235
Removed: branches/modular/app/xutils/bdftopcf-X11R7.0-1.0.0/ branches/modular/app/xutils/mkfontdir-X11R7.0-1.0.1/ branches/modular/app/xutils/mkfontscale-X11R7.0-1.0.1/ Modified: branches/modular/app/xutils/debian/changelog branches/modular/app/xutils/debian/control branches/modular/app/xutils/debian/rules branches/modular/app/xutils/debian/xutils.install Log: Incorporate Eugene Konev's changes including moving the proper stuff to xfonts-utils Modified: branches/modular/app/xutils/debian/changelog =================================================================== --- branches/modular/app/xutils/debian/changelog 2006-02-19 15:53:44 UTC (rev 1234) +++ branches/modular/app/xutils/debian/changelog 2006-02-20 00:28:11 UTC (rev 1235) @@ -1,7 +1,12 @@ xutils (1:1.0.1-1) experimental; urgency=low + [ David Nusinow ] * First modular upload to Debian * mkcfm removed because it is non-free * Add patch to allow mkfontdir to build properly + [ Eugene Konev ] + * Add missing b-d's. + * Remove font utils from here. Add depends on xfonts-utils. + -- David Nusinow <[EMAIL PROTECTED]> Tue, 31 Jan 2006 21:37:49 -0500 Modified: branches/modular/app/xutils/debian/control =================================================================== --- branches/modular/app/xutils/debian/control 2006-02-19 15:53:44 UTC (rev 1234) +++ branches/modular/app/xutils/debian/control 2006-02-20 00:28:11 UTC (rev 1235) @@ -3,21 +3,18 @@ Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.0.0), pkg-config, quilt +Build-Depends: debhelper (>= 4.0.0), pkg-config, quilt, libfontenc-dev, libfreetype6-dev, libxfont-dev, libx11-dev, libfs-dev Standards-Version: 3.6.1.0 Package: xutils Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common +Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-utils Description: X Window System utility programs xutils provides a set of utility programs shipped with the X Window System that do not require the X libraries; many of these programs are useful even on a system that does not have any X clients or X servers installed. . 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 - ccmakedep, a version of makedepend which "does it right" - cleanlinks, a program to remove dangling symlinks and empty directories from a shadow link tree (created with lndir) @@ -33,7 +30,6 @@ files; - makestrs, a tool that makes string table C source and header(s); - mkdirhier, a tool that creates a directory hierarchy; - - mkfontdir, a program to generate fonts.dir files; - scanpci, a utility for retrieving information about the PCI bus and devices on it (not available on all architectures); - pcitweak, a utility that can be used to examine or change registers in Modified: branches/modular/app/xutils/debian/rules =================================================================== --- branches/modular/app/xutils/debian/rules 2006-02-19 15:53:44 UTC (rev 1234) +++ branches/modular/app/xutils/debian/rules 2006-02-20 00:28:11 UTC (rev 1235) @@ -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="bdftopcf-X11R7.0-1.0.0 fslsfonts-X11R7.0-1.0.1 luit-X11R7.0-1.0.1 mkfontdir-X11R7.0-1.0.1 mkfontscale-X11R7.0-1.0.1 rstart-X11R7.0-1.0.1 scripts-X11R7.0-1.0.1 sessreg-X11R7.0-1.0.0 showfont-X11R7.0-1.0.1 xfsinfo-X11R7.0-1.0.1" +SUBDIRS="fslsfonts-X11R7.0-1.0.1 luit-X11R7.0-1.0.1 rstart-X11R7.0-1.0.1 scripts-X11R7.0-1.0.1 sessreg-X11R7.0-1.0.0 showfont-X11R7.0-1.0.1 xfsinfo-X11R7.0-1.0.1" CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) Modified: branches/modular/app/xutils/debian/xutils.install =================================================================== --- branches/modular/app/xutils/debian/xutils.install 2006-02-19 15:53:44 UTC (rev 1234) +++ branches/modular/app/xutils/debian/xutils.install 2006-02-20 00:28:11 UTC (rev 1235) @@ -1,8 +1,5 @@ -usr/bin/bdftopcf usr/bin/fslsfonts usr/bin/luit -usr/bin/mkfontdir -usr/bin/mkfontscale usr/bin/rstart usr/bin/rstartd usr/bin/xauth_switch_to_sun-des-1 @@ -12,11 +9,8 @@ usr/bin/sessreg usr/bin/showfont usr/bin/xfsinfo -usr/share/man/man1/bdftopcf.1x usr/share/man/man1/fslsfonts.1x usr/share/man/man1/luit.1x -usr/share/man/man1/mkfontdir.1x -usr/share/man/man1/mkfontscale.1x usr/share/man/man1/rstartd.1x usr/share/man/man1/rstart.1x usr/share/man/man1/xon.1x -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]