Author: frank
Date: 2005-10-18 14:59:28 +0000 (Tue, 18 Oct 2005)
New Revision: 266
Modified:
tetex-base/branches/changelog-for-unstable/debian/patches/patch-doc
tetex-base/branches/changelog-for-unstable/debian/rules
tetex-base/branches/changelog-for-unstable/debian/rules.d/install.mk
Log:
merging changes from HEAD to changelog-for-unstable branch
Modified: tetex-base/branches/changelog-for-unstable/debian/patches/patch-doc
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/patches/patch-doc
2005-10-18 14:52:02 UTC (rev 265)
+++ tetex-base/branches/changelog-for-unstable/debian/patches/patch-doc
2005-10-18 14:59:28 UTC (rev 266)
@@ -1,5 +1,11 @@
---- doc/index.html.orig 2005-08-07 21:14:09.372143789 +0200
-+++ doc/index.html 2005-08-07 21:14:09.521127844 +0200
+ doc/index.html | 546
++++++++++++++++++++++++++++----------------------------
+ doc/mkhtml.nawk | 18 +
+ 2 files changed, 290 insertions(+), 274 deletions(-)
+
+Index: tetex-base-3.0/doc/index.html
+===================================================================
+--- tetex-base-3.0.orig/doc/index.html 2005-10-06 14:55:14.080728894 +0200
++++ tetex-base-3.0/doc/index.html 2005-10-06 15:02:46.278010216 +0200
@@ -95,15 +95,17 @@
</form>
</td></tr></table><br/><br/>
@@ -1114,8 +1120,10 @@
info system and printed manuals. Also included is <code>texi2html</code>
which will convert texinfo files to html.</p>
---- doc/mkhtml.nawk.orig 2005-08-07 21:14:09.375143468 +0200
-+++ doc/mkhtml.nawk 2005-08-07 21:14:09.522127737 +0200
+Index: tetex-base-3.0/doc/mkhtml.nawk
+===================================================================
+--- tetex-base-3.0.orig/doc/mkhtml.nawk 2005-10-06 14:55:14.080728894
+0200
++++ tetex-base-3.0/doc/mkhtml.nawk 2005-10-06 15:02:46.278010216 +0200
@@ -1,7 +1,21 @@
-#!/bin/sh
+#!/bin/sh -e
Modified: tetex-base/branches/changelog-for-unstable/debian/rules
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/rules 2005-10-18
14:52:02 UTC (rev 265)
+++ tetex-base/branches/changelog-for-unstable/debian/rules 2005-10-18
14:59:28 UTC (rev 266)
@@ -5,7 +5,7 @@
# The debian/rules(.in) file was nearly completely rewritten by
# Frank K�ster [EMAIL PROTECTED] in 2004, with patches by
-# Florian Rougon <[EMAIL PROTECTED]>, 2005,
+# Florent Rougon <[EMAIL PROTECTED]>, 2005,
#
# who share the copyright.
@@ -17,7 +17,8 @@
EPERL_FILES := debian/preinst debian/postinst debian/postrm \
debian/tetex-base.dirs \
- debian/tetex-extra.postinst debian/tetex-extra.postrm
debian/tetex-extra.dirs \
+ debian/tetex-extra.postinst debian/tetex-extra.preinst \
+ debian/tetex-extra.postrm debian/tetex-extra.dirs \
debian/setup-ucf debian/setup-conflinks \
debian/common.functions
eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
@@ -43,9 +44,12 @@
include debian/rules.d/filelists.mk
include debian/rules.d/install.mk
-export DSF-PATCHLIST=debian/patches/patchlist.mk
-include /usr/share/dsfp/dsf-patch.mk
+# export DSF-PATCHLIST=debian/patches/patchlist.mk
+# include /usr/share/dsfp/dsf-patch.mk
+# needed for quilt:
+export QUILT_PATCHES=./debian/patches
+
### variables from eperl that need to be passed to the static helper makefiles
FONTMAP_MEMORY_DIR=/var/lib/tex-common/fontmap-cfg
@@ -118,7 +122,7 @@
touch $@
$(stampdir)/build-stamp: $(stampdir) patch-stamp
- $(check-cvs)
+ $(check-svn)
dh_testdir
# Make sure that our build scripts are executable.
# (only needed after upstream changes)
@@ -126,7 +130,16 @@
touch $(stampdir)/build-stamp
+# quilt patch targets
+clean-patches:
+ -quilt pop -a
+ rm -f patch-stamp
+patch-stamp:
+ quilt push -a
+ touch $@
+
+
### Clean up the source tree.
clean: clean-patches
dh_testdir
@@ -156,7 +169,7 @@
touch $(stampdir)/install-stamp
binary-indep: build install
- $(check-cvs)
+ $(check-svn)
dh_testdir
dh_testroot
# no debconf questions currently
@@ -209,7 +222,7 @@
debian/sarge-stamp:
cp debian/changelog debian/sarge/changelog.sid
- sed -e s/3.0-X// debian/sarge/changelog.sid \
+ sed -e s/3.0-9/3.0-9.0.sarge1/ debian/sarge/changelog.sid \
> debian/changelog && rm debian/sid-stamp
# need to remake rules
touch debian/rules.in
@@ -224,9 +237,9 @@
.PHONY: build clean binary-indep binary-arch binary install sarge sid
.PHONY: commonstuff_update
-define check-cvs
- test -d debian/CVS && \
- (echo "please clean CVS directories"; exit 1) || true
+define check-svn
+ test -d debian/.svn && \
+ (echo "please clean subversion directories"; exit 1) || true
endef
# Local Variables:
Modified: tetex-base/branches/changelog-for-unstable/debian/rules.d/install.mk
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/rules.d/install.mk
2005-10-18 14:52:02 UTC (rev 265)
+++ tetex-base/branches/changelog-for-unstable/debian/rules.d/install.mk
2005-10-18 14:59:28 UTC (rev 266)
@@ -4,7 +4,7 @@
fonts/type1/public/lm/
preview-latex-dirs = doc/latex/preview/ tex/latex/preview
pgf-dirs = tex/latex/pgf doc/latex/pgf
-xcolor-dirs = tex/latex/xcolor
+xcolor-dirs = tex/latex/xcolor doc/latex/xcolor
texinfo-dirs = tex/texinfo
beamer-dirs = tex/latex/beamer doc/latex/beamer
remove-dirs = $(lmdirs) $(preview-latex-dirs) $(pgf-dirs) $(xcolor-dirs)
$(texinfo-dirs) $(beamer-dirs)
_______________________________________________
Pkg-tetex-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-tetex-commits
