[subversion-commit] SVN lmodern commit + diffs: r1219 - lmodern/trunk/debian

[Norbert Preining]

Author: preining-guest
Date: 2006-04-18 15:19:27 +0000 (Tue, 18 Apr 2006)
New Revision: 1219

Modified:
   lmodern/trunk/debian/changelog
   lmodern/trunk/debian/rules
Log:
install .scale file to /etc/X11/fonts/X11R7/Type1, adapt the
dh_installdirs call.


Modified: lmodern/trunk/debian/changelog
===================================================================
--- lmodern/trunk/debian/changelog	2006-04-18 15:16:46 UTC (rev 1218)
+++ lmodern/trunk/debian/changelog	2006-04-18 15:19:27 UTC (rev 1219)
@@ -6,8 +6,10 @@
     - change the dh_installdirs line in rules
     - modify the README file for new location, and change to Xorg.
     - build-dependency on debhelper >= 5.0.31, compat level set to 5
+    - install .scale file to /etc/X11/fonts/X11R7/Type1, adapt the 
+      dh_installdirs call.
 
- -- Norbert Preining <preining at logic.at>  Thu, 13 Apr 2006 13:37:30 +0200
+ -- Norbert Preining <preining at logic.at>  Tue, 18 Apr 2006 17:18:00 +0200
 
 lmodern (0.99.3-2) unstable; urgency=low
 

Modified: lmodern/trunk/debian/rules
===================================================================
--- lmodern/trunk/debian/rules	2006-04-18 15:16:46 UTC (rev 1218)
+++ lmodern/trunk/debian/rules	2006-04-18 15:19:27 UTC (rev 1219)
@@ -112,7 +112,7 @@
           usr/share/texmf/tex/latex/lm \
           usr/share/doc/texmf/fonts/lm \
           usr/share/doc/$(PKG)/font-substitution \
-          etc/X11/fonts/Type1 \
+          etc/X11/fonts/X11R7/Type1 \
           usr/share/fonts/X11/Type1
 
         # Note: we won't install the PFM files because we already have the
@@ -139,11 +139,8 @@
 	sed -nf debian/sed_scripts/gen-x-fonts-links-list \
           "debian/$(PKG).fontlist-x11" >> "debian/$(PKG).links"
 
-	# with X7 this may be the wrong place
-	echo "The location for the scale file may be wrong!!!" >&2
-	exit 1
 	$(INSTALL_FILE) "debian/$(PKG).scale" \
-          "$(REL_PKG_INSTALL_DIR)/etc/X11/fonts/Type1"
+          "$(REL_PKG_INSTALL_DIR)/etc/X11/fonts/X11R7/Type1"
 	dh_installxfonts
 
 	$(INSTALL_FILE) fonts/tfm/public/lm/*.tfm \