[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 af155be44e1ee11b0c53640be7f92d51e1faa788
Author: Norbert Preining <preining@debian.org>
Date: Thu Oct 11 14:08:21 2012 +0900
bump compat level, pregenerate all file
diff --git a/debian/changelog b/debian/changelog
index 0cb01e6..9d381a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lmodern (2.004.2-2~2) UNRELEASED; urgency=low
+lmodern (2.004.2-2~3) UNRELEASED; urgency=low
* split OTF fonts into a separate package fonts-lmodern
(Closes: #689580, #689581)
@@ -7,9 +7,9 @@ lmodern (2.004.2-2~2) UNRELEASED; urgency=low
and disables the type 1 fonts for fontconfig
(Closes: #687940, #645841)
* clean out cruft in the maintainer scripts, simplify rules file,
- update copyright
+ update copyright, pre-generate all files, compat level bump to 9
- -- Norbert Preining <preining@debian.org> Wed, 10 Oct 2012 18:42:38 +0900
+ -- Norbert Preining <preining@debian.org> Thu, 11 Oct 2012 14:07:46 +0900
lmodern (2.004.2-1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index f9f20cd..8b4cd7a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: fonts
Priority: optional
Maintainer: Debian TeX maintainers <debian-tex-maint@lists.debian.org>
Uploaders: Julian Gilbey <jdg@debian.org>, C.M. Connelly <cmc@debian.org>, Atsuhito KOHDA <kohda@debian.org>, Frank Küster <frank@debian.org>, Florent Rougon <frn@debian.org>, Norbert Preining <preining@debian.org>
-Build-Depends: debhelper (>= 8.1.0)
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: tex-common (>= 3)
Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/debian-tex/lmodern/trunk
diff --git a/debian/copyright.in b/debian/copyright
similarity index 79%
rename from debian/copyright.in
rename to debian/copyright
index 021ccdf..10507fe 100644
--- a/debian/copyright.in
+++ b/debian/copyright
@@ -122,3 +122,31 @@ Appendix B -- GUST Font License
What follows is the exact contents of GUST-FONT-LICENSE.txt from the
upstream distribution of the Latin Modern fonts.
+% This is version 1.0, dated 22 June 2009, of the GUST Font License.
+% (GUST is the Polish TeX Users Group, http://www.gust.org.pl)
+%
+% For the most recent version of this license see
+% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt
+% or
+% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
+%
+% This work may be distributed and/or modified under the conditions
+% of the LaTeX Project Public License, either version 1.3c of this
+% license or (at your option) any later version.
+%
+% Please also observe the following clause:
+% 1) it is requested, but not legally required, that derived works be
+% distributed only after changing the names of the fonts comprising this
+% work and given in an accompanying "manifest", and that the
+% files comprising the Work, as listed in the manifest, also be given
+% new names. Any exceptions to this request are also given in the
+% manifest.
+%
+% We recommend the manifest be given in a separate file named
+% MANIFEST-<fontid>.txt, where <fontid> is some unique identification
+% of the font family. If a separate "readme" file accompanies the Work,
+% we recommend a name of the form README-<fontid>.txt.
+%
+% The latest version of the LaTeX Project Public License is in
+% http://www.latex-project.org/lppl.txt and version 1.3c or later
+% is part of all distributions of LaTeX version 2006/05/20 or later.
diff --git a/debian/lmodern.links b/debian/lmodern.links
new file mode 100644
index 0000000..5898610
--- /dev/null
+++ b/debian/lmodern.links
@@ -0,0 +1,86 @@
+usr/share/doc/texmf/fonts/lm/README-Latin-Modern.TXT usr/share/doc/lmodern/README
+usr/share/doc/texmf/fonts/lm/MANIFEST-Latin-Modern.TXT usr/share/doc/lmodern/MANIFEST.txt
+usr/share/doc/texmf/fonts/lm/lm-hist.txt usr/share/doc/lmodern/lm-hist.txt
+usr/share/doc/texmf/fonts/lm/lm-info.pdf usr/share/doc/lmodern/lm-info.pdf
+#
+# from here on the links are generated by debian/rules target debian/x11links
+usr/share/texmf/fonts/type1/public/lm/lmb10.pfb usr/share/fonts/X11/Type1/lmb10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmb10.afm usr/share/fonts/X11/Type1/lmb10.afm
+usr/share/texmf/fonts/type1/public/lm/lmbo10.pfb usr/share/fonts/X11/Type1/lmbo10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmbo10.afm usr/share/fonts/X11/Type1/lmbo10.afm
+usr/share/texmf/fonts/type1/public/lm/lmbx10.pfb usr/share/fonts/X11/Type1/lmbx10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmbx10.afm usr/share/fonts/X11/Type1/lmbx10.afm
+usr/share/texmf/fonts/type1/public/lm/lmbxi10.pfb usr/share/fonts/X11/Type1/lmbxi10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmbxi10.afm usr/share/fonts/X11/Type1/lmbxi10.afm
+usr/share/texmf/fonts/type1/public/lm/lmbxo10.pfb usr/share/fonts/X11/Type1/lmbxo10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmbxo10.afm usr/share/fonts/X11/Type1/lmbxo10.afm
+usr/share/texmf/fonts/type1/public/lm/lmcsc10.pfb usr/share/fonts/X11/Type1/lmcsc10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmcsc10.afm usr/share/fonts/X11/Type1/lmcsc10.afm
+usr/share/texmf/fonts/type1/public/lm/lmcsco10.pfb usr/share/fonts/X11/Type1/lmcsco10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmcsco10.afm usr/share/fonts/X11/Type1/lmcsco10.afm
+usr/share/texmf/fonts/type1/public/lm/lmdunh10.pfb usr/share/fonts/X11/Type1/lmdunh10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmdunh10.afm usr/share/fonts/X11/Type1/lmdunh10.afm
+usr/share/texmf/fonts/type1/public/lm/lmduno10.pfb usr/share/fonts/X11/Type1/lmduno10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmduno10.afm usr/share/fonts/X11/Type1/lmduno10.afm
+usr/share/texmf/fonts/type1/public/lm/lmr10.pfb usr/share/fonts/X11/Type1/lmr10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmr10.afm usr/share/fonts/X11/Type1/lmr10.afm
+usr/share/texmf/fonts/type1/public/lm/lmri10.pfb usr/share/fonts/X11/Type1/lmri10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmri10.afm usr/share/fonts/X11/Type1/lmri10.afm
+usr/share/texmf/fonts/type1/public/lm/lmro10.pfb usr/share/fonts/X11/Type1/lmro10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmro10.afm usr/share/fonts/X11/Type1/lmro10.afm
+usr/share/texmf/fonts/type1/public/lm/lmss10.pfb usr/share/fonts/X11/Type1/lmss10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmss10.afm usr/share/fonts/X11/Type1/lmss10.afm
+usr/share/texmf/fonts/type1/public/lm/lmssbo10.pfb usr/share/fonts/X11/Type1/lmssbo10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmssbo10.afm usr/share/fonts/X11/Type1/lmssbo10.afm
+usr/share/texmf/fonts/type1/public/lm/lmssbx10.pfb usr/share/fonts/X11/Type1/lmssbx10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmssbx10.afm usr/share/fonts/X11/Type1/lmssbx10.afm
+usr/share/texmf/fonts/type1/public/lm/lmssdc10.pfb usr/share/fonts/X11/Type1/lmssdc10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmssdc10.afm usr/share/fonts/X11/Type1/lmssdc10.afm
+usr/share/texmf/fonts/type1/public/lm/lmssdo10.pfb usr/share/fonts/X11/Type1/lmssdo10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmssdo10.afm usr/share/fonts/X11/Type1/lmssdo10.afm
+usr/share/texmf/fonts/type1/public/lm/lmsso10.pfb usr/share/fonts/X11/Type1/lmsso10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmsso10.afm usr/share/fonts/X11/Type1/lmsso10.afm
+usr/share/texmf/fonts/type1/public/lm/lmssq8.pfb usr/share/fonts/X11/Type1/lmssq8.pfb
+usr/share/texmf/fonts/afm/public/lm/lmssq8.afm usr/share/fonts/X11/Type1/lmssq8.afm
+usr/share/texmf/fonts/type1/public/lm/lmssqbo8.pfb usr/share/fonts/X11/Type1/lmssqbo8.pfb
+usr/share/texmf/fonts/afm/public/lm/lmssqbo8.afm usr/share/fonts/X11/Type1/lmssqbo8.afm
+usr/share/texmf/fonts/type1/public/lm/lmssqbx8.pfb usr/share/fonts/X11/Type1/lmssqbx8.pfb
+usr/share/texmf/fonts/afm/public/lm/lmssqbx8.afm usr/share/fonts/X11/Type1/lmssqbx8.afm
+usr/share/texmf/fonts/type1/public/lm/lmssqo8.pfb usr/share/fonts/X11/Type1/lmssqo8.pfb
+usr/share/texmf/fonts/afm/public/lm/lmssqo8.afm usr/share/fonts/X11/Type1/lmssqo8.afm
+usr/share/texmf/fonts/type1/public/lm/lmtcsc10.pfb usr/share/fonts/X11/Type1/lmtcsc10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmtcsc10.afm usr/share/fonts/X11/Type1/lmtcsc10.afm
+usr/share/texmf/fonts/type1/public/lm/lmtcso10.pfb usr/share/fonts/X11/Type1/lmtcso10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmtcso10.afm usr/share/fonts/X11/Type1/lmtcso10.afm
+usr/share/texmf/fonts/type1/public/lm/lmtk10.pfb usr/share/fonts/X11/Type1/lmtk10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmtk10.afm usr/share/fonts/X11/Type1/lmtk10.afm
+usr/share/texmf/fonts/type1/public/lm/lmtko10.pfb usr/share/fonts/X11/Type1/lmtko10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmtko10.afm usr/share/fonts/X11/Type1/lmtko10.afm
+usr/share/texmf/fonts/type1/public/lm/lmtl10.pfb usr/share/fonts/X11/Type1/lmtl10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmtl10.afm usr/share/fonts/X11/Type1/lmtl10.afm
+usr/share/texmf/fonts/type1/public/lm/lmtlc10.pfb usr/share/fonts/X11/Type1/lmtlc10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmtlc10.afm usr/share/fonts/X11/Type1/lmtlc10.afm
+usr/share/texmf/fonts/type1/public/lm/lmtlco10.pfb usr/share/fonts/X11/Type1/lmtlco10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmtlco10.afm usr/share/fonts/X11/Type1/lmtlco10.afm
+usr/share/texmf/fonts/type1/public/lm/lmtlo10.pfb usr/share/fonts/X11/Type1/lmtlo10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmtlo10.afm usr/share/fonts/X11/Type1/lmtlo10.afm
+usr/share/texmf/fonts/type1/public/lm/lmtt10.pfb usr/share/fonts/X11/Type1/lmtt10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmtt10.afm usr/share/fonts/X11/Type1/lmtt10.afm
+usr/share/texmf/fonts/type1/public/lm/lmtti10.pfb usr/share/fonts/X11/Type1/lmtti10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmtti10.afm usr/share/fonts/X11/Type1/lmtti10.afm
+usr/share/texmf/fonts/type1/public/lm/lmtto10.pfb usr/share/fonts/X11/Type1/lmtto10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmtto10.afm usr/share/fonts/X11/Type1/lmtto10.afm
+usr/share/texmf/fonts/type1/public/lm/lmu10.pfb usr/share/fonts/X11/Type1/lmu10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmu10.afm usr/share/fonts/X11/Type1/lmu10.afm
+usr/share/texmf/fonts/type1/public/lm/lmvtk10.pfb usr/share/fonts/X11/Type1/lmvtk10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmvtk10.afm usr/share/fonts/X11/Type1/lmvtk10.afm
+usr/share/texmf/fonts/type1/public/lm/lmvtko10.pfb usr/share/fonts/X11/Type1/lmvtko10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmvtko10.afm usr/share/fonts/X11/Type1/lmvtko10.afm
+usr/share/texmf/fonts/type1/public/lm/lmvtl10.pfb usr/share/fonts/X11/Type1/lmvtl10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmvtl10.afm usr/share/fonts/X11/Type1/lmvtl10.afm
+usr/share/texmf/fonts/type1/public/lm/lmvtlo10.pfb usr/share/fonts/X11/Type1/lmvtlo10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmvtlo10.afm usr/share/fonts/X11/Type1/lmvtlo10.afm
+usr/share/texmf/fonts/type1/public/lm/lmvtt10.pfb usr/share/fonts/X11/Type1/lmvtt10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmvtt10.afm usr/share/fonts/X11/Type1/lmvtt10.afm
+usr/share/texmf/fonts/type1/public/lm/lmvtto10.pfb usr/share/fonts/X11/Type1/lmvtto10.pfb
+usr/share/texmf/fonts/afm/public/lm/lmvtto10.afm usr/share/fonts/X11/Type1/lmvtto10.afm
diff --git a/debian/lmodern.links.in b/debian/lmodern.links.in
deleted file mode 100644
index f7086b4..0000000
--- a/debian/lmodern.links.in
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/doc/texmf/fonts/lm/README-Latin-Modern.TXT usr/share/doc/lmodern/README
-usr/share/doc/texmf/fonts/lm/MANIFEST-Latin-Modern.TXT usr/share/doc/lmodern/MANIFEST.txt
-usr/share/doc/texmf/fonts/lm/lm-hist.txt usr/share/doc/lmodern/lm-hist.txt
-usr/share/doc/texmf/fonts/lm/lm-info.pdf usr/share/doc/lmodern/lm-info.pdf
diff --git a/debian/rules b/debian/rules
index 191dd40..5204785 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,7 @@
#! /usr/bin/make -f
build: build-arch build-indep
-# We have nothing to do here but the Debian Policy says this target must
-# exist.
-
build-arch:
-# Nothing to do here
-
build-indep: build-indep-stamp
build-indep-stamp:
@@ -58,48 +53,31 @@ build-indep-stamp:
} >&2; \
fi
- # Generate the actual copyright file from copyright.in and
- # the GUST license
- cat debian/copyright.in doc/fonts/lm/GUST-FONT-LICENSE.TXT \
- > debian/copyright
-
touch build-indep-stamp
clean:
dh_testdir fonts/type1/public/lm/lmr10.pfb tex/latex/lm/lmodern.sty
dh_testroot
- # 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 is automatically generated from the .in file
- rm -f build-indep-stamp debian/lmodern.links debian/copyright
- dh_clean
-
-binary-indep: build-indep
- dh_testdir fonts/type1/public/lm/lmr10.pfb tex/latex/lm/lmodern.sty
- dh_testroot
+ # dh_clean removes *-stamp files from compat v7 upward
dh_clean
- # We will call dh_link only once for the build, with all desired links
- # 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, lmodern.links starts from the respective .in file
- cat debian/lmodern.links.in > debian/lmodern.links
-
+debian/x11links:
# 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
-
+ > debian/x11links
+
+binary-indep: build-indep
+ dh_testdir fonts/type1/public/lm/lmr10.pfb tex/latex/lm/lmodern.sty
+ dh_testroot
+ dh_clean
dh_install
dh_installxfonts
-
# the first call works only on the lmodern package, not all
dh_installtex map=Map,lm.map
# since we are shipping files in texmf trees, call dh_installtex, too
dh_installtex -p fonts-lmodern
-
dh_link
dh_installdocs
dh_installchangelogs
@@ -112,8 +90,6 @@ binary-indep: build-indep
dh_builddeb
binary-arch:
-# We have nothing to do here but the Debian Policy says this target must
-# exist.
binary: binary-indep binary-arch
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index adc24e7..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-lmodern source: no-debian-copyright
--
Debian packaging of lmodern)
Reply to: