[subversion-commit] SVN tetex commit + diffs: r283 - in tetex-base/trunk/debian: . rules.d

[Frank Küster]

Author: frank
Date: 2005-10-19 13:38:02 +0000 (Wed, 19 Oct 2005)
New Revision: 283

Modified:
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/control
   tetex-base/trunk/debian/rules.d/install.mk
   tetex-base/trunk/debian/tetex-doc.postinst
   tetex-base/trunk/debian/tetex-doc.postrm
Log:
- [control] tetex-doc: also declare Replaces: tetex-base (<<3.0), for
  other files that were in tetex-base but are still needed
- do not install and use index-tetexdoc at all; it is too difficult to
  adapt to Debian


Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2005-10-19 09:53:34 UTC (rev 282)
+++ tetex-base/trunk/debian/changelog	2005-10-19 13:38:02 UTC (rev 283)
@@ -1,12 +1,13 @@
 tetex-base (3.0-10) unstable; urgency=low
 
   * Remove unneeded file /usr/share/doc/texmf/Makefile from tetex-doc
-    which caused a conflict with old tetex-base (closes: #334659) [frank]
+    which caused a conflict with old tetex-base, and declare Replaces for
+    the files that are still needed (closes: #334659) [frank]
   * Install changelog.Debian.experimental (closes: #334655) [frank]
-  * Make index-tetexdoc work with filenames with spaces in them (closes:
-    #334643) [frank]
+  * Do not generate helpindex.html dynamically.  The upstream script is
+    too specialized to adapt it to Debian (closes: #334643, #334688) [frank]
 
- -- Frank Küster <frank at debian.org>  Wed, 19 Oct 2005 11:46:32 +0200
+ -- Frank Küster <frank at debian.org>  Wed, 19 Oct 2005 15:35:53 +0200
 
 tetex-base (3.0-9) unstable; urgency=low
 

Modified: tetex-base/trunk/debian/control
===================================================================
--- tetex-base/trunk/debian/control	2005-10-19 09:53:34 UTC (rev 282)
+++ tetex-base/trunk/debian/control	2005-10-19 13:38:02 UTC (rev 283)
@@ -42,7 +42,7 @@
 Section: doc
 Architecture: all
 Pre-Depends: dpkg (>=1.6.8)
-Replaces: latex2e-doc, tetex-base (<< 2.0), tetex-nonfree
+Replaces: latex2e-doc, tetex-base (<< 3.0), tetex-nonfree
 Conflicts: latex2e-doc, tetex-extra (<< 2.0)
 Recommends: tetex-bin (>> 2.0) | dvi2tty, xpdf | pdf-viewer, gv | postscript-viewer, mozilla-browser | www-browser
 Suggests: libapache2-mod-php4 | libapache2-mod-php5

Modified: tetex-base/trunk/debian/rules.d/install.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/install.mk	2005-10-19 09:53:34 UTC (rev 282)
+++ tetex-base/trunk/debian/rules.d/install.mk	2005-10-19 13:38:02 UTC (rev 283)
@@ -124,9 +124,10 @@
 # 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
-	mv debian/$(docpack)/usr/share/doc/texmf/mkhtml.nawk debian/$(docpack)/usr/bin/index-tetexdoc
-	chmod a+x debian/$(docpack)/usr/bin/index-tetexdoc
-	cp debian/index-tetexdoc.1 debian/$(docpack)/usr/share/man/man1/
+	# 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
+	# cp debian/index-tetexdoc.1 debian/$(docpack)/usr/share/man/man1/
 
 	touch $@
 

Modified: tetex-base/trunk/debian/tetex-doc.postinst
===================================================================
--- tetex-base/trunk/debian/tetex-doc.postinst	2005-10-19 09:53:34 UTC (rev 282)
+++ tetex-base/trunk/debian/tetex-doc.postinst	2005-10-19 13:38:02 UTC (rev 283)
@@ -4,7 +4,8 @@
 case "$1" in
   configure|reconfigure)
     test -x "`which mktexlsr`" && mktexlsr || true
-    index-tetexdoc
+# disable this for now    
+    # index-tetexdoc
     ;;
   *)
     ;;

Modified: tetex-base/trunk/debian/tetex-doc.postrm
===================================================================
--- tetex-base/trunk/debian/tetex-doc.postrm	2005-10-19 09:53:34 UTC (rev 282)
+++ tetex-base/trunk/debian/tetex-doc.postrm	2005-10-19 13:38:02 UTC (rev 283)
@@ -4,6 +4,7 @@
 if [ x"$1" = "xremove" -a -x /usr/bin/mktexlsr ]
 then
     /usr/bin/mktexlsr
+    rm /var/lib/texmf/helpindex.html
 fi
 
 #DEBHELPER#