[subversion-commit] SVN tetex-base commit + diffs: r1415 - tetex-base/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-06-06 13:23:10 +0000 (Tue, 06 Jun 2006)
New Revision: 1415

Modified:
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/rules
   tetex-base/trunk/debian/tetex-doc.apache2.sites-available
Log:
fix tetex-doc link in apache configuration;
propagete change from rules.in to rules

Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2006-06-02 23:53:54 UTC (rev 1414)
+++ tetex-base/trunk/debian/changelog	2006-06-06 13:23:10 UTC (rev 1415)
@@ -1,3 +1,11 @@
+tetex-base (3.0-18.1) UNRELEASED; urgency=low
+
+  * Adjust the directory name in the apache configuration file to the new
+    location of the teTeX documentation, thanks to Vincent Danjean
+    <Vincent.Danjean at ens-lyon.org> (closes: #370660)
+
+ -- Frank Küster <frank at debian.org>  Tue,  6 Jun 2006 15:21:53 +0200
+
 tetex-base (3.0-18) unstable; urgency=low
 
   * Add a PDF documentation file for pst-poly which is only present as

Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules	2006-06-02 23:53:54 UTC (rev 1414)
+++ tetex-base/trunk/debian/rules	2006-06-06 13:23:10 UTC (rev 1415)
@@ -202,7 +202,7 @@
 	ln -s tetex-base debian/$(extra)/usr/share/doc/tetex-extra
 #	rm -rf debian/xfonts-tetex/usr/share/doc/xfonts-tetex
 #	(cd debian/xfonts-tetex/usr/share/doc/; ln -s tetex-extra-fonts xfonts-tetex)
-	ln -s ../texmf debian/$(docpack)/usr/share/doc/$(docpack)/
+#	ln -s ../texmf debian/$(docpack)/usr/share/doc/$(docpack)/
 
 	dh_installchangelogs ChangeLog -p tetex-base -p tetex-doc
 	cp debian/changelog.Debian.experimental debian/$(package)/usr/share/doc/$(package)/

Modified: tetex-base/trunk/debian/tetex-doc.apache2.sites-available
===================================================================
--- tetex-base/trunk/debian/tetex-doc.apache2.sites-available	2006-06-02 23:53:54 UTC (rev 1414)
+++ tetex-base/trunk/debian/tetex-doc.apache2.sites-available	2006-06-06 13:23:10 UTC (rev 1415)
@@ -1,10 +1,10 @@
 # This is used for the web-based php version of texdoctk
 # just try 
-# http://localhost/texmf/doc/texdoc.php or
-# http://localhost/doc/texmf/texdoc.php 
+# http://localhost/texmf-tetex/doc/texdoc.php or
+# http://localhost/doc/tetex-doc/texdoc.php 
 #
-Alias /texmf /usr/share/texmf
-<Directory /usr/share/texmf>
+Alias /texmf /usr/share/texmf-tetex
+<Directory /usr/share/texmf-tetex>
   order deny,allow
   deny from all
   allow from 127.0.0.0/255.0.0.0