[Debian-tex-commits] SVN tetex-base commit + diffs: r2015 - in tetex-base/trunk/debian: . rules.d

[Frank Küster]

Author: frank
Date: 2006-12-07 14:41:14 +0100 (Thu, 07 Dec 2006)
New Revision: 2015

Added:
   tetex-base/trunk/debian/tetex-doc.apache2.conf.d
Removed:
   tetex-base/trunk/debian/tetex-doc.apache2.sites-available
Modified:
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/rules.d/install.mk
   tetex-base/trunk/debian/tetex-doc.dirs
Log:
  * Move apache configuration to conf.d, and document in the file that it
    needs libapache-mod-php4/5.  tetex-doc only Suggests this, not
    Recommends, since users will not want apache "in all but unusual
    situations".  Thanks to Uwe Kleine-Koenig
    <zeisberg at informatik.uni-freiburg.de> (closes: #401903)


Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2006-12-06 22:39:15 UTC (rev 2014)
+++ tetex-base/trunk/debian/changelog	2006-12-07 13:41:14 UTC (rev 2015)
@@ -1,3 +1,13 @@
+tetex-base (3.0.dfsg.3-3~1) unstable; urgency=low
+
+  * Move apache configuration to conf.d, and document in the file that it
+    needs libapache-mod-php4/5.  tetex-doc only Suggests this, not
+    Recommends, since users will not want apache "in all but unusual
+    situations".  Thanks to Uwe Kleine-Koenig
+    <zeisberg at informatik.uni-freiburg.de> (closes: #401903)
+
+ -- Frank Küster <frank at debian.org>  Thu,  7 Dec 2006 14:40:14 +0100
+
 tetex-base (3.0.dfsg.3-2) unstable; urgency=low
 
   * Create oldstuffdir with -p option in preinst, this is needed when

Modified: tetex-base/trunk/debian/rules.d/install.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/install.mk	2006-12-06 22:39:15 UTC (rev 2014)
+++ tetex-base/trunk/debian/rules.d/install.mk	2006-12-07 13:41:14 UTC (rev 2015)
@@ -141,8 +141,8 @@
 	mkdir debian/$(docpack)/usr/share/doc/$(docpack)/fonts/gothic
 	uudecode -o debian/$(docpack)/usr/share/doc/$(docpack)/fonts/gothic/suet.pdf debian/patches/suet.pdf.uu
 # provide a file that allows to access documentation via http://localhost/doc/texmf/texdoc.php
-	cp debian/tetex-doc.apache2.sites-available debian/$(docpack)/etc/apache2/sites-available/tetex-doc
-	ln -s ../sites-available/tetex-doc debian/$(docpack)/etc/apache2/sites-enabled/050-tetex-doc
+	cp debian/tetex-doc.apache2.conf.d debian/$(docpack)/etc/apache2/conf.d/tetex-doc
+
 	# disable this for now
 	# mv debian/$(docpack)/usr/share/doc/texmf/mkhtml.nawk debian/$(docpack)/usr/bin/index-tetexdoc
 	# chmod a+x debian/$(docpack)/usr/bin/index-tetexdoc

Copied: tetex-base/trunk/debian/tetex-doc.apache2.conf.d (from rev 1847, tetex-base/trunk/debian/tetex-doc.apache2.sites-available)
===================================================================
--- tetex-base/trunk/debian/tetex-doc.apache2.sites-available	2006-10-18 06:48:54 UTC (rev 1847)
+++ tetex-base/trunk/debian/tetex-doc.apache2.conf.d	2006-12-07 13:41:14 UTC (rev 2015)
@@ -0,0 +1,13 @@
+# This is used for the web-based php version of texdoctk,
+# it needs libapache2-mod-php4 or libapache2-mod-php5
+# just try 
+# http://localhost/texmf-tetex/doc/texdoc.php or
+# http://localhost/doc/tetex-doc/texdoc.php 
+#
+Alias /texmf-tetex /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
+  Options Indexes FollowSymlinks MultiViews
+</Directory>

Deleted: tetex-base/trunk/debian/tetex-doc.apache2.sites-available
===================================================================
--- tetex-base/trunk/debian/tetex-doc.apache2.sites-available	2006-12-06 22:39:15 UTC (rev 2014)
+++ tetex-base/trunk/debian/tetex-doc.apache2.sites-available	2006-12-07 13:41:14 UTC (rev 2015)
@@ -1,12 +0,0 @@
-# This is used for the web-based php version of texdoctk
-# just try 
-# http://localhost/texmf-tetex/doc/texdoc.php or
-# http://localhost/doc/tetex-doc/texdoc.php 
-#
-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
-  Options Indexes FollowSymlinks MultiViews
-</Directory>

Modified: tetex-base/trunk/debian/tetex-doc.dirs
===================================================================
--- tetex-base/trunk/debian/tetex-doc.dirs	2006-12-06 22:39:15 UTC (rev 2014)
+++ tetex-base/trunk/debian/tetex-doc.dirs	2006-12-07 13:41:14 UTC (rev 2015)
@@ -2,5 +2,5 @@
 usr/share/texmf-tetex
 var/lib/texmf
 usr/bin
-etc/apache2/sites-available
-etc/apache2/sites-enabled
+etc/apache2/conf.d
+