Author: dnusinow
Date: 2006-02-20 21:44:26 -0500 (Mon, 20 Feb 2006)
New Revision: 1261
Removed:
branches/modular/app/xutils/debian/patches/001_mkfontdir_location_fix.diff
Modified:
branches/modular/app/xutils/debian/changelog
branches/modular/app/xutils/debian/patches/series
Log:
Remove patch now that mkfontdir is moved
Modified: branches/modular/app/xutils/debian/changelog
===================================================================
--- branches/modular/app/xutils/debian/changelog 2006-02-21 02:20:16 UTC
(rev 1260)
+++ branches/modular/app/xutils/debian/changelog 2006-02-21 02:44:26 UTC
(rev 1261)
@@ -3,10 +3,9 @@
[ 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
+ -- David Nusinow <[EMAIL PROTECTED]> Mon, 20 Feb 2006 21:44:08 -0500
Deleted:
branches/modular/app/xutils/debian/patches/001_mkfontdir_location_fix.diff
===================================================================
--- branches/modular/app/xutils/debian/patches/001_mkfontdir_location_fix.diff
2006-02-21 02:20:16 UTC (rev 1260)
+++ branches/modular/app/xutils/debian/patches/001_mkfontdir_location_fix.diff
2006-02-21 02:44:26 UTC (rev 1261)
@@ -1,26 +0,0 @@
-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) < $< > $@
Modified: branches/modular/app/xutils/debian/patches/series
===================================================================
--- branches/modular/app/xutils/debian/patches/series 2006-02-21 02:20:16 UTC
(rev 1260)
+++ branches/modular/app/xutils/debian/patches/series 2006-02-21 02:44:26 UTC
(rev 1261)
@@ -1 +0,0 @@
-001_mkfontdir_location_fix.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
