Coordinating to let some TeX-related packages in: tetex-base
Dear release team,
we have a couple of TeX-related packages waiting and would like to ask
you to give permission for testing migration once they are old enough.
We'll notify you again when each of them has had it's time in sid, but
we'd like to know right now whether you are willing to allow them in, so
that we can make any further changes or reverts if you ask so.
This e-mail is about tetex-base, I'll send/have sent separate mails for
the other packages.
tetex-base is 0 days old (has been uploaded today):
,----
| tetex-base (3.0.dfsg.3-3) unstable; urgency=low
|
| * The "Kings of the documentation"-release
| * 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". Restart apache if appropriate. Thanks to Uwe
| Kleine-Koenig <zeisberg@informatik.uni-freiburg.de>
| (closes: #401903) [frank]
| * Rename our apache alias from http://localhost/texmf to
| http://localhost/texmf-tetex (needs changes in config.php) [frank]
| * Do not install outdated, manually generated dhelp file in tetex-doc,
| thanks to "Mario 'BitKoenig' Holbe" <Mario.Holbe@TU-Ilmenau.DE>
| (closes: #402117) [frank]
|
| -- Frank KÃŒster <frank@debian.org> Mon, 11 Dec 2006 11:40:23 +0100
|
| tetex-base (3.0.dfsg.3-2) unstable; urgency=low
|
| * Create oldstuffdir with -p option in preinst, this is needed when
| tetex-base is unpacked before tex-common.
| * Register documentation with doc-base, and don't compress index.php.
| Also install a README.Debian for tetex-doc that lists entry points for
| documentation.
|
| -- Frank KÃŒster <frank@debian.org> Wed, 6 Dec 2006 12:23:10 +0100
|
`----
The only changes to maintainer scripts (to their manual part, that is)
is
| * Create oldstuffdir with -p option in preinst, this is needed when
| tetex-base is unpacked before tex-common.
I think this should actually have gotten a bugnumber and RC severity,
since I detected it during some real-life testing. I just didn't want
to wait with the upload until it got a bugnumber.
Besides that, the upload of -2 adds debian/*doc-base* files and
documentation text. The part "don't compress index.php" was actually
not fixed in -2, but in -3.
-3 is needed to correct some mistakes made in -2 (the last item in the
changelog), and to make http://localhost/doc/tetex-doc/texdoc.php
actually work flawlessly. All these changes manifest only in the
tetex-doc binary package, the files changed are apache configuration
files and a php script. The debdiff is attached, here's the interesting
part, namely the change to the apache configuration files, and below the
maintainer script changes (which are independent of the change to the
conffile).
--- tetex-base-3.0.dfsg.3/debian/tetex-doc.apache2.sites-available
+++ tetex-base-3.0.dfsg.3.orig/debian/tetex-doc.apache2.sites-available
@@ -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>
--- tetex-base-3.0.dfsg.3.orig/debian/tetex-doc.apache2.conf.d
+++ tetex-base-3.0.dfsg.3/debian/tetex-doc.apache2.conf.d
@@ -0,0 +1,45 @@
+# 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
+#
+<IfModule mod_php5.c>
+ Alias /texmf-tetex /usr/share/texmf-tetex
+ <Directory /usr/share/texmf-tetex>
+ 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>
+
+ 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>
+ 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>
+
+ 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>
and the maintainer scripts:
--- tetex-base-3.0.dfsg.3/debian/tetex-doc.postrm
+++ tetex-base-3.0.dfsg.3/debian/tetex-doc.postrm
@@ -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
--- tetex-base-3.0.dfsg.3/debian/tetex-doc.postinst
+++ tetex-base-3.0.dfsg.3/debian/tetex-doc.postinst
@@ -6,6 +6,15 @@
test -x "`which mktexlsr`" && mktexlsr || true
# disable this for now
# index-tetexdoc
+ 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
;;
*)
;;
If you think some of the changes are inappropriate, we'd like to know
what we need to revert to get at least the "register to doc-base" and
corresponding "do not install manual dhelp file" in.
So far for tetex-base,
TIA, Frank
--
Dr. Frank Küster
Single Molecule Spectroscopy, Protein Folding @ Inst. f. Biochemie, Univ. Zürich
Debian Developer (teTeX/TeXLive)
diff -u tetex-base-3.0.dfsg.3/debian/rules.d/install.mk tetex-base-3.0.dfsg.3/debian/rules.d/install.mk
--- tetex-base-3.0.dfsg.3/debian/rules.d/install.mk
+++ tetex-base-3.0.dfsg.3/debian/rules.d/install.mk
@@ -75,9 +75,6 @@
# Create a link within the package doc directory to the documentation.
ln -s ../$(docpack) debian/$(package)/usr/share/doc/$(package)/texmf
-# Copy the dhelp definition file to the package documentation directory.
- cp debian/dhelp debian/$(docpack)/usr/share/doc/$(docpack)/.dhelp
-
# Copy the LPPL file to /usr/share/doc/tetex-base.
cp -p doc/latex/base/lppl*.txt debian/$(package)/usr/share/doc/tetex-base
@@ -141,8 +138,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
diff -u tetex-base-3.0.dfsg.3/debian/patches/patch-texdocphp tetex-base-3.0.dfsg.3/debian/patches/patch-texdocphp
--- tetex-base-3.0.dfsg.3/debian/patches/patch-texdocphp
+++ tetex-base-3.0.dfsg.3/debian/patches/patch-texdocphp
@@ -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-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
### 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-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
diff -u tetex-base-3.0.dfsg.3/debian/rules tetex-base-3.0.dfsg.3/debian/rules
--- tetex-base-3.0.dfsg.3/debian/rules
+++ tetex-base-3.0.dfsg.3/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
#
# do not edit this file, instead edit rules.in!
-# $Id: rules 1971 2006-12-06 11:26:05Z frank $
+# $Id: rules 2034 2006-12-11 07:19:37Z frank $
# The debian/rules(.in) file was nearly completely rewritten by
# Frank Küster frank@debian.org in 2004, with patches by
@@ -195,7 +195,7 @@
# create copyright file
cat debian/copyright.header debian/Copyright.Files > debian/copyright
- dh_installdocs -i #-N tetex-extra-fonts
+ dh_installdocs -i -N tetex-extra-fonts
# dh_installdocs -p tetex-extra-fonts debian/copyr.type1 debian/changelog -X copyright
@@ -210,7 +210,7 @@
dh_installchangelogs ChangeLog -p tetex-base -p tetex-doc
cp debian/changelog.Debian.experimental debian/$(package)/usr/share/doc/$(package)/
cp debian/changelog.Debian.experimental debian/$(docpack)/usr/share/doc/$(docpack)/
- dh_compress -Xhelpfile -Xindex.php
+ dh_compress -Xhelpfile -X.php
dh_installinfo
# Install reportbug scripts
@@ -255,7 +255,7 @@
done
# needs devscripts in etch or from backports.org
- debchange --distribution sarge-backports -b --newversion 3.0.dfsg.3-1~1~bpo.1 "Recompiled for sarge."
+ debchange --distribution sarge-backports -b --newversion 3.0.dfsg.3-3~1~bpo.1 "Recompiled for sarge."
debchange --append "No source changes."
# need to remake rules
reverted:
--- tetex-base-3.0.dfsg.3/debian/dhelp
+++ tetex-base-3.0.dfsg.3.orig/debian/dhelp
@@ -1,9 +0,0 @@
-<item>
-<directory>tex
-<dirtitle>TeX
-<linkname>texmf
-<filename>texmf/index.html
-<description>
-teTeX, A Documentation Guide
-</description>
-</item>
diff -u tetex-base-3.0.dfsg.3/debian/changelog tetex-base-3.0.dfsg.3/debian/changelog
--- tetex-base-3.0.dfsg.3/debian/changelog
+++ tetex-base-3.0.dfsg.3/debian/changelog
@@ -1,3 +1,20 @@
+tetex-base (3.0.dfsg.3-3) unstable; urgency=low
+
+ * The "Kings of the documentation"-release
+ * 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". Restart apache if appropriate. Thanks to Uwe
+ Kleine-Koenig <zeisberg@informatik.uni-freiburg.de>
+ (closes: #401903) [frank]
+ * Rename our apache alias from http://localhost/texmf to
+ http://localhost/texmf-tetex (needs changes in config.php) [frank]
+ * Do not install outdated, manually generated dhelp file in tetex-doc,
+ thanks to "Mario 'BitKoenig' Holbe" <Mario.Holbe@TU-Ilmenau.DE>
+ (closes: #402117) [frank]
+
+ -- Frank Küster <frank@debian.org> Mon, 11 Dec 2006 11:40:23 +0100
+
tetex-base (3.0.dfsg.3-2) unstable; urgency=low
* Create oldstuffdir with -p option in preinst, this is needed when
diff -u tetex-base-3.0.dfsg.3/debian/tetex-doc.dirs tetex-base-3.0.dfsg.3/debian/tetex-doc.dirs
--- tetex-base-3.0.dfsg.3/debian/tetex-doc.dirs
+++ tetex-base-3.0.dfsg.3/debian/tetex-doc.dirs
@@ -5,2 +5,2 @@
-etc/apache2/sites-available
-etc/apache2/sites-enabled
+etc/apache2/conf.d
+
reverted:
--- tetex-base-3.0.dfsg.3/debian/tetex-doc.apache2.sites-available
+++ tetex-base-3.0.dfsg.3.orig/debian/tetex-doc.apache2.sites-available
@@ -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>
diff -u tetex-base-3.0.dfsg.3/debian/tetex-doc.postrm tetex-base-3.0.dfsg.3/debian/tetex-doc.postrm
--- tetex-base-3.0.dfsg.3/debian/tetex-doc.postrm
+++ tetex-base-3.0.dfsg.3/debian/tetex-doc.postrm
@@ -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
diff -u tetex-base-3.0.dfsg.3/debian/rules.in tetex-base-3.0.dfsg.3/debian/rules.in
--- tetex-base-3.0.dfsg.3/debian/rules.in
+++ tetex-base-3.0.dfsg.3/debian/rules.in
@@ -6,7 +6,7 @@
#!/usr/bin/make -f
#
# do not edit this file, instead edit rules.in!
-# $Id: rules.in 1627 2006-09-19 10:52:41Z frank $
+# $Id: rules.in 2034 2006-12-11 07:19:37Z frank $
# The debian/rules(.in) file was nearly completely rewritten by
# Frank Küster frank@debian.org in 2004, with patches by
@@ -215,7 +215,7 @@
dh_installchangelogs ChangeLog -p tetex-base -p tetex-doc
cp debian/changelog.Debian.experimental debian/$(package)/usr/share/doc/$(package)/
cp debian/changelog.Debian.experimental debian/$(docpack)/usr/share/doc/$(docpack)/
- dh_compress -Xhelpfile
+ dh_compress -Xhelpfile -X.php
dh_installinfo
# Install reportbug scripts
diff -u tetex-base-3.0.dfsg.3/debian/tetex-doc.postinst tetex-base-3.0.dfsg.3/debian/tetex-doc.postinst
--- tetex-base-3.0.dfsg.3/debian/tetex-doc.postinst
+++ tetex-base-3.0.dfsg.3/debian/tetex-doc.postinst
@@ -6,6 +6,15 @@
test -x "`which mktexlsr`" && mktexlsr || true
# disable this for now
# index-tetexdoc
+ 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
;;
*)
;;
only in patch2:
unchanged:
--- tetex-base-3.0.dfsg.3.orig/debian/tetex-doc.apache2.conf.d
+++ tetex-base-3.0.dfsg.3/debian/tetex-doc.apache2.conf.d
@@ -0,0 +1,45 @@
+# 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
+#
+<IfModule mod_php5.c>
+ Alias /texmf-tetex /usr/share/texmf-tetex
+ <Directory /usr/share/texmf-tetex>
+ 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>
+
+ 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>
+ 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>
+
+ 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>
Reply to: