[SCM] Debian packaging of lmodern) branch, master, updated. upstream/2.004.2-11-g70ccbe5
The following commit has been merged in the master branch:
commit 843ffb67b74c61a117ff855b7f7ec4df6f3822f6
Author: Norbert Preining <preining@debian.org>
Date: Wed Oct 10 18:41:02 2012 +0900
get rid of sed scripts and any traces of defoma, simplify rules file
diff --git a/debian/changelog b/debian/changelog
index 6d633a2..0cb01e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lmodern (2.004.2-2~1) UNRELEASED; urgency=low
+lmodern (2.004.2-2~2) UNRELEASED; urgency=low
* split OTF fonts into a separate package fonts-lmodern
(Closes: #689580, #689581)
@@ -6,9 +6,10 @@ lmodern (2.004.2-2~1) UNRELEASED; urgency=low
* install a fontconfig file that makes the opentype fonts available
and disables the type 1 fonts for fontconfig
(Closes: #687940, #645841)
- * clean out cruft in the maintainer scripts
+ * clean out cruft in the maintainer scripts, simplify rules file,
+ update copyright
- -- Norbert Preining <preining@debian.org> Wed, 10 Oct 2012 10:33:56 +0900
+ -- Norbert Preining <preining@debian.org> Wed, 10 Oct 2012 18:42:38 +0900
lmodern (2.004.2-1) unstable; urgency=low
diff --git a/debian/copyright.in b/debian/copyright.in
index 660aa23..021ccdf 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -52,7 +52,7 @@ Debian packaging
----------------
Copyright (c) 2004, 2005, 2006, 2007 Florent Rougon
-Copyright (c) 2005, 2006, 2007, 2008, 2009 Norbert Preining
+Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Norbert Preining
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/create-compat-links.sh b/debian/create-compat-links.sh
deleted file mode 100644
index 6ddf0dc..0000000
--- a/debian/create-compat-links.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# adjust this as needed
-TEXMFLOCAL=/usr/local/share/texmf
-
-
-# texmf tree where lmodern fonts are installed
-TEXMF=/usr/share/texmf
-
-fonts="lmr17 lmr5 lmr6 lmr7 lmr8 lmr9 lmri10 lmri12 lmri7 lmri8 lmri9 lmro10 lmro12 lmro8 lmro9 lmss10 lmss12 lmss17 lmss8 lmss9 lmssbo10 lmssbx10 lmssdc10 lmssdo10 lmsso10 lmsso12 lmsso17 lmsso8 lmsso9 lmssq8 lmssqbo8 lmssqbx8 lmssqo8 lmtcsc10 lmtt10 lmtt12 lmtt8 lmtt9 lmtti10 lmtto10 lmvtt10 lmvtto10 lmb10 lmbo10 lmbx10 lmbx12 lmbx5 lmbx6 lmbx7 lmbx8 lmbx9 lmbxi10 lmbxo10 lmcsc10 lmcsco10 lmr10 lmr12"
-
-mkdir -p $TEXMFLOCAL/fonts/enc/dvips/lm
-ln -s $TEXMF/fonts/enc/dvips/lm/lm-ec.enc \
- $TEXMFLOCAL/fonts/enc/dvips/lm/cork-lm.enc
-
-mkdir -p $TEXMFLOCAL/fonts/tfm/public/lm
-for font in $fonts; do
- ln -s $TEXMF/fonts/tfm/public/lm/ec-$font.tfm \
- $TEXMFLOCAL/fonts/tfm/public/lm/cork-$font.tfm
-done
-mktexlsr $TEXMFLOCAL
-
-
diff --git a/debian/lmodern.scale b/debian/lmodern.scale
new file mode 100644
index 0000000..266c045
--- /dev/null
+++ b/debian/lmodern.scale
@@ -0,0 +1,81 @@
+80
+lmb10.pfb -unregistered-Latin Modern Roman-bold-r-normal--0-0-0-0-p-0-iso8859-1
+lmb10.pfb -unregistered-Latin Modern Roman-bold-r-normal--0-0-0-0-p-0-iso8859-15
+lmbo10.pfb -unregistered-Latin Modern Roman-bold-o-normal--0-0-0-0-p-0-iso8859-1
+lmbo10.pfb -unregistered-Latin Modern Roman-bold-o-normal--0-0-0-0-p-0-iso8859-15
+lmbx10.pfb -unregistered-Latin Modern Roman-bold-r-expanded--0-0-0-0-p-0-iso8859-1
+lmbx10.pfb -unregistered-Latin Modern Roman-bold-r-expanded--0-0-0-0-p-0-iso8859-15
+lmbxi10.pfb -unregistered-Latin Modern Roman-bold-i-expanded--0-0-0-0-p-0-iso8859-1
+lmbxi10.pfb -unregistered-Latin Modern Roman-bold-i-expanded--0-0-0-0-p-0-iso8859-15
+lmbxo10.pfb -unregistered-Latin Modern Roman-bold-o-expanded--0-0-0-0-p-0-iso8859-1
+lmbxo10.pfb -unregistered-Latin Modern Roman-bold-o-expanded--0-0-0-0-p-0-iso8859-15
+lmcsc10.pfb -unregistered-Latin Modern Roman-medium-r-normal-small caps-0-0-0-0-p-0-iso8859-1
+lmcsc10.pfb -unregistered-Latin Modern Roman-medium-r-normal-small caps-0-0-0-0-p-0-iso8859-15
+lmcsco10.pfb -unregistered-Latin Modern Roman-medium-o-normal-small caps-0-0-0-0-p-0-iso8859-1
+lmcsco10.pfb -unregistered-Latin Modern Roman-medium-o-normal-small caps-0-0-0-0-p-0-iso8859-15
+lmdunh10.pfb -unregistered-Latin Modern Roman-medium-r-normal-dunhill-0-0-0-0-p-0-iso8859-1
+lmdunh10.pfb -unregistered-Latin Modern Roman-medium-r-normal-dunhill-0-0-0-0-p-0-iso8859-15
+lmduno10.pfb -unregistered-Latin Modern Roman-medium-o-normal-dunhill-0-0-0-0-p-0-iso8859-1
+lmduno10.pfb -unregistered-Latin Modern Roman-medium-o-normal-dunhill-0-0-0-0-p-0-iso8859-15
+lmr10.pfb -unregistered-Latin Modern Roman-medium-r-normal--0-0-0-0-p-0-iso8859-1
+lmr10.pfb -unregistered-Latin Modern Roman-medium-r-normal--0-0-0-0-p-0-iso8859-15
+lmri10.pfb -unregistered-Latin Modern Roman-medium-i-normal--0-0-0-0-p-0-iso8859-1
+lmri10.pfb -unregistered-Latin Modern Roman-medium-i-normal--0-0-0-0-p-0-iso8859-15
+lmro10.pfb -unregistered-Latin Modern Roman-medium-o-normal--0-0-0-0-p-0-iso8859-1
+lmro10.pfb -unregistered-Latin Modern Roman-medium-o-normal--0-0-0-0-p-0-iso8859-15
+lmss10.pfb -unregistered-Latin Modern Sans-medium-r-normal--0-0-0-0-p-0-iso8859-1
+lmss10.pfb -unregistered-Latin Modern Sans-medium-r-normal--0-0-0-0-p-0-iso8859-15
+lmssbo10.pfb -unregistered-Latin Modern Sans-bold-o-normal--0-0-0-0-p-0-iso8859-1
+lmssbo10.pfb -unregistered-Latin Modern Sans-bold-o-normal--0-0-0-0-p-0-iso8859-15
+lmssbx10.pfb -unregistered-Latin Modern Sans-bold-r-expanded--0-0-0-0-p-0-iso8859-1
+lmssbx10.pfb -unregistered-Latin Modern Sans-bold-r-expanded--0-0-0-0-p-0-iso8859-15
+lmssdc10.pfb -unregistered-Latin Modern Sans-demi bold-r-condensed--0-0-0-0-p-0-iso8859-1
+lmssdc10.pfb -unregistered-Latin Modern Sans-demi bold-r-condensed--0-0-0-0-p-0-iso8859-15
+lmssdo10.pfb -unregistered-Latin Modern Sans-demi bold-o-condensed--0-0-0-0-p-0-iso8859-1
+lmssdo10.pfb -unregistered-Latin Modern Sans-demi bold-o-condensed--0-0-0-0-p-0-iso8859-15
+lmsso10.pfb -unregistered-Latin Modern Sans-medium-o-normal--0-0-0-0-p-0-iso8859-1
+lmsso10.pfb -unregistered-Latin Modern Sans-medium-o-normal--0-0-0-0-p-0-iso8859-15
+lmssq8.pfb -unregistered-Latin Modern SansQuotation-medium-r-normal--0-0-0-0-p-0-iso8859-1
+lmssq8.pfb -unregistered-Latin Modern SansQuotation-medium-r-normal--0-0-0-0-p-0-iso8859-15
+lmssqbo8.pfb -unregistered-Latin Modern SansQuotation-bold-o-normal--0-0-0-0-p-0-iso8859-1
+lmssqbo8.pfb -unregistered-Latin Modern SansQuotation-bold-o-normal--0-0-0-0-p-0-iso8859-15
+lmssqbx8.pfb -unregistered-Latin Modern SansQuotation-bold-o-expanded--0-0-0-0-p-0-iso8859-1
+lmssqbx8.pfb -unregistered-Latin Modern SansQuotation-bold-o-expanded--0-0-0-0-p-0-iso8859-15
+lmssqo8.pfb -unregistered-Latin Modern SansQuotation-medium-o-normal--0-0-0-0-p-0-iso8859-1
+lmssqo8.pfb -unregistered-Latin Modern SansQuotation-medium-o-normal--0-0-0-0-p-0-iso8859-15
+lmtcsc10.pfb -unregistered-Latin Modern Typewriter-medium-r-normal-small caps-0-0-0-0-c-0-iso8859-1
+lmtcsc10.pfb -unregistered-Latin Modern Typewriter-medium-r-normal-small caps-0-0-0-0-c-0-iso8859-15
+lmtcso10.pfb -unregistered-Latin Modern Typewriter-medium-o-normal-small caps-0-0-0-0-c-0-iso8859-1
+lmtcso10.pfb -unregistered-Latin Modern Typewriter-medium-o-normal-small caps-0-0-0-0-c-0-iso8859-15
+lmtk10.pfb -unregistered-Latin Modern Typewriter-dark-r-normal--0-0-0-0-c-0-iso8859-1
+lmtk10.pfb -unregistered-Latin Modern Typewriter-dark-r-normal--0-0-0-0-c-0-iso8859-15
+lmtko10.pfb -unregistered-Latin Modern Typewriter-dark-o-normal--0-0-0-0-c-0-iso8859-1
+lmtko10.pfb -unregistered-Latin Modern Typewriter-dark-o-normal--0-0-0-0-c-0-iso8859-15
+lmtl10.pfb -unregistered-Latin Modern Typewriter-light-r-normal--0-0-0-0-c-0-iso8859-1
+lmtl10.pfb -unregistered-Latin Modern Typewriter-light-r-normal--0-0-0-0-c-0-iso8859-15
+lmtlc10.pfb -unregistered-Latin Modern Typewriter-light-r-condensed--0-0-0-0-c-0-iso8859-1
+lmtlc10.pfb -unregistered-Latin Modern Typewriter-light-r-condensed--0-0-0-0-c-0-iso8859-15
+lmtlco10.pfb -unregistered-Latin Modern Typewriter-light-o-condensed--0-0-0-0-c-0-iso8859-1
+lmtlco10.pfb -unregistered-Latin Modern Typewriter-light-o-condensed--0-0-0-0-c-0-iso8859-15
+lmtlo10.pfb -unregistered-Latin Modern Typewriter-light-o-normal--0-0-0-0-c-0-iso8859-1
+lmtlo10.pfb -unregistered-Latin Modern Typewriter-light-o-normal--0-0-0-0-c-0-iso8859-15
+lmtt10.pfb -unregistered-Latin Modern Typewriter-medium-r-normal--0-0-0-0-c-0-iso8859-1
+lmtt10.pfb -unregistered-Latin Modern Typewriter-medium-r-normal--0-0-0-0-c-0-iso8859-15
+lmtti10.pfb -unregistered-Latin Modern Typewriter-medium-i-normal--0-0-0-0-c-0-iso8859-1
+lmtti10.pfb -unregistered-Latin Modern Typewriter-medium-i-normal--0-0-0-0-c-0-iso8859-15
+lmtto10.pfb -unregistered-Latin Modern Typewriter-medium-o-normal--0-0-0-0-c-0-iso8859-1
+lmtto10.pfb -unregistered-Latin Modern Typewriter-medium-o-normal--0-0-0-0-c-0-iso8859-15
+lmu10.pfb -unregistered-Latin Modern Roman-medium-r-normal-unslanted-0-0-0-0-p-0-iso8859-1
+lmu10.pfb -unregistered-Latin Modern Roman-medium-r-normal-unslanted-0-0-0-0-p-0-iso8859-15
+lmvtk10.pfb -unregistered-Latin Modern Typewriter Variable Width-dark-r-normal--0-0-0-0-p-0-iso8859-1
+lmvtk10.pfb -unregistered-Latin Modern Typewriter Variable Width-dark-r-normal--0-0-0-0-p-0-iso8859-15
+lmvtko10.pfb -unregistered-Latin Modern Typewriter Variable Width-dark-o-normal--0-0-0-0-p-0-iso8859-1
+lmvtko10.pfb -unregistered-Latin Modern Typewriter Variable Width-dark-o-normal--0-0-0-0-p-0-iso8859-15
+lmvtl10.pfb -unregistered-Latin Modern Typewriter Variable Width-light-r-normal--0-0-0-0-p-0-iso8859-1
+lmvtl10.pfb -unregistered-Latin Modern Typewriter Variable Width-light-r-normal--0-0-0-0-p-0-iso8859-15
+lmvtlo10.pfb -unregistered-Latin Modern Typewriter Variable Width-light-o-normal--0-0-0-0-p-0-iso8859-1
+lmvtlo10.pfb -unregistered-Latin Modern Typewriter Variable Width-light-o-normal--0-0-0-0-p-0-iso8859-15
+lmvtt10.pfb -unregistered-Latin Modern Typewriter Variable Width-medium-r-normal--0-0-0-0-p-0-iso8859-1
+lmvtt10.pfb -unregistered-Latin Modern Typewriter Variable Width-medium-r-normal--0-0-0-0-p-0-iso8859-15
+lmvtto10.pfb -unregistered-Latin Modern Typewriter Variable Width-medium-o-normal--0-0-0-0-p-0-iso8859-1
+lmvtto10.pfb -unregistered-Latin Modern Typewriter Variable Width-medium-o-normal--0-0-0-0-p-0-iso8859-15
diff --git a/debian/rules b/debian/rules
index 1b2f67d..191dd40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,5 @@
#! /usr/bin/make -f
-PKG := lmodern
-PKGFONTS := fonts-lmodern
-PKG_INSTALL_DIR := debian/$(PKG)
-PKGFONTS_INSTALL_DIR := debian/$(PKGFONTS)
-
-INSTALL := install
-INSTALL_FILE := $(INSTALL) -p -o root -g root -m 644
-
-
build: build-arch build-indep
# We have nothing to do here but the Debian Policy says this target must
# exist.
@@ -67,19 +58,6 @@ build-indep-stamp:
} >&2; \
fi
- # Generate $(PKG).scale from $(PKG).defoma-hints (since it contains
- # nice hand-crafted XLFD names for the fonts).
- sed -nf debian/sed_scripts/gen-fonts.scale \
- "debian/$(PKG).defoma-hints" > "debian/$(PKG).scale.tmp"
- { wc -l < "debian/$(PKG).scale.tmp" && \
- cat "debian/$(PKG).scale.tmp"; \
- } > "debian/$(PKG).scale"
-
- # The following generated list should be safe with respect to font
- # file names containing spaces (there is one name per line)...
- sed -ne 's/^[[:blank:]]*begin[[:blank:]]\{1,\}.*[/]\([^/]\{1,\}\)\.pfb[[:blank:]]*$$/\1/p' \
- < "debian/$(PKG).defoma-hints" > "debian/$(PKG).fontlist-x11"
-
# Generate the actual copyright file from copyright.in and
# the GUST license
cat debian/copyright.in doc/fonts/lm/GUST-FONT-LICENSE.TXT \
@@ -90,15 +68,11 @@ build-indep-stamp:
clean:
dh_testdir fonts/type1/public/lm/lmr10.pfb tex/latex/lm/lmodern.sty
dh_testroot
- # debian/$(PKG).links is automatically generated from the list of
+ # debian/lmodern.links is automatically generated from the list of
# fonts to declare to X11 among other things, so we have to delete
# it here.
- # debian/copyright and debian/lmodern.cfg are automatically generated
- # from the respective .in files.
- rm -f build-indep-stamp \
- "debian/$(PKG).scale.tmp" "debian/$(PKG).scale" \
- "debian/$(PKG).fontlist-x11" "debian/$(PKG).links" \
- debian/copyright
+ # debian/copyright is automatically generated from the .in file
+ rm -f build-indep-stamp debian/lmodern.links debian/copyright
dh_clean
binary-indep: build-indep
@@ -107,27 +81,24 @@ binary-indep: build-indep
dh_clean
# We will call dh_link only once for the build, with all desired links
- # specified in $(PKG).links because it is much faster than spawning
+ # specified in lmodern.links because it is much faster than spawning
# a dh_link (actually, Perl) process for every symbolic link in this
- # package. So, $(PKG).links starts as an empty file and (target, link)
- # pairs will be added to it in the relevant places.
- cat "debian/lmodern.links.in" > "debian/$(PKG).links"
-
- # Setup symlinks so that X can see the AFM and PFB files as well.
- # Note: we use debian/$(PKG).fontlist-x11 because we are not making
- # each and every font file available to X (lmr10 and lmr12
- # are very similar, for instance; including all the fonts
- # would bring virtually nothing and would terribly clutter
- # font selection menus and confuse users).
- sed -nf debian/sed_scripts/gen-x-fonts-links-list \
- "debian/$(PKG).fontlist-x11" >> "debian/$(PKG).links"
+ # package. So, lmodern.links starts from the respective .in file
+ cat debian/lmodern.links.in > debian/lmodern.links
+
+ # mind the $$ to trick make into using the right quotes
+ tail -n+2 debian/lmodern.scale | \
+ awk -F. '{print$$1}' | sort | uniq | \
+ sed -ne 's!^\(.*\)$$!usr/share/texmf/fonts/type1/public/lm/\1.pfb usr/share/fonts/X11/Type1/\1.pfb\nusr/share/texmf/fonts/afm/public/lm/\1.afm usr/share/fonts/X11/Type1/\1.afm!p' \
+ >> debian/lmodern.links
dh_install
dh_installxfonts
- # Install the standard conffile for update-updmap
+ # the first call works only on the lmodern package, not all
dh_installtex map=Map,lm.map
- dh_installtex -p $(PKGFONTS)
+ # since we are shipping files in texmf trees, call dh_installtex, too
+ dh_installtex -p fonts-lmodern
dh_link
dh_installdocs
diff --git a/debian/sed_scripts/gen-fonts.scale b/debian/sed_scripts/gen-fonts.scale
deleted file mode 100644
index 8c4259c..0000000
--- a/debian/sed_scripts/gen-fonts.scale
+++ /dev/null
@@ -1,12 +0,0 @@
-/^[[:blank:]]*begin[[:blank:]]\{1,\}[/]/,/^[[:blank:]]*end[[:blank:]]*$/{
- /^[[:blank:]]*begin[[:blank:]]\{1,\}.*[/]\([^/]\{1,\}\)$/{
- s/^[[:blank:]]*begin[[:blank:]]\{1,\}.*[/]\([^/]\{1,\}\)$/\1/
- h
- }
- /^[[:blank:]]*X-FontName[0-9]\{1,\}[[:blank:]]*=[[:blank:]]*[^[:blank:]]\{1,\}/{
- s/^[[:blank:]]*X-FontName[0-9]\{1,\}[[:blank:]]*=[[:blank:]]*\([^[:blank:]]\{1,\}\)/\1/
- s/_/ /g
- G
- s/\(.*\)\n\(.*\)/\2 \1/p
- }
-}
diff --git a/debian/sed_scripts/gen-x-fonts-links-list b/debian/sed_scripts/gen-x-fonts-links-list
deleted file mode 100644
index 0b69643..0000000
--- a/debian/sed_scripts/gen-x-fonts-links-list
+++ /dev/null
@@ -1,2 +0,0 @@
-s@^\(.*\)$@usr/share/texmf/fonts/type1/public/lm/\1.pfb usr/share/fonts/X11/Type1/\1.pfb\
-usr/share/texmf/fonts/afm/public/lm/\1.afm usr/share/fonts/X11/Type1/\1.afm@p
--
Debian packaging of lmodern)
Reply to: