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

[Frank Küster]

Author: frank
Date: 2006-12-11 11:35:38 +0100 (Mon, 11 Dec 2006)
New Revision: 2043

Modified:
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/patches/patch-texdocphp
   tetex-base/trunk/debian/tetex-doc.apache2.conf.d
Log:
- fix path in tdphp/config.php

- add apache alias for TEXMFMAIN/doc


Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2006-12-11 10:09:22 UTC (rev 2042)
+++ tetex-base/trunk/debian/changelog	2006-12-11 10:35:38 UTC (rev 2043)
@@ -12,7 +12,7 @@
     thanks to "Mario 'BitKoenig' Holbe" <Mario.Holbe at TU-Ilmenau.DE>
     (closes: #402117) [frank]
 
- --
+ -- Frank Küster <frank at debian.org>  Mon, 11 Dec 2006 08:24:45 +0100
 
 tetex-base (3.0.dfsg.3-2) unstable; urgency=low
 

Modified: tetex-base/trunk/debian/patches/patch-texdocphp
===================================================================
--- tetex-base/trunk/debian/patches/patch-texdocphp	2006-12-11 10:09:22 UTC (rev 2042)
+++ tetex-base/trunk/debian/patches/patch-texdocphp	2006-12-11 10:35:38 UTC (rev 2043)
@@ -4,8 +4,8 @@
 
 Index: trunk/doc/tdphp/config.php
 ===================================================================
---- 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
+--- trunk.orig/doc/tdphp/config.php	2006-12-11 08:30:49.000000000 +0100
++++ trunk/doc/tdphp/config.php	2006-12-11 11:18:17.000000000 +0100
 @@ -18,19 +18,19 @@
  ### End paths with slashes /
  ### Always start with dist tree so that its section order is preserved
@@ -17,7 +17,7 @@
 -			  '' => '../../../texmf/',
 -			  'local' => '../../../texmf-local/' );
 +$texmftrees['fs'] = array( '' => '../../../texmf-tetex/',
-+			   'main' => '../../../texmf',
++			   'main' => '../../../texmf/',
 +                          'local' => '../../../../local/share/texmf/');
 +$texmftrees['url'] = array( '' => '../../../texmf-tetex/',
 +			    'main' => '../../../texmf/',
@@ -35,8 +35,8 @@
  #$kpsewhich="/usr/local/teTeX/bin/i686-pc-linux-gnu/kpsewhich";
 Index: trunk/doc/tdphp/texdocfooter.php
 ===================================================================
---- 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
+--- trunk.orig/doc/tdphp/texdocfooter.php	2006-12-11 08:30:49.000000000 +0100
++++ trunk/doc/tdphp/texdocfooter.php	2006-12-11 09:09:39.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.apache2.conf.d
===================================================================
--- tetex-base/trunk/debian/tetex-doc.apache2.conf.d	2006-12-11 10:09:22 UTC (rev 2042)
+++ tetex-base/trunk/debian/tetex-doc.apache2.conf.d	2006-12-11 10:35:38 UTC (rev 2043)
@@ -13,7 +13,17 @@
     Deny from all
     Allow from 127.0.0.0/255.0.0.0 ::1/128
   </Directory>
+
+  Alias /texmf /usr/share/texmf
+  <Directory /usr/share/texmf>
+    Options Indexes MultiViews FollowSymlinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+    Allow from 127.0.0.0/255.0.0.0 ::1/128
+  </Directory>
 </IfModule>
+
 <IfModule mod_php4.c>
   Alias /texmf-tetex /usr/share/texmf-tetex
   <Directory /usr/share/texmf-tetex>
@@ -23,4 +33,13 @@
     Deny from all
     Allow from 127.0.0.0/255.0.0.0 ::1/128
   </Directory>
+
+  Alias /texmf /usr/share/texmf
+  <Directory /usr/share/texmf>
+    Options Indexes MultiViews FollowSymlinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+    Allow from 127.0.0.0/255.0.0.0 ::1/128
+  </Directory>
 </IfModule>