Author: frank
Date: 2005-12-05 15:17:32 +0000 (Mon, 05 Dec 2005)
New Revision: 373
Modified:
tetex-base/trunk/debian/changelog
tetex-base/trunk/debian/rules.d/filelists.mk
tetex-base/trunk/debian/rules.d/install.mk
tetex-base/trunk/debian/rules.in
Log:
Install files in TEXMFDIST, i.e. /usr/share/texmf-tetex [frank]
Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog 2005-12-05 15:14:13 UTC (rev 372)
+++ tetex-base/trunk/debian/changelog 2005-12-05 15:17:32 UTC (rev 373)
@@ -6,8 +6,9 @@
* Remove tetex-extra's format and log files when the package is removed,
thanks to Kevin B. McCarty <[EMAIL PROTECTED]> (closes: #341110)
[frank]
+ * Install files in TEXMFDIST, i.e. /usr/share/texmf-tetex [frank]
- -- Frank Küster <[EMAIL PROTECTED]> Fri, 2 Dec 2005 17:28:54 +0100
+ -- Frank Küster <[EMAIL PROTECTED]> Mon, 5 Dec 2005 16:17:26 +0100
tetex-base (3.0-10) unstable; urgency=low
Modified: tetex-base/trunk/debian/rules.d/filelists.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/filelists.mk 2005-12-05 15:14:13 UTC
(rev 372)
+++ tetex-base/trunk/debian/rules.d/filelists.mk 2005-12-05 15:17:32 UTC
(rev 373)
@@ -32,7 +32,7 @@
# internal variables for Makefile function
debian_filelists=debian/tetex-doc.files debian/tetex-extra.files
-destdir=debian/tetex-base/usr/share/texmf
+destdir=debian/tetex-base/usr/share/texmf-tetex
filelists: build $(stampdir)/copy-texmf-stamp $(stampdir)/install-remove-stamp
filelists: $(stampdir)/filelists-stamp
@@ -57,7 +57,7 @@
## Generate the pattern on-the-fly, catching some stuff we may have
## been missing.
(docpattern=`find $(destdir)/doc -mindepth 1 -maxdepth 1 -type d -print
| \
- sed -e 's#debian/tetex-base/usr/share/texmf#|#' | \
+ sed -e 's#debian/tetex-base/usr/share/texmf-tetex#|#' | \
awk -F"\n" '{ORS="";print $$1}' | \
sed -e 's/^|//'` && \
grep -E "$$docpattern" $(stampdir)/files.all > $(stampdir)/files.doc)
@@ -112,7 +112,7 @@
debian/tetex-extra.files : $(stampdir)/files.extra
# Process files.extra into a debian/tetex-extra.files file that can be
# used by dh_movefiles; cater for files that are going to be moved to /etc
- sed -e
"s#debian/tetex-base/##;s#usr/share/texmf/fonts/map#etc/texmf/map#" \
+ sed -e
"s#debian/tetex-base/##;s#usr/share/texmf-tetex/fonts/map#etc/texmf/map#" \
$(stampdir)/files.extra > debian/tetex-extra.files
Modified: tetex-base/trunk/debian/rules.d/install.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/install.mk 2005-12-05 15:14:13 UTC (rev
372)
+++ tetex-base/trunk/debian/rules.d/install.mk 2005-12-05 15:17:32 UTC (rev
373)
@@ -23,7 +23,7 @@
$(stampdir)/copy-texmf-stamp: $(stampdir)/build-stamp
$(stampdir)/setup-install-stamp
# Copy the whole texmf tree to the install directory.
- cp -a `ls -1 | egrep -v 'debian|stampdir'`
debian/$(package)/usr/share/texmf
+ cp -a `ls -1 | egrep -v 'debian|stampdir'` $(txmfdir)
touch $@
install-remove: $(stampdir)/install-remove-stamp
@@ -54,11 +54,11 @@
## documentation and licensing stuff
# Move the documentation directory from the texmf tree to /usr/share/doc in
tetex-doc
- mv debian/$(package)/usr/share/texmf/doc
debian/$(docpack)/usr/share/doc/texmf
+ mv debian/$(package)/usr/share/texmf-tetex/doc
debian/$(docpack)/usr/share/doc/texmf
# Remove unneeded files in tetex-doc
rm debian/$(docpack)/usr/share/doc/texmf/Makefile
# Create a link within the texmf tree to the documentation.
- (cd debian/$(package)/usr/share/texmf/; ln -s ../doc/texmf doc)
+ (cd debian/$(package)/usr/share/texmf-tetex/; ln -s ../doc/texmf doc)
# Create a link within the package doc directory to the documentation.
(cd debian/$(package)/usr/share/doc/tetex-base/; ln -s ../texmf texmf)
@@ -126,7 +126,7 @@
ln -s ../sites-available/tetex-doc
debian/$(docpack)/etc/apache2/sites-enabled/050-tetex-doc
# disable this for now
# mv debian/$(docpack)/usr/share/doc/texmf/mkhtml.nawk
debian/$(docpack)/usr/bin/index-tetexdoc
- # chmod a+x debian/$(docpack)/usr/bin/index-tetexdoc
+ # chmod a+x debian/$(docpack)/usr/bin/index-tetexdoc
# cp debian/index-tetexdoc.1 debian/$(docpack)/usr/share/man/man1/
touch $@
@@ -136,10 +136,10 @@
rm debian/$(package)/usr/share/doc/texmf/fonts/marvosym/marvosym.pfb
define remove-emptybasedirs
- find debian/$(package)/usr/share/texmf -type d -empty | xargs rmdir ||
true
- find debian/$(package)/usr/share/texmf -type d -empty | xargs rmdir ||
true
- find debian/$(package)/usr/share/texmf -type d -empty | xargs rmdir ||
true
- find debian/$(package)/usr/share/doc/texmf -type d -empty | xargs rmdir
|| true
- find debian/$(package)/usr/share/doc/texmf -type d -empty | xargs rmdir
|| true
- find debian/$(package)/usr/share/doc/texmf -type d -empty | xargs rmdir
|| true
+ find debian/$(package)/usr/share/texmf-tetex -type d -empty | xargs
rmdir || true
+ find debian/$(package)/usr/share/texmf-tetex -type d -empty | xargs
rmdir || true
+ find debian/$(package)/usr/share/texmf-tetex -type d -empty | xargs
rmdir || true
+ find debian/$(package)/usr/share/doc/texmf-tetex -type d -empty | xargs
rmdir || true
+ find debian/$(package)/usr/share/doc/texmf-tetex -type d -empty | xargs
rmdir || true
+ find debian/$(package)/usr/share/doc/texmf-tetex -type d -empty | xargs
rmdir || true
endef
Modified: tetex-base/trunk/debian/rules.in
===================================================================
--- tetex-base/trunk/debian/rules.in 2005-12-05 15:14:13 UTC (rev 372)
+++ tetex-base/trunk/debian/rules.in 2005-12-05 15:17:32 UTC (rev 373)
@@ -37,8 +37,8 @@
package=tetex-base
extra=tetex-extra
docpack=tetex-doc
-txmfdir=debian/$(package)/usr/share/texmf
-extxmfdir=debian/$(extra)/usr/share/texmf
+txmfdir=debian/$(package)/usr/share/texmf-tetex
+extxmfdir=debian/$(extra)/usr/share/texmf-tetex
vardir=debian/$(package)/var/lib/texmf
pkgdir=debian/$(package)/usr/share/tetex-base
etcdir=/etc/texmf
_______________________________________________
Pkg-tetex-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-tetex-commits
