X Strike Force X.Org X11 SVN commit: r924 - trunk/xsfbs
Author: dnusinow
Date: 2005-12-06 00:16:57 -0500 (Tue, 06 Dec 2005)
New Revision: 924
Modified:
trunk/xsfbs/xsfbs.mk
trunk/xsfbs/xsfbs.sh
Log:
* Various changes to get the fonts building. Note that they still don't
update the fonts.dir correctly yet, since I don't understand that as of
right now.
* Updates to xsfbs
* Pull cleanscripts target from old monolithic debian/rules packaging.
We need this so that the maintainer scripts get regenerated properly
if we do any work on them
* Comment out the posix validation stuff for the maintscripts. We
should keep this but it's potentially a lot of work...
* Update the font_update() function to use the new HFS-compliant font
location of /usr/lib/X11/fonts rather than /usr/X11R6/lib/fonts
Modified: trunk/xsfbs/xsfbs.mk
===================================================================
--- trunk/xsfbs/xsfbs.mk 2005-12-06 05:14:23 UTC (rev 923)
+++ trunk/xsfbs/xsfbs.mk 2005-12-06 05:16:57 UTC (rev 924)
@@ -166,9 +166,19 @@
echo "nothing to do."; \
fi
+# Clean the generated maintainer scripts.
+.PHONY: cleanscripts
+cleanscripts:
+ rm -f $(STAMP_DIR)/genscripts
+ rm -f debian/*.config \
+ debian/*.postinst \
+ debian/*.postrm \
+ debian/*.preinst \
+ debian/*.prerm
+
# Clean the package build tree.
.PHONY: xsfclean
-xsfclean: unpatch
+xsfclean: cleanscripts unpatch
dh_testdir
rm -f .pc patches
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
@@ -330,11 +340,11 @@
done
done
# Validate syntax of generated shell scripts.
- sh debian/scripts/validate-posix-sh debian/*.config \
- debian/*.postinst \
- debian/*.postrm \
- debian/*.preinst \
- debian/*.prerm
+ #sh debian/scripts/validate-posix-sh debian/*.config \
+ # debian/*.postinst \
+ # debian/*.postrm \
+ # debian/*.preinst \
+ # debian/*.prerm
>$@
# Generate the shlibs.local file.
Modified: trunk/xsfbs/xsfbs.sh
===================================================================
--- trunk/xsfbs/xsfbs.sh 2005-12-06 05:14:23 UTC (rev 923)
+++ trunk/xsfbs/xsfbs.sh 2005-12-06 05:16:57 UTC (rev 924)
@@ -397,7 +397,7 @@
#local dir cmd shortcmd x_font_dir_prefix
- _x_font_dir_prefix="/usr/X11R6/lib/X11/fonts"
+ _x_font_dir_prefix="/usr/lib/X11/fonts"
if [ -z "$UPDATECMDS" ]; then
usage_error "font_update() called but \$UPDATECMDS not set"
Reply to: