tags 410803 patch
thanks
Gerfried Fuchs <[EMAIL PROTECTED]> wrote:
> So please move the starter kit to /usr/share/twiki and symlink it from
> the doc directory, if you really want to have it available from there,
> too - and don't forget to change the tar extract line in the postinst
> script.
Since the location is mentioned in README.Debian, I didn't think the
symlinks are needed. Here's a patch. As usual, it comes with an offer
to NMU the package.
Regards, Frank
diff -Nur twiki-4.0.5.old/debian/changelog twiki-4.0.5/debian/changelog
--- twiki-4.0.5.old/debian/changelog 2007-02-14 10:34:30.000000000 +0100
+++ twiki-4.0.5/debian/changelog 2007-02-13 21:58:38.000000000 +0100
@@ -1,3 +1,11 @@
+twiki (1:4.0.5-9~1) unstable; urgency=high
+
+ * Install twiki-data.tar.gz and twiki-pub.tar.gz in /usr/share/twiki
+ instead of /usr/share/doc (closes: #410803). Also change the paths in
+ README.Debian.
+
+ -- Frank KÃŒster <[EMAIL PROTECTED]> Tue, 13 Feb 2007 21:58:38 +0100
+
twiki (1:4.0.5-8) unstable; urgency=medium
* make patch for #404222 allow trailing slashes again
diff -Nur twiki-4.0.5.old/debian/dirs twiki-4.0.5/debian/dirs
--- twiki-4.0.5.old/debian/dirs 2007-02-14 10:34:30.000000000 +0100
+++ twiki-4.0.5/debian/dirs 2007-02-13 21:54:57.000000000 +0100
@@ -6,3 +6,4 @@
usr/share/perl5
etc/twiki
usr/share/doc/twiki
+usr/share/twiki
diff -Nur twiki-4.0.5.old/debian/postinst twiki-4.0.5/debian/postinst
--- twiki-4.0.5.old/debian/postinst 2007-02-14 10:34:30.000000000 +0100
+++ twiki-4.0.5/debian/postinst 2007-02-13 21:56:51.000000000 +0100
@@ -40,14 +40,14 @@
if [ ! -e /var/lib/twiki/data/_default/WebHome.txt ]; then
# only extract if they say so and there's no home there
# and even then, fail on overwrite so we don't stomp.
- tar -zxk -C / -f /usr/share/doc/twiki/twiki-data.tar.gz
+ tar -zxk -C / -f /usr/share/twiki/twiki-data.tar.gz
# clean up the .mailnotify timestamps.
webs="Main Sandbox TWiki Trash _default";
for web in $webs; do
date +%s > /var/lib/twiki/data/$web/.mailnotify
done
if [ ! -e /var/www/twiki/pub/wikiHome.gif ]; then
- tar -zxk -C / -f /usr/share/doc/twiki/twiki-pub.tar.gz
+ tar -zxk -C / -f /usr/share/twiki/twiki-pub.tar.gz
fi
fi
fi
diff -Nur twiki-4.0.5.old/debian/README.Debian twiki-4.0.5/debian/README.Debian
--- twiki-4.0.5.old/debian/README.Debian 2007-02-14 10:34:30.000000000 +0100
+++ twiki-4.0.5/debian/README.Debian 2007-02-13 21:57:06.000000000 +0100
@@ -1,10 +1,10 @@
TWiki for Debian
----------------
-/usr/share/doc/twiki/twiki-data.tar.gz has the initial data set, if
+/usr/share/twiki/twiki-data.tar.gz has the initial data set, if
you find you want to restore the data in /var/lib/twiki/data/ after
experimenting.
-/usr/share/doc/twiki/twiki-pub.tar.gz has the initial pub data set.
+/usr/share/twiki/twiki-pub.tar.gz has the initial pub data set.
It should also be unpacked to /var/www/twiki/pub
diff -Nur twiki-4.0.5.old/debian/rules twiki-4.0.5/debian/rules
--- twiki-4.0.5.old/debian/rules 2007-02-14 10:34:30.000000000 +0100
+++ twiki-4.0.5/debian/rules 2007-02-13 21:56:38.000000000 +0100
@@ -90,7 +90,7 @@
xargs -n1 perl -pi -e 's/^(\s)nobody:/\1$(TWIKI_OWNER):/ unless $$done; $$done=1 if /^\n$$/;'
tar -cf - -C debian/twiki var/lib/twiki/data \
| tardy -User_NAme=$(TWIKI_OWNER) -Group_NAme=www-data \
- | gzip -c -9 > debian/twiki/usr/share/doc/twiki/twiki-data.tar.gz
+ | gzip -c -9 > debian/twiki/usr/share/twiki/twiki-data.tar.gz
rm -rf debian/twiki/var/lib/twiki/data
#do the same with pub - it should also only be replaced if there is none there already
@@ -99,7 +99,7 @@
xargs -n1 perl -pi -e 's/^(\s)nobody:/\1$(TWIKI_OWNER):/ unless $$done; $$done=1 if /^\n$$/;'
tar -cf - -C debian/twiki var/www/twiki/pub \
| tardy -User_NAme=$(TWIKI_OWNER) -Group_NAme=www-data \
- | gzip -c -9 > debian/twiki/usr/share/doc/twiki/twiki-pub.tar.gz
+ | gzip -c -9 > debian/twiki/usr/share/twiki/twiki-pub.tar.gz
rm -rf debian/twiki/var/www/twiki/pub
cp -pR lib/* debian/twiki/usr/share/perl5/
--
Dr. Frank Küster
Single Molecule Spectroscopy, Protein Folding @ Inst. f. Biochemie, Univ. Zürich
Debian Developer (teTeX/TeXLive)
