tags 553540 + patch
thanks
Hello,
attached is the interdiff for my method of repairing the present
RC-bug for the package htdig_1:3.2.0b6-9.1.
It appears as an NMU build, but should be effectuated as a
QA-upload. For now I only make the interdiff available for
further scrutiny.
One could imagine two further steps to ensure quality:
* Let Ucf handle the configuration file /etc/htdig/htdig.conf.
* Let Debconf implement a single user action to handle the migration
of old content from '/var/www/htdig/' to '/var/lib/htdig/www/'.
I tried this with another package, but since Htdig still uses the
same deposit '/var/lib/htdig' for its databases, I find the additional
work with Ucf/Debconf not to be motivated in only resolving #553540.
Best regards,
Mats Erik Andersson <mats.anders...@gisladisker.se>
diff -u htdig-3.2.0b6/debian/rules htdig-3.2.0b6/debian/rules
--- htdig-3.2.0b6/debian/rules
+++ htdig-3.2.0b6/debian/rules
@@ -13,7 +13,7 @@
--prefix=/usr \
--with-cgi-bin-dir=/usr/lib/cgi-bin \
--with-search-dir=/usr/share/doc/htdig/examples \
- --with-image-dir=/var/www/htdig \
+ --with-image-dir=/var/lib/htdig/www \
--with-config-dir=/etc/htdig \
--with-common-dir=/etc/htdig \
--with-database-dir=/var/lib/htdig
@@ -43,11 +43,11 @@
dh_clean -k -i
dh_installdirs -i
- mkdir debian/htdig-doc/usr/share/doc/htdig-doc/examples
+ mkdir -p debian/htdig-doc/usr/share/doc/htdig-doc/examples
cp -r contrib/* debian/htdig-doc/usr/share/doc/htdig-doc/examples
mv debian/htdig-doc/usr/share/doc/htdig-doc/examples/examples \
debian/htdig-doc/usr/share/doc/htdig-doc/examples/htdig
- mkdir debian/htdig-doc/usr/share/doc/htdig-doc/html
+ mkdir -p debian/htdig-doc/usr/share/doc/htdig-doc/html
cp -r htdoc/* debian/htdig-doc/usr/share/doc/htdig-doc/html
rm -f debian/htdig-doc/usr/share/doc/htdig-doc/html/COPYING
rm -f debian/htdig-doc/usr/share/doc/htdig-doc/examples/rtf2html/COPYING
@@ -74,9 +74,9 @@
dh_installdirs -a
make install DESTDIR=`pwd`/debian/tmp
- mkdir debian/tmp/usr/sbin
+ mkdir -p debian/tmp/usr/sbin
install -m 755 debian/htdigconfig debian/tmp/usr/sbin
- mkdir debian/tmp/usr/share/htdig
+ mkdir -p debian/tmp/usr/share/htdig
install -m 755 debian/parse_doc.pl debian/tmp/usr/share/htdig
install -m 755 debian/htdig-pdfparser debian/tmp/usr/bin
chmod -x debian/tmp/etc/htdig/*
diff -u htdig-3.2.0b6/debian/changelog htdig-3.2.0b6/debian/changelog
--- htdig-3.2.0b6/debian/changelog
+++ htdig-3.2.0b6/debian/changelog
@@ -1,3 +1,16 @@
+htdig (1:3.2.0b6-9.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Resolve RC-bug 'dir-or-file-in-var-www'. (Closes: #553540)
+ + debian/rules:
+ o Use '--with-image-dir=/var/lib/htdig/www'.
+ o Use parent option 'mkdir -p' to avoid errors.
+ + debian/htdig.install: Exchange 'var/www/htdig' for
+ 'var/lib/htdig/www'.
+ + debian/NEWS: New file documenting the changes caused by FHS.
+
+ -- Mats Erik Andersson <mats.anders...@gisladisker.se> Tue, 19 Jan 2010 16:10:36 +0100
+
htdig (1:3.2.0b6-9) unstable; urgency=low
* QA upload.
diff -u htdig-3.2.0b6/debian/htdig.install htdig-3.2.0b6/debian/htdig.install
--- htdig-3.2.0b6/debian/htdig.install
+++ htdig-3.2.0b6/debian/htdig.install
@@ -13,36 +13,36 @@
debian/tmp/etc/htdig/htdig.conf
debian/tmp/etc/htdig/HtFileType-magic.mime
debian/tmp/etc/htdig/mime.types
-debian/tmp/var/www/htdig/button1.gif
-debian/tmp/var/www/htdig/button1.png
-debian/tmp/var/www/htdig/button2.gif
-debian/tmp/var/www/htdig/button2.png
-debian/tmp/var/www/htdig/button3.gif
-debian/tmp/var/www/htdig/button3.png
-debian/tmp/var/www/htdig/button4.gif
-debian/tmp/var/www/htdig/button4.png
-debian/tmp/var/www/htdig/button5.gif
-debian/tmp/var/www/htdig/button5.png
-debian/tmp/var/www/htdig/button6.gif
-debian/tmp/var/www/htdig/button6.png
-debian/tmp/var/www/htdig/button7.gif
-debian/tmp/var/www/htdig/button7.png
-debian/tmp/var/www/htdig/button8.gif
-debian/tmp/var/www/htdig/button8.png
-debian/tmp/var/www/htdig/button9.gif
-debian/tmp/var/www/htdig/button9.png
-debian/tmp/var/www/htdig/buttonl.gif
-debian/tmp/var/www/htdig/buttonl.png
-debian/tmp/var/www/htdig/buttonr.gif
-debian/tmp/var/www/htdig/buttonr.png
-debian/tmp/var/www/htdig/star.gif
-debian/tmp/var/www/htdig/star.png
-debian/tmp/var/www/htdig/button10.gif
-debian/tmp/var/www/htdig/button10.png
-debian/tmp/var/www/htdig/htdig.gif
-debian/tmp/var/www/htdig/htdig.png
-debian/tmp/var/www/htdig/star_blank.gif
-debian/tmp/var/www/htdig/star_blank.png
+debian/tmp/var/lib/htdig/www/button1.gif
+debian/tmp/var/lib/htdig/www/button1.png
+debian/tmp/var/lib/htdig/www/button2.gif
+debian/tmp/var/lib/htdig/www/button2.png
+debian/tmp/var/lib/htdig/www/button3.gif
+debian/tmp/var/lib/htdig/www/button3.png
+debian/tmp/var/lib/htdig/www/button4.gif
+debian/tmp/var/lib/htdig/www/button4.png
+debian/tmp/var/lib/htdig/www/button5.gif
+debian/tmp/var/lib/htdig/www/button5.png
+debian/tmp/var/lib/htdig/www/button6.gif
+debian/tmp/var/lib/htdig/www/button6.png
+debian/tmp/var/lib/htdig/www/button7.gif
+debian/tmp/var/lib/htdig/www/button7.png
+debian/tmp/var/lib/htdig/www/button8.gif
+debian/tmp/var/lib/htdig/www/button8.png
+debian/tmp/var/lib/htdig/www/button9.gif
+debian/tmp/var/lib/htdig/www/button9.png
+debian/tmp/var/lib/htdig/www/buttonl.gif
+debian/tmp/var/lib/htdig/www/buttonl.png
+debian/tmp/var/lib/htdig/www/buttonr.gif
+debian/tmp/var/lib/htdig/www/buttonr.png
+debian/tmp/var/lib/htdig/www/star.gif
+debian/tmp/var/lib/htdig/www/star.png
+debian/tmp/var/lib/htdig/www/button10.gif
+debian/tmp/var/lib/htdig/www/button10.png
+debian/tmp/var/lib/htdig/www/htdig.gif
+debian/tmp/var/lib/htdig/www/htdig.png
+debian/tmp/var/lib/htdig/www/star_blank.gif
+debian/tmp/var/lib/htdig/www/star_blank.png
debian/tmp/usr/bin/htdig
debian/tmp/usr/bin/htnotify
debian/tmp/usr/bin/htdump
only in patch2:
unchanged:
--- htdig-3.2.0b6.orig/debian/NEWS
+++ htdig-3.2.0b6/debian/NEWS
@@ -0,0 +1,17 @@
+htdig (1:3.2.0b6-9.1) unstable; urgency=low
+
+ Due to FHS compliance, all static images have been moved from
+ '/var/www/htdig/' to '/var/lib/htdig/www/'. Should these be
+ needed with a chrooted web server, they must be copied to the
+ correct location.
+
+ The usual alternative will be to declare an alias
+
+ Alias /htdig /var/lib/htdig/www
+
+ for the web server (in this case for Apache2). Then the images
+ are found and retrieved on demand when asking for
+
+ http://localhost/cgi-bin/htsearch
+
+ -- Mats Erik Andersson <mats.anders...@gisladisker.se> Tue, 19 Jan 2010 16:06:52 +0100
