Author: dnusinow Date: 2006-01-31 21:39:09 -0500 (Tue, 31 Jan 2006) New Revision: 1167
Added: branches/modular/app/xutils/debian/patches/ branches/modular/app/xutils/debian/patches/001_mkfontdir_location_fix.diff branches/modular/app/xutils/debian/patches/series Modified: branches/modular/app/xutils/debian/changelog branches/modular/app/xutils/debian/control branches/modular/app/xutils/debian/rules Log: * Add patch to allow mkfontdir to build properly * Add corresponding quilt build-dep to handle it and rules dependency targets Modified: branches/modular/app/xutils/debian/changelog =================================================================== --- branches/modular/app/xutils/debian/changelog 2006-02-01 01:45:21 UTC (rev 1166) +++ branches/modular/app/xutils/debian/changelog 2006-02-01 02:39:09 UTC (rev 1167) @@ -2,5 +2,6 @@ * First modular upload to Debian * mkcfm removed because it is non-free + * Add patch to allow mkfontdir to build properly - -- David Nusinow <[EMAIL PROTECTED]> Mon, 30 Jan 2006 20:36:47 -0500 + -- 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-01 01:45:21 UTC (rev 1166) +++ branches/modular/app/xutils/debian/control 2006-02-01 02:39:09 UTC (rev 1167) @@ -3,7 +3,7 @@ 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 Standards-Version: 3.6.1.0 Package: xutils Added: branches/modular/app/xutils/debian/patches/001_mkfontdir_location_fix.diff =================================================================== --- branches/modular/app/xutils/debian/patches/001_mkfontdir_location_fix.diff 2006-02-01 01:45:21 UTC (rev 1166) +++ branches/modular/app/xutils/debian/patches/001_mkfontdir_location_fix.diff 2006-02-01 02:39:09 UTC (rev 1167) @@ -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/app/xutils/debian/patches/series =================================================================== --- branches/modular/app/xutils/debian/patches/series 2006-02-01 01:45:21 UTC (rev 1166) +++ branches/modular/app/xutils/debian/patches/series 2006-02-01 02:39:09 UTC (rev 1167) @@ -0,0 +1 @@ +001_mkfontdir_location_fix.diff Modified: branches/modular/app/xutils/debian/rules =================================================================== --- branches/modular/app/xutils/debian/rules 2006-02-01 01:45:21 UTC (rev 1166) +++ branches/modular/app/xutils/debian/rules 2006-02-01 02:39:09 UTC (rev 1167) @@ -36,7 +36,7 @@ endif -build: genscripts build-stamp +build: genscripts patch build-stamp build-stamp: dh_testdir for FILE in "$(SUBDIRS)"; do \ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
