[SCM] Debian packaging of tex-gyre) branch, master, updated. upstream/2.004.1-14-g32fd070
The following commit has been merged in the master branch:
commit 50eb2c97263fe93c4266a7f9c24f223ca47fd450
Author: Norbert Preining <preining@debian.org>
Date: Tue Oct 9 08:56:45 2012 +0900
link doc files to both font packages
add breaks against old tex-gyre packages
diff --git a/debian/changelog b/debian/changelog
index aeceee7..c0c1c02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tex-gyre (2.004.1-5~1) experimental; urgency=low
+tex-gyre (2.004.1-5~2) experimental; urgency=low
Thanks to Fabian Greffrath who provided the fontconfig conf files,
did lots of inquire and testing.
@@ -11,7 +11,7 @@ tex-gyre (2.004.1-5~1) experimental; urgency=low
* bump standards version, shut lintian up since we create the
copyright file
- -- Norbert Preining <preining@debian.org> Mon, 08 Oct 2012 16:54:37 +0900
+ -- Norbert Preining <preining@debian.org> Tue, 09 Oct 2012 08:57:15 +0900
tex-gyre (2.004.1-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 928ed94..6f7f9d0 100644
--- a/debian/control
+++ b/debian/control
@@ -62,6 +62,7 @@ Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}
Replaces: tex-gyre (<= 2.004.1-4)
+Breaks: tex-gyre (<= 2.004.1-4)
Description: OpenType fonts based on URW Fonts
The TeX Gyre project, following the Latin Modern project, aims at providing
a rich collection of diacritical characters in the attempt to cover as many
diff --git a/debian/rules b/debian/rules
index 4fe6bbe..d78380a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -120,7 +120,6 @@ binary-indep: build-indep
usr/share/texmf/fonts/enc/dvips/tex-gyre \
usr/share/texmf/fonts/map/dvips/tex-gyre \
usr/share/texmf/tex/latex/tex-gyre \
- usr/share/doc/texmf/fonts/tex-gyre \
etc/X11/fonts/Type1 \
etc/fonts/conf.avail \
usr/share/fonts/X11/Type1 \
@@ -128,6 +127,7 @@ binary-indep: build-indep
dh_installdirs -p $(PKGFONTS) \
usr/share/texmf/fonts/opentype/public/tex-gyre \
+ usr/share/doc/texmf/fonts/tex-gyre \
etc/fonts/conf.avail
@@ -179,23 +179,24 @@ binary-indep: build-indep
for file in doc/fonts/tex-gyre/*; do \
$(INSTALL_FILE) "$$file" \
- "$(PKG_INSTALL_DIR)/usr/share/doc/texmf/fonts/tex-gyre"; \
+ "$(PKGFONTS_INSTALL_DIR)/usr/share/doc/texmf/fonts/tex-gyre"; \
done
# Install the standard conffile for update-updmap
dh_installtex mapfile=debian/tex-gyre.cfg
dh_installtex -p $(PKGFONTS)
- dh_link \
- $(foreach FAM, $(FAMILYNAMES), \
- usr/share/doc/texmf/fonts/tex-gyre/README-TeX-Gyre-$(FAM).txt \
- usr/share/doc/tex-gyre/README-TeX-Gyre-$(FAM).txt) \
- $(foreach FAM, $(FAMILIES), \
- usr/share/doc/texmf/fonts/tex-gyre/$(FAM)-info.pdf \
- usr/share/doc/tex-gyre/$(FAM)-info.pdf) \
- $(foreach FAM, $(FAMILIES), \
- usr/share/doc/texmf/fonts/tex-gyre/$(FAM)-hist.txt \
- usr/share/doc/tex-gyre/$(FAM)-hist.txt)
+ $(foreach PPP, $(PKG) $(PKGFONTS), \
+ dh_link -p $(PPP) \
+ $(foreach FAM, $(FAMILYNAMES), \
+ usr/share/doc/texmf/fonts/tex-gyre/README-TeX-Gyre-$(FAM).txt \
+ usr/share/doc/$(PPP)/README-TeX-Gyre-$(FAM).txt) \
+ $(foreach FAM, $(FAMILIES), \
+ usr/share/doc/texmf/fonts/tex-gyre/$(FAM)-info.pdf \
+ usr/share/doc/$(PPP)/$(FAM)-info.pdf) \
+ $(foreach FAM, $(FAMILIES), \
+ usr/share/doc/texmf/fonts/tex-gyre/$(FAM)-hist.txt \
+ usr/share/doc/$(PPP)/$(FAM)-hist.txt) ; )
dh_link -p $(PKGFONTS) \
etc/fonts/conf.avail/65-$(PKG).conf \
etc/fonts/conf.d/65-$(PKG).conf \
--
Debian packaging of tex-gyre)
Reply to: