Version 0.3.23 Original Sources (potato release)

Package source: archive.debian.org

Signed-off-by: Georgios M. Zarkadas <gz@member.fsf.org>

10 files changed, 303 insertions, 33 deletions

diff --git a/debian/README.debian b/debian/README.debian
index c7de04c..d6e0b3a 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -2,9 +2,17 @@
 dhelp
 =====
 
+This program supports the new /usr/share/doc directory (FHS).
+To browse the old /usr/doc directory (FSSTND) build the index
+with the following command:
+
+  dhelp_parse_fsstnd -r
+
+The index is created in /usr/doc/HTML/.
+
 If your native language is not English, Danish, German, Spanish, Italian 
 or French it would be nice, if you could send me a translation of
-/usr/doc/dhelp/.dhelp, /usr/lib/cgi-bin/dsearch (%MESG) and
+/usr/doc/share/dhelp/.dhelp, /usr/lib/cgi-bin/dsearch (%MESG) and
 dhelp_parse.c (function html_w_tail) for your language. Thank you :).
 
 Marco Budde (budde@debian.org)
diff --git a/debian/changelog b/debian/changelog
index c2ca768..f0a7c23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,100 @@
+dhelp (0.3.23) unstable frozen; urgency=low
+
+  * dsearch: security fix for glimpse's temp files (#60853)
+
+ -- Marco Budde <budde@debian.org>  Thu, 23 Mar 2000 21:42:05 +0100
+	
+dhelp (0.3.22) unstable frozen; urgency=low
+
+  * dsearch: DoS security check (#60849)
+
+ -- Marco Budde <budde@debian.org>  Tue, 21 Mar 2000 21:24:09 +0100 
+	
+dhelp (0.3.21) unstable frozen; urgency=low
+
+  * dsearch: dhelp console support fixed  (#55545, #20891)
+
+ -- Marco Budde <budde@debian.org>  Mon, 20 Mar 2000 22:24:48 +0100
+	
+dhelp (0.3.20) unstable frozen; urgency=low
+
+  * installation scripts changed
+  * parser bug "can't open ..." fixed
+	
+ -- Marco Budde <budde@debian.org>  Sat, 29 Jan 2000 17:30:33 +0100
+	
+dhelp (0.3.19) unstable frozen; urgency=low
+	
+  * alpha patch (bug report #44082) added
+  * AOLserver support in dhelp (bug report #54527)
+  * dsearch: sorting bug solved, new look
+  * dsearch: supports /usr/doc *and* /usr/share/doc
+	     -- please test this new feature --
+
+ -- Marco Budde <budde@debian.org>  Sat, 15 Jan 2000 18:34:29 +0100
+	
+dhelp (0.3.18) unstable frozen; urgency=low
+
+  * dh_dhelp
+  * upload to frozen
+
+ -- Marco Budde <budde@debian.org>  Tue,  4 Jan 2000 20:21:50 +0100
+	
+dhelp (0.3.17) unstable; urgency=low
+
+  * most changes of 0.3.16 removed
+  * /usr/doc/HTML is a link to /usr/share/doc/HTML
+  * old packages can be found at /usr/doc/HTML2
+	
+ -- Marco Budde <budde@debian.org>  Mon,  3 Jan 2000 20:22:22 +0100
+
+dhelp (0.3.16) unstable; urgency=low
+	
+  * dh_dhelp: support for policy 3.1.0.0
+  * fsstnd/dhelp_parse.c: hacked to follow symlinks
+    (policy 3.1.0.0)	
+  * README in /usr/doc/HTML and /usr/share/doc/HTML added
+    (bug #49793: dhelp deletes this directories)
+  * documentation updated
+	
+ -- Marco Budde <budde@debian.org>  Fri, 31 Dec 1999 13:48:09 +0100
+	
+dhelp (0.3.15) unstable; urgency=low
+	
+  * dh_dhelp: + supports -p/-P options
+	      + supports dh_installdeb 
+  * dh_dhelp man page (new)
+  * policy 3.1.0.0 (package itself)
+
+ -- Marco Budde <budde@debian.org>  Mon,  8 Nov 1999 14:54:21 +0100
+	
+dhelp (0.3.14) unstable; urgency=low
+
+  * new dhelp_parse_fsstnd to support FSSTND.
+
+ -- Marco Budde <budde@debian.org>  Mon, 20 Sep 1999 18:43:09 +0200
+	
+dhelp (0.3.13) unstable; urgency=low
+
+  * dhelp: support for gnome-help-browser
+  * dhelp_parse.c: #include <db.h> for "old" systems
+  * debian/cron.weekly: policy 3.0.0.0
+  * dsearch: policy 3.0.0.0
+  * man pages: policy 3.0.0.0
+	
+ -- Marco Budde <budde@debian.org>  Tue, 20 Jul 1999 20:36:38 +0200
+
+dhelp (0.3.12) unstable; urgency=low
+	
+  * Makefile: link with db1 
+  * dhelp_parse.c: #include <db/db.h>
+  * Policy 3.0.x: /usr/share/doc
+  * new debian/menu (bug #41140)
+  * dhelp_parse.c: new look
+  * dhelp: support for gzilla & amaya added
+	
+ -- Marco Budde <budde@debian.org>  Tue, 13 Jul 1999 15:20:09 +0200
+	
 dhelp (0.3.11) unstable frozen; urgency=low
 
   * dhelp: perl -T problem solved (bug #31211)
diff --git a/debian/control b/debian/control
index 8d7a244..d8b77da 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: dhelp
 Section: doc
 Priority: optional
-Maintainer: Marco Budde <Budde@tu-harburg.de>
-Standards-Version: 2.4.0.1
+Maintainer: Marco Budde <budde@debian.org>
+Standards-Version: 3.1.0.0
 
 Package: dhelp
 Depends: ${shlibs:Depends}
diff --git a/debian/cron.weekly b/debian/cron.weekly
index a6b4408..c053c62 100755
--- a/debian/cron.weekly
+++ b/debian/cron.weekly
@@ -5,13 +5,19 @@
 if [ -f /usr/bin/glimpseindex ]; then
   if [ ! -d /var/lib/dhelp ]; then
     mkdir -p /var/lib/dhelp
-    echo "*html.gz    gzip -d -c" > /var/lib/dhelp/.glimpse_filters 
     chown www-data.www-data /var/lib/dhelp
   fi
+    
+  echo "*html.gz    gzip -d -c" > /var/lib/dhelp/.glimpse_filters 
 
   cd /
-  su www-data -c "find /usr/doc/ -name '*.html*' | \
-  glimpseindex -F -X -H /var/lib/dhelp" > /dev/null
+  su www-data -c \
+    "find /usr/doc/ -name '*.html*' 2> /dev/null > /var/lib/dhelp/.glimpse_dhelp; \
+     find /usr/share/doc/ -name '*.html*' 2> /dev/null >> /var/lib/dhelp/.glimpse_dhelp; \
+     cat /var/lib/dhelp/.glimpse_dhelp | \
+     glimpseindex -F -X -H /var/lib/dhelp" > /dev/null
+
+  rm -f /var/lib/dhelp/.glimpse_dhelp
 
   chmod 644 /var/lib/dhelp/.glimpse*
 fi
diff --git a/debian/menu b/debian/menu
index 62c1ba1..85f9105 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,13 @@
-text Apps/Tools dhelp none "Debian Online Help" /usr/bin/dhelp
+?package(dhelp):needs="X11" section="Help" \
+title="Debian Online Help" command=/usr/bin/dhelp
+
+?package(dhelp):needs="text" section="Help" \
+title="Debian Online Help" command=/usr/bin/dhelp
+
+?package(dhelp):needs="X11" section="Help" \
+title="Debian Online Help (old)" command=/usr/bin/dhelp_fsstnd
+
+?package(dhelp):needs="text" section="Help" \
+title="Debian Online Help (old)" command=/usr/bin/dhelp_fsstnd
+
 
diff --git a/debian/postinst b/debian/postinst
index a409b84..1305cfc 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,17 +1,22 @@
 #!/bin/sh -e 
 
-if [ ! -d /var/lib/dhelp ]; then
-  mkdir -p /var/lib/dhelp
-  chown www-data.www-data /var/lib/dhelp
-fi
+# policy 3.1.0.0: fsstnd -> fhs
+
+if [ "$1" = "configure" ]; then
+  if [ -d /usr/doc -a ! -e /usr/doc/dhelp \
+       -a -d /usr/share/doc/dhelp ]; then
+    ln -sf ../share/doc/dhelp /usr/doc/dhelp
+  fi
 
-if [ -f /var/lib/dhelp/dbase ]; then
-  rm -f /var/lib/dhelp/dbase
+  if [ -d /usr/doc -a ! -e /usr/doc/HTML ]; then
+    ln -sf ../share/doc/HTML /usr/doc/HTML
+  fi
 fi
 
 if [ -x /usr/sbin/dhelp_parse ]; then
   echo -n "Building HTML tree ..."
   /usr/sbin/dhelp_parse -r
+  /usr/sbin/dhelp_parse_fsstnd -r
   echo " done"
 fi
 
@@ -20,5 +25,8 @@ if [ -x /etc/cron.weekly/dhelp -a -x /usr/bin/glimpseindex ]; then
   /etc/cron.weekly/dhelp 2>/dev/null >/dev/null &
 fi
 
-echo "run dhelp to read documentation or browse "
-echo "http://localhost/doc/HTML/index.html"
+#DEBHELPER#
+
+echo "Run dhelp to read documentation or browse "
+echo "http://localhost/doc/HTML/index.html."
+
diff --git a/debian/preinst b/debian/preinst
new file mode 100755
index 0000000..a0fd04d
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,9 @@
+#!/bin/sh -e 
+
+mkdir -p /var/lib/dhelp
+chown www-data.www-data /var/lib/dhelp
+
+
+
+
+
diff --git a/debian/prerm b/debian/prerm
index 90cb90c..2541851 100755
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,4 +1,17 @@
 #!/bin/sh -e
 
+#DEBHELPER#
+
 rm -rf /var/lib/dhelp
-rm -rf /usr/doc/HTML
+rm -rf /usr/doc/HTML /usr/share/doc/HTML
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) \
+     -a -L /usr/doc/dhelp ]; then
+  rm -f /usr/doc/dhelp
+fi
+
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) \
+     -a -L /usr/doc/HTML ]; then
+  rm -f /usr/doc/HTML
+fi
diff --git a/debian/rules b/debian/rules
index e155db2..984a6b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-# Sample debian.rules file - Copyright 1994,1995 by Ian Jackson.
 #
 # Invoke each target with `./debian/rules <target>'.  All targets should be
 # invoked with the package root as the current directory.
@@ -14,17 +13,12 @@ DIRECTORIES = \
         $(R)/DEBIAN \
         $(R)/usr \
         $(R)/usr/bin \
-        $(R)/usr/doc/$(P) \
-        $(R)/usr/lib \
+        $(R)/usr/share/doc/$(P) \
         $(R)/usr/lib/cgi-bin \
-        $(R)/usr/man \
-        $(R)/usr/man/man1 \
-        $(R)/usr/man/man8 \
-        $(R)/usr/man/de_DE \
-        $(R)/usr/man/de_DE/man1 \
+        $(R)/usr/share/man/man1 \
+        $(R)/usr/share/man/man8 \
+        $(R)/usr/share/man/de/man1 \
 	$(R)/usr/sbin \
-        $(R)/var \
-        $(R)/var/lib \
         $(R)/var/lib/dhelp
 
 $(DIRECTORIES):
@@ -46,6 +40,8 @@ clean: clean-dir
 	$(checkdir)
 	[ ! -f Makefile ] || make clean
 	rm -f debian/files* debian/substvars core debian/*~ *~ doc/*~ build
+	make -C fsstnd clean
+	rm -f debian/post*.debhelper debian/pre*.debhelper
 
 # Makes a binary package.
 binary-indep: $(DIRECTORIES) checkroot build
@@ -57,19 +53,35 @@ binary-arch: $(DIRECTORIES) checkroot build
 
 	make
 	cp dhelp_parse $(R)/usr/sbin	
-	cp dhelp dh_dhelp $(R)/usr/bin
-	cp doc/* debian/THANKS $(R)/usr/doc/$(P)
-	cp debian/dhelp $(R)/usr/doc/$(P)/.dhelp
+	cp dhelp dhelp_fsstnd dh_dhelp $(R)/usr/bin
+	cp doc/* debian/THANKS $(R)/usr/share/doc/$(P)
+	cp debian/dhelp $(R)/usr/share/doc/$(P)/.dhelp
+	cp debian/{changelog,README.debian,copyright} $(R)/usr/share/doc/$(P)
+	gzip -9 $(R)/usr/share/doc/$(P)/{changelog,README.debian,copyright}
 	cp dsearch $(R)/usr/lib/cgi-bin
-	cp man/dhelp.1 $(R)/usr/man/man1/
-	cp man/dhelp_parse.8 $(R)/usr/man/man8/
-	cp man/de/dhelp.1 $(R)/usr/man/de_DE/man1/
+	cp man/{dhelp.1,dh_dhelp.1} $(R)/usr/share/man/man1/
+	cp man/dhelp_parse.8 $(R)/usr/share/man/man8/
+	cp man/de/dhelp.1 $(R)/usr/share/man/de/man1/
+	gzip $(R)/usr/share/man/man1/* $(R)/usr/share/man/man8/* 
+	gzip $(R)/usr/share/man/de/man1/*
+
+
+# old fsstnd support
+	make -C fsstnd
+	cp fsstnd/dhelp_parse_fsstnd $(R)/usr/sbin
+
+	dh_shlibdeps
+	dh_strip
+	dh_installcron
+	dh_installmenu
+	dh_installdeb 
+	dh_md5sums
 
-	debstd -c
 	dpkg-gencontrol
 	chown -R root.root debian/tmp
 	chown www-data.www-data $(R)/var/lib/dhelp
 	chmod -R g-ws debian/tmp
+
 	dpkg --build debian/tmp ..
 
 define checkdir
diff --git a/debian/rules.debhelper b/debian/rules.debhelper
new file mode 100755
index 0000000..557817a
--- /dev/null
+++ b/debian/rules.debhelper
@@ -0,0 +1,106 @@
+#!/usr/bin/make -f
+# Sample debian.rules file - Copyright 1994,1995 by Ian Jackson.
+#
+# Invoke each target with `./debian/rules <target>'.  All targets should be
+# invoked with the package root as the current directory.
+
+# The name of the package
+P = dhelp
+
+R = debian/tmp
+
+DIRECTORIES = \
+        $(R) \
+        $(R)/DEBIAN \
+        $(R)/usr \
+        $(R)/usr/bin \
+        $(R)/usr/share/doc/$(P) \
+        $(R)/usr/lib \
+        $(R)/usr/lib/cgi-bin \
+        $(R)/usr/share/man \
+        $(R)/usr/share/man/man1 \
+        $(R)/usr/share/man/man8 \
+        $(R)/usr/share/man/de_DE \
+        $(R)/usr/share/man/de_DE/man1 \
+	$(R)/usr/sbin \
+        $(R)/var \
+        $(R)/var/lib \
+        $(R)/var/lib/dhelp
+
+$(DIRECTORIES):
+	install -d -g root -o root -m 755 $@
+	chmod g-s $@
+
+# Builds the binary package.
+build:
+	$(checkdir)
+	touch build
+
+# Clean $(DIRECTORIES)
+clean-dir:
+	$(checkdir)
+	rm -rf $(R)
+
+# Undoes the effect of `make -f rules build'.
+clean: clean-dir
+	$(checkdir)
+	[ ! -f Makefile ] || make clean
+	rm -f debian/files* debian/substvars core debian/*~ *~ doc/*~ build
+	rm -f debian/*.debhelper
+
+# Makes a binary package.
+binary-indep: $(DIRECTORIES) checkroot build
+	$(checkdir)
+
+
+binary-arch: $(DIRECTORIES) checkroot build
+	$(checkdir)
+
+	make
+#	dh_installdirs
+	dh_installchangelogs
+	dh_installmenu
+	dh_installcron
+
+	dh_installdocs doc
+	cp debian/dhelp $(R)/usr/share/doc/$(P)/.dhelp
+
+	cp man/dhelp.1 $(R)/usr/share/man/man1/
+	cp man/dhelp_parse.8 $(R)/usr/share/man/man8/
+	cp man/de/dhelp.1 $(R)/usr/share/man/de_DE/man1/
+
+	cp dhelp_parse $(R)/usr/sbin	
+	cp dhelp dh_dhelp $(R)/usr/bin
+	cp dsearch $(R)/usr/lib/cgi-bin
+
+	dh_strip
+	dh_compress -X.jpg
+	dh_fixperms
+	chown www-data.www-data $(R)/var/lib/dhelp
+
+	dh_shlibdeps
+	dh_gencontrol
+	dh_installdeb
+	dh_md5sums
+	dh_builddeb
+
+
+
+define checkdir
+	test -f debian/rules
+endef
+
+# Below here is fairly generic really
+
+binary:		binary-indep binary-arch
+
+source diff:
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+checkroot:
+	$(checkdir)
+	test root = "`whoami`"
+
+.PHONY: binary binary-arch binary-indep clean checkroot
+
+