X Strike Force X.Org X11 SVN commit: r3786 - in trunk/font/xfonts-utils: debian debian/patches mkfontdir
Author: dnusinow
Date: 2006-10-14 12:08:21 -0400 (Sat, 14 Oct 2006)
New Revision: 3786
Modified:
trunk/font/xfonts-utils/debian/changelog
trunk/font/xfonts-utils/debian/patches/001_mkfontdir_location_fix.diff
trunk/font/xfonts-utils/mkfontdir/Makefile.in
Log:
* Internal directory name cleanup. This requires a new .orig.tar.gz for
cleanliness, so version bump.
* Update patch 01 to only include Makefile.am, not Makefile.in patch.
autoreconf with the patch applied.
Modified: trunk/font/xfonts-utils/debian/changelog
===================================================================
--- trunk/font/xfonts-utils/debian/changelog 2006-10-14 15:52:54 UTC (rev 3785)
+++ trunk/font/xfonts-utils/debian/changelog 2006-10-14 16:08:21 UTC (rev 3786)
@@ -1,11 +1,14 @@
-xfonts-utils (1:1.0.0-7) unstable; urgency=low
+xfonts-utils (1:1.0.1-1) unstable; urgency=low
- * Internal directory name cleanup
+ * Internal directory name cleanup. This requires a new .orig.tar.gz for
+ cleanliness, so version bump.
* Autoreconf to fix manpage suffix issues. Should now build properly on
hurd, kfreebsd, and friends. Thanks Samuel Thibault, Michael Bank, and
Robert Millan. Closes: #358702, #363484
+ * Update patch 01 to only include Makefile.am, not Makefile.in patch.
+ autoreconf with the patch applied.
- -- David Nusinow <dnusinow@debian.org> Sat, 14 Oct 2006 11:45:57 -0400
+ -- David Nusinow <dnusinow@debian.org> Sat, 14 Oct 2006 12:03:53 -0400
xfonts-utils (1:1.0.0-6) unstable; urgency=medium
Modified: trunk/font/xfonts-utils/debian/patches/001_mkfontdir_location_fix.diff
===================================================================
--- trunk/font/xfonts-utils/debian/patches/001_mkfontdir_location_fix.diff 2006-10-14 15:52:54 UTC (rev 3785)
+++ trunk/font/xfonts-utils/debian/patches/001_mkfontdir_location_fix.diff 2006-10-14 16:08:21 UTC (rev 3786)
@@ -1,7 +1,7 @@
-Index: xfonts-utils/mkfontdir-X11R7.0-1.0.1/Makefile.am
+Index: xfonts-utils/mkfontdir/Makefile.am
===================================================================
---- xfonts-utils.orig/mkfontdir-X11R7.0-1.0.1/Makefile.am 2006-05-08 23:13:04.000000000 -0400
-+++ xfonts-utils/mkfontdir-X11R7.0-1.0.1/Makefile.am 2006-06-12 22:45:15.000000000 -0400
+--- xfonts-utils.orig/mkfontdir/Makefile.am 2006-05-08 23:13:04.000000000 -0400
++++ xfonts-utils/mkfontdir/Makefile.am 2006-06-12 22:45:15.000000000 -0400
@@ -24,7 +24,7 @@
appman_PRE = mkfontdir.man
@@ -11,54 +11,3 @@
EXTRA_DIST = mkfontdir.cpp
CLEANFILES = $(bin_SCRIPTS)
-Index: xfonts-utils/mkfontdir-X11R7.0-1.0.1/Makefile.in
-===================================================================
---- xfonts-utils.orig/mkfontdir-X11R7.0-1.0.1/Makefile.in 2006-05-08 23:13:04.000000000 -0400
-+++ xfonts-utils/mkfontdir-X11R7.0-1.0.1/Makefile.in 2006-06-12 22:46:13.000000000 -0400
-@@ -104,7 +104,6 @@
- SHELL = @SHELL@
- STRIP = @STRIP@
- VERSION = @VERSION@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__leading_dot = @am__leading_dot@
- bindir = @bindir@
- build = @build@
-@@ -113,22 +112,29 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -451,7 +457,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: trunk/font/xfonts-utils/mkfontdir/Makefile.in
===================================================================
--- trunk/font/xfonts-utils/mkfontdir/Makefile.in 2006-10-14 15:52:54 UTC (rev 3785)
+++ trunk/font/xfonts-utils/mkfontdir/Makefile.in 2006-10-14 16:08:21 UTC (rev 3786)
@@ -506,7 +506,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) < $< > $@
Reply to: