[Debian-tex-commits] SVN tetex-base commit + diffs: r2035 - in tetex-base/trunk/debian: . patches

[Frank Küster]

Author: frank
Date: 2006-12-11 08:23:54 +0100 (Mon, 11 Dec 2006)
New Revision: 2035

Modified:
   tetex-base/trunk/debian/patches/patch-texdocphp
   tetex-base/trunk/debian/tetex-doc.postinst
   tetex-base/trunk/debian/tetex-doc.postrm
Log:
fix paths in texdoc.php's config.php, and add maintainer script calls
to restart apache appropriately


Modified: tetex-base/trunk/debian/patches/patch-texdocphp
===================================================================
--- tetex-base/trunk/debian/patches/patch-texdocphp	2006-12-11 07:19:37 UTC (rev 2034)
+++ tetex-base/trunk/debian/patches/patch-texdocphp	2006-12-11 07:23:54 UTC (rev 2035)
@@ -1,12 +1,12 @@
- doc/tdphp/config.php       |   10 ++++------
+ doc/tdphp/config.php       |   14 +++++++-------
  doc/tdphp/texdocfooter.php |    2 +-
- 2 files changed, 5 insertions(+), 7 deletions(-)
+ 2 files changed, 8 insertions(+), 8 deletions(-)
 
-Index: tetex-base-3.0/doc/tdphp/config.php
+Index: trunk/doc/tdphp/config.php
 ===================================================================
---- 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 @@
+--- trunk.orig/doc/tdphp/config.php	2006-12-07 15:17:06.000000000 +0100
++++ trunk/doc/tdphp/config.php	2006-12-07 17:14:35.000000000 +0100
+@@ -18,19 +18,19 @@
  ### 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.
@@ -17,17 +17,26 @@
 -			  '' => '../../../texmf/',
 -			  'local' => '../../../texmf-local/' );
 +$texmftrees['fs'] = array( '' => '../../../texmf-tetex/',
-+                          'main' => '../../../texmf',
++			   'main' => '../../../texmf',
 +                          'local' => '../../../../local/share/texmf/');
-+$texmftrees['url'] = array( '' => '../../../texmf/',
-+			  'local' => '../../../../local/share/texmf/' );
++$texmftrees['url'] = array( '' => '../../../texmf-tetex/',
++			    'main' => '../../../texmf/',
++			    'local' => '../../../../local/share/texmf/' );
  ### Support for variable names in the *.dat files.
  ### One might argue that several names may be admissible
  ### in each of one or more trees; then values should be arrays
-Index: tetex-base-3.0/doc/tdphp/texdocfooter.php
+ ### and code will need to be changed with one more loop.
+ $texmftrees['datname'] = array( 'local' => 'texdoctk-local.dat',
+ 			  '' => 'texdoctk.dat',
+-			  'dist' => 'texdoctk.dat' );
++			  'main' => 'texdoctk.dat' );
+ ### How to invoke kpsewhich; if you have more than one teTeX installation
+ ### use a full path
+ #$kpsewhich="/usr/local/teTeX/bin/i686-pc-linux-gnu/kpsewhich";
+Index: trunk/doc/tdphp/texdocfooter.php
 ===================================================================
---- 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
+--- trunk.orig/doc/tdphp/texdocfooter.php	2006-12-07 15:17:06.000000000 +0100
++++ trunk/doc/tdphp/texdocfooter.php	2006-12-07 17:14:48.000000000 +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/tetex-doc.postinst
===================================================================
--- tetex-base/trunk/debian/tetex-doc.postinst	2006-12-11 07:19:37 UTC (rev 2034)
+++ tetex-base/trunk/debian/tetex-doc.postinst	2006-12-11 07:23:54 UTC (rev 2035)
@@ -6,6 +6,15 @@
     test -x "`which mktexlsr`" && mktexlsr || true
 # disable this for now    
     # index-tetexdoc
+    if test -e /etc/apache2/mods-enabled/php5.load ||
+      test -e /etc/apache2/mods-enabled/php4.load; then
+      if apache2ctl configtest 2>/dev/null; then
+	invoke-rc.d apache2 force-reload || true
+      else
+	echo "apache2 not installed, or configuration broken."
+	echo "we're not restarting it for you."
+      fi
+    fi
     ;;
   *)
     ;;

Modified: tetex-base/trunk/debian/tetex-doc.postrm
===================================================================
--- tetex-base/trunk/debian/tetex-doc.postrm	2006-12-11 07:19:37 UTC (rev 2034)
+++ tetex-base/trunk/debian/tetex-doc.postrm	2006-12-11 07:23:54 UTC (rev 2035)
@@ -4,9 +4,15 @@
 
 case "$1" in
   remove|failed-upgrade)
-    if [ -x /usr/bin/mktexlsr ]; then
-      /usr/bin/mktexlsr
-#      rm -f /var/lib/texmf/helpindex.html
+    test -x "`which mktexlsr`" && mktexlsr || true
+    APACHE_MODDIR=/etc/apache2/mods-enabled/
+    if [ -e $APACHE_MODDIR/php5.load ] || [ -e $APACHE_MODDIR/php4.load ]; then
+      if apache2ctl configtest 2>/dev/null; then
+	invoke-rc.d apache2 force-reload || true
+      else
+	echo "apache2 not installed, or configuration broken."
+	echo "we're not restarting it for you."
+      fi
     fi
     ;;
 esac