Author: frank
Date: 2006-01-18 08:13:32 +0000 (Wed, 18 Jan 2006)
New Revision: 466
Modified:
tetex-base/trunk/debian/changelog
tetex-base/trunk/debian/patches/patch-doc
tetex-base/trunk/debian/patches/patch-texdocphp
tetex-base/trunk/debian/rules
tetex-base/trunk/debian/tetex-doc.postrm
Log:
* Also adapt texdoc.php to TEXMFSITE [frank]
* Don't insist on removing helpindex.html in tetex-doc's postinst,
because it might not exist; also provide an upgrade path. Thanks to
Rene Engelhard <[EMAIL PROTECTED]> (closes: #348614) [frank]
Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog 2006-01-17 15:26:16 UTC (rev 465)
+++ tetex-base/trunk/debian/changelog 2006-01-18 08:13:32 UTC (rev 466)
@@ -1,10 +1,15 @@
tetex-base (3.0-12.1) UNRELEASED; urgency=low
+ * The "Mind your docs" release
* Update the main documentation index to link to files in TEXMFSITE, and
update some upstream links - many thanks to Braun Gabor
<[EMAIL PROTECTED]> (closes: #347931) [frank]
+ * Also adapt texdoc.php to TEXMFSITE [frank]
+ * Don't insist on removing helpindex.html in tetex-doc's postinst,
+ because it might not exist; also provide an upgrade path. Thanks to
+ Rene Engelhard <[EMAIL PROTECTED]> (closes: #348614) [frank]
- -- Frank Küster <[EMAIL PROTECTED]> Tue, 17 Jan 2006 16:26:54 +0100
+ -- Frank Küster <[EMAIL PROTECTED]> Wed, 18 Jan 2006 09:12:44 +0100
tetex-base (3.0-12) unstable; urgency=low
Modified: tetex-base/trunk/debian/patches/patch-doc
===================================================================
--- tetex-base/trunk/debian/patches/patch-doc 2006-01-17 15:26:16 UTC (rev
465)
+++ tetex-base/trunk/debian/patches/patch-doc 2006-01-18 08:13:32 UTC (rev
466)
@@ -4,8 +4,8 @@
Index: tetex-base-3.0/doc/index.html
===================================================================
---- tetex-base-3.0.orig/doc/index.html 2005-10-19 15:44:41.000000000 +0200
-+++ tetex-base-3.0/doc/index.html 2006-01-17 16:24:34.343961752 +0100
+--- tetex-base-3.0.orig/doc/index.html 2006-01-17 16:24:58.727254928 +0100
++++ tetex-base-3.0/doc/index.html 2006-01-17 17:05:53.078136880 +0100
@@ -55,6 +55,7 @@
-->
<head>
@@ -1206,8 +1206,8 @@
Index: tetex-base-3.0/doc/mkhtml.nawk
===================================================================
---- tetex-base-3.0.orig/doc/mkhtml.nawk 2005-10-19 15:44:41.000000000
+0200
-+++ tetex-base-3.0/doc/mkhtml.nawk 2006-01-17 16:23:02.710892096 +0100
+--- tetex-base-3.0.orig/doc/mkhtml.nawk 2006-01-17 16:24:58.728254776
+0100
++++ tetex-base-3.0/doc/mkhtml.nawk 2006-01-17 17:05:53.079136728 +0100
@@ -1,16 +1,30 @@
-#!/bin/sh
+#!/bin/sh -e
Modified: tetex-base/trunk/debian/patches/patch-texdocphp
===================================================================
--- tetex-base/trunk/debian/patches/patch-texdocphp 2006-01-17 15:26:16 UTC
(rev 465)
+++ tetex-base/trunk/debian/patches/patch-texdocphp 2006-01-18 08:13:32 UTC
(rev 466)
@@ -4,9 +4,9 @@
Index: tetex-base-3.0/doc/tdphp/config.php
===================================================================
---- tetex-base-3.0.orig/doc/tdphp/config.php 2005-10-06 14:55:14.117724932
+0200
-+++ tetex-base-3.0/doc/tdphp/config.php 2005-10-06 15:02:42.213446514
+0200
-@@ -18,12 +18,10 @@
+--- tetex-base-3.0.orig/doc/tdphp/config.php 2006-01-17 17:22:34.443906144
+0100
++++ tetex-base-3.0/doc/tdphp/config.php 2006-01-17 17:23:04.858282456
+0100
+@@ -18,12 +18,11 @@
### End paths with slashes /
### Always start with dist tree so that its section order is preserved
### in case there are missing or extra sections in the other *.dat files.
@@ -16,7 +16,8 @@
-$texmftrees['url'] = array( 'dist' => '../../../texmf-dist/',
- '' => '../../../texmf/',
- 'local' => '../../../texmf-local/' );
-+$texmftrees['fs'] = array( '' => '../../../texmf/',
++$texmftrees['fs'] = array( '' => '../../../texmf-tetex/',
++ 'main' => '../../../texmf',
+ 'local' => '../../../../local/share/texmf/');
+$texmftrees['url'] = array( '' => '../../../texmf/',
+ 'local' => '../../../../local/share/texmf/' );
@@ -25,8 +26,8 @@
### in each of one or more trees; then values should be arrays
Index: tetex-base-3.0/doc/tdphp/texdocfooter.php
===================================================================
---- tetex-base-3.0.orig/doc/tdphp/texdocfooter.php 2005-10-06
14:55:14.117724932 +0200
-+++ tetex-base-3.0/doc/tdphp/texdocfooter.php 2005-10-06 15:02:42.214446407
+0200
+--- tetex-base-3.0.orig/doc/tdphp/texdocfooter.php 2006-01-17
17:22:34.443906144 +0100
++++ tetex-base-3.0/doc/tdphp/texdocfooter.php 2006-01-17 17:22:35.954676472
+0100
@@ -7,7 +7,7 @@
<p valign="top" style="font-size:smaller"><img src="teTeXsmall.png" />A PHP
version of texdoctk. Underlying texmf trees from teTeX <em>
<?php
Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules 2006-01-17 15:26:16 UTC (rev 465)
+++ tetex-base/trunk/debian/rules 2006-01-18 08:13:32 UTC (rev 466)
@@ -220,7 +220,7 @@
debian/sarge-stamp:
cp debian/changelog debian/sarge/changelog.sid
- sed -e s/3.0-12/3.0-11sarge12/ debian/sarge/changelog.sid \
+ sed -e s/3.0-12.1/3.0-11sarge12.1/ debian/sarge/changelog.sid \
> debian/changelog && rm debian/sid-stamp
# need to remake rules
touch debian/rules.in
Modified: tetex-base/trunk/debian/tetex-doc.postrm
===================================================================
--- tetex-base/trunk/debian/tetex-doc.postrm 2006-01-17 15:26:16 UTC (rev
465)
+++ tetex-base/trunk/debian/tetex-doc.postrm 2006-01-18 08:13:32 UTC (rev
466)
@@ -1,10 +1,14 @@
#!/bin/sh
set -e
-if [ x"$1" = "xremove" -a -x /usr/bin/mktexlsr ]
-then
- /usr/bin/mktexlsr
- rm /var/lib/texmf/helpindex.html
-fi
+case "$1" in
+ remove|failed-upgrade)
+ if [ -x /usr/bin/mktexlsr ]; then
+ /usr/bin/mktexlsr
+ rm -f /var/lib/texmf/helpindex.html
+ fi
+ ;;
+esac
+
#DEBHELPER#
_______________________________________________
Pkg-tetex-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-tetex-commits
