tags 674515 + patch
tags 674515 + pending
thanks
Dear maintainer,
I've prepared an NMU for mini-httpd (versioned as 1.19-9.3) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
--
Bernd Zeimetz Debian GNU/Linux Developer
http://bzed.de http://www.debian.org
GPG Fingerprint: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
diff -u mini-httpd-1.19/debian/control mini-httpd-1.19/debian/control
--- mini-httpd-1.19/debian/control
+++ mini-httpd-1.19/debian/control
@@ -10,6 +10,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Provides: httpd, httpd-cgi
+Recommends: apache2-utils
Description: a small HTTP server
mini-httpd implements all basic features of a HTTPD, including: GET,HEAD,POST
methods, common MIME types, basic authentication, virtual hosting, CGI,
diff -u mini-httpd-1.19/debian/mini-httpd.init.d mini-httpd-1.19/debian/mini-httpd.init.d
--- mini-httpd-1.19/debian/mini-httpd.init.d
+++ mini-httpd-1.19/debian/mini-httpd.init.d
@@ -1,8 +1,8 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: mini-httpd
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: mini-httpd start script
reverted:
--- mini-httpd-1.19/debian/mini-httpd.postrm
+++ mini-httpd-1.19.orig/debian/mini-httpd.postrm
@@ -1,9 +0,0 @@
-#!/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 -u mini-httpd-1.19/debian/changelog mini-httpd-1.19/debian/changelog
--- mini-httpd-1.19/debian/changelog
+++ mini-httpd-1.19/debian/changelog
@@ -1,3 +1,12 @@
+mini-httpd (1.19-9.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Do not install htpasswd, recommend apache2-utils instead.
+ (Closes: #674515).
+ * Add missing dependencies on $remote_fs to fix a lintian error.
+
+ -- Bernd Zeimetz <[email protected]> Sat, 16 Jun 2012 01:31:28 +0200
+
mini-httpd (1.19-9.2) unstable; urgency=medium
[Jari Aalto]
diff -u mini-httpd-1.19/debian/rules mini-httpd-1.19/debian/rules
--- mini-httpd-1.19/debian/rules
+++ mini-httpd-1.19/debian/rules
@@ -44,10 +44,10 @@
install -D mini_httpd debian/mini-httpd/usr/sbin/mini-httpd
# Moving htpasswd to its designated directory.
- install -D htpasswd debian/mini-httpd/usr/bin/htpasswd
+ #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 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.
reverted:
--- mini-httpd-1.19/debian/mini-httpd.preinst
+++ mini-httpd-1.19.orig/debian/mini-httpd.preinst
@@ -1,15 +0,0 @@
-#!/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#
only in patch2:
unchanged:
--- mini-httpd-1.19.orig/debian/mini-httpd.postinst
+++ mini-httpd-1.19/debian/mini-httpd.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ] && dpkg --compare-versions "1.19-9.3" gt "$2"
+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#
