Import Debian changes 1.19-2

mini-httpd (1.19-2) unstable; urgency=low

  * Resolved conflicts with apache2-utils (Closes: #385268).
  * Added LSB initscript header.
  * Renamed mini_httpd.conf to mini-httpd.conf
  * Renamed mini_httpd.default to mini-httpd.default
  * Renamed mini_httpd.init.d to mini-httpd.init.d

8 files changed, 64 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index 18bcaf9..8133d41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mini-httpd (1.19-2) unstable; urgency=low
+
+  * Resolved conflicts with apache2-utils (Closes: #385268).
+  * Added LSB initscript header.
+  * Renamed mini_httpd.conf to mini-httpd.conf
+  * Renamed mini_httpd.default to mini-httpd.default
+  * Renamed mini_httpd.init.d to mini-httpd.init.d
+
+ -- Marvin Stark <marv@der-marv.de>  Wed, 13 Sep 2006 18:11:12 +0200
+
 mini-httpd (1.19-1) unstable; urgency=low
 
   * Initial release (Closes: #376599, #308660).
diff --git a/debian/config/mini_httpd.conf b/debian/config/mini-httpd.conf
index 534f522..fa73e44 100644
--- a/debian/config/mini_httpd.conf
+++ b/debian/config/mini-httpd.conf
@@ -21,16 +21,16 @@ nochroot # no
 #dir=<work_dir>
 
 # We are the web files stored?
-data_dir=/etc/mini_httpd
+data_dir=/etc/mini-httpd
 
 # Which certificate to use?
 #certfile=<certfile>
 
 # Which logfile to use?
-logfile=/var/log/mini_httpd.log
+logfile=/var/log/mini-httpd.log
 
 # Which pidfile to use?
-pidfile=/var/run/mini_httpd.pid
+pidfile=/var/run/mini-httpd.pid
 
 # Which charset to use?
 charset=iso-8859-1
diff --git a/debian/control b/debian/control
index b3d99b0..b128424 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Provides: httpd, httpd-cgi
 Description: a small HTTP server
- mini_httpd implements all basic features of a HTTPD, including: GET,HEAD,POST
+ mini-httpd implements all basic features of a HTTPD, including: GET,HEAD,POST
  methods, common MIME types, basic authentication, virtual hosting, CGI,
  directory listing, trailing-slash redirection, standard logging, custom error
  pages etc. It also can be configured to do SSL and IPv6.
diff --git a/debian/mini_httpd.default b/debian/mini-httpd.default
index efe5856..93c3bda 100644
--- a/debian/mini_httpd.default
+++ b/debian/mini-httpd.default
@@ -5,4 +5,4 @@
 START=0
 
 # Additional options that are passed to the Daemon.
-DAEMON_OPTS="-C /etc/mini_httpd.conf"
+DAEMON_OPTS="-C /etc/mini-httpd.conf"
diff --git a/debian/mini_httpd.init.d b/debian/mini-httpd.init.d
index 807cb90..d1e4a3f 100644
--- a/debian/mini_httpd.init.d
+++ b/debian/mini-httpd.init.d
@@ -1,17 +1,26 @@
 #! /bin/sh
+### BEGIN INIT INFO
+# Provides:          mini-httpd
+# Required-Start:    $local_fs
+# Required-Stop:     $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      S 0 1 6
+# Short-Description: mini-httpd start script
+# Description:       this script starts mini-httpd
+### END INIT INFO
 
 # Globals
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/mini_httpd
-NAME=mini_httpd
+DAEMON=/usr/sbin/mini-httpd
+NAME=mini-httpd
 DESC="web server"
 
 test -x $DAEMON || exit 0
 
-# Include mini_httd defaults if available
-if [ -f /etc/default/mini_httpd ]
+# Include mini-httpd defaults if available
+if [ -f /etc/default/mini-httpd ]
 then
-	. /etc/default/mini_httpd
+	. /etc/default/mini-httpd
 fi
 
 set -e
@@ -29,8 +38,7 @@ case "$1" in
 
   stop)
 	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
+	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid
 	echo "$NAME."
 	;;
 
diff --git a/debian/mini-httpd.postrm b/debian/mini-httpd.postrm
new file mode 100644
index 0000000..e7c8fb4
--- /dev/null
+++ b/debian/mini-httpd.postrm
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if [ "$1" = remove ]
+then
+	dpkg-divert --package mini-httpd --rename --remove /usr/share/man/man1/htpasswd.1.gz
+	dpkg-divert --package mini-httpd --rename --remove /usr/bin/htpasswd
+fi
+
+#DEBHELPER#
diff --git a/debian/mini-httpd.preinst b/debian/mini-httpd.preinst
new file mode 100644
index 0000000..cac0924
--- /dev/null
+++ b/debian/mini-httpd.preinst
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+if [ "$1" = install ] || [ $1 = upgrade ]
+then
+	for p in apache2-utils; do
+		dpkg-divert --package mini-httpd --divert \
+			/usr/share/man/man1/htpasswd.${p}.1.gz \
+			--rename /usr/share/man/man1/htpasswd.1.gz
+		dpkg-divert --package mini-httpd --divert \
+			/usr/bin/htpasswd.${p} --rename /usr/bin/htpasswd
+	done
+fi
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index b99c1c9..d4b5139 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,19 +30,25 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	CFLAGS="$(CFLAGS)" $(MAKE) install BINDIR="debian/mini-httpd/usr/sbin" \
+	CFLAGS="$(CFLAGS)" $(MAKE) all \
 			MANDIR="debian/mini-httpd/usr/share/man" \
 			SSL_TREE="/usr" \
 			SSL_DEFS="-DUSE_SSL" \
 			SSL_INC="-I${SSL_TREE}/include/openssl" \
 			SSL_LIBS="-L${SSL_TREE}/lib -lssl -lcrypto"
 
+	# Moving mini_httpd to its designated directory.
+	install -D mini_httpd debian/mini-httpd/usr/sbin/mini-httpd
+	
 	# Moving htpasswd to its designated directory.
-	install -d -m 0755 debian/mini-httpd/usr/bin
-	mv debian/mini-httpd/usr/sbin/htpasswd debian/mini-httpd/usr/bin
+	install -D htpasswd debian/mini-httpd/usr/bin/htpasswd
+
+	# Moving manpages to its designated directory.
+	install -D htpasswd.1 debian/mini-httpd/usr/share/man/man1/htpasswd.1
+	install -D mini_httpd.8 debian/mini-httpd/usr/share/man/man8/mini-httpd.8
 
 	# Moving example configuration to its designated directory.
-	install -D -m 0644 debian/config/mini_httpd.conf debian/mini-httpd/etc/mini_httpd.conf
+	install -D -m 0644 debian/config/mini-httpd.conf debian/mini-httpd/etc/mini-httpd.conf
 
 binary-indep: build install
 
@@ -51,7 +57,7 @@ binary-arch: build install
 	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
-	dh_installinit --name mini_httpd
+	dh_installinit
 	dh_link
 	dh_compress
 	dh_fixperms