Control: tags 730383 + patch Control: tags 730383 + pending Control: tags 760819 + pending Control: tags 782218 + pending
Dear maintainer, I've prepared an NMU for micro-httpd (versioned as 20051212-15.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Best, Christian diff -Nru micro-httpd-20051212/debian/changelog micro-httpd-20051212/debian/changelog --- micro-httpd-20051212/debian/changelog 2012-03-24 08:54:48.000000000 +0100 +++ micro-httpd-20051212/debian/changelog 2016-07-02 18:14:04.000000000 +0200 @@ -1,3 +1,15 @@ +micro-httpd (20051212-15.1) unstable; urgency=medium + + * Non-maintainer upload. + * Update default web root to /var/www/html (Closes: #730383) + * Use last changelog date for manpage (Closes: #782218) + * Ship native systemd unit files. + Thanks to Alexandre Detiste (Closes: #760819) + * Update Vcs-Git, Vcs-Browser to use https URLs + * Update Standards-Version to 3.9.8 + + -- Christian Hofstaedtler <z...@debian.org> Sat, 02 Jul 2016 18:02:42 +0200 + micro-httpd (20051212-15) unstable; urgency=low * debian/rules diff -Nru micro-httpd-20051212/debian/control micro-httpd-20051212/debian/control --- micro-httpd-20051212/debian/control 2012-03-23 19:05:39.000000000 +0100 +++ micro-httpd-20051212/debian/control 2016-07-02 18:14:04.000000000 +0200 @@ -2,15 +2,15 @@ Section: httpd Priority: optional Maintainer: Jari Aalto <jari.aa...@cante.net> -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.3.1 -Vcs-Browser: http://git.debian.org/?p=collab-maint/micro-httpd.git -Vcs-Git: git://git.debian.org/git/collab-maint/micro-httpd.git +Build-Depends: debhelper (>= 9), dh-systemd +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/micro-httpd.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/micro-httpd.git Homepage: http://www.acme.com/software/micro_httpd Package: micro-httpd Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, openbsd-inetd | inet-superserver | micro-inetd | netcat-traditional +Depends: ${misc:Depends}, ${shlibs:Depends}, openbsd-inetd | inet-superserver | micro-inetd | netcat-traditional | systemd-sysv Suggests: micro-proxy Provides: httpd Description: really small HTTP server diff -Nru micro-httpd-20051212/debian/dirs micro-httpd-20051212/debian/dirs --- micro-httpd-20051212/debian/dirs 1970-01-01 01:00:00.000000000 +0100 +++ micro-httpd-20051212/debian/dirs 2016-07-02 18:14:04.000000000 +0200 @@ -0,0 +1 @@ +/var/www/html diff -Nru micro-httpd-20051212/debian/micro-httpd.lintian-overrides micro-httpd-20051212/debian/micro-httpd.lintian-overrides --- micro-httpd-20051212/debian/micro-httpd.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ micro-httpd-20051212/debian/micro-httpd.lintian-overrides 2016-07-02 18:14:04.000000000 +0200 @@ -0,0 +1,3 @@ +# Using var/www/html/ as a new default document root +# See #730372 and https://lists.debian.org/debian-devel/2012/04/msg00301.html +micro-httpd: dir-or-file-in-var-www var/www/html/ diff -Nru micro-httpd-20051212/debian/micro-httpd.postinst micro-httpd-20051212/debian/micro-httpd.postinst --- micro-httpd-20051212/debian/micro-httpd.postinst 2012-02-13 12:20:20.000000000 +0100 +++ micro-httpd-20051212/debian/micro-httpd.postinst 2016-07-02 18:14:04.000000000 +0200 @@ -4,7 +4,7 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin" PACKAGE=$(basename $0 | sed 's/\..*//') -WWWDIR=/var/www +WWWDIR=/var/www/html conf=/etc/inetd.conf pkgdir=/usr/share/$PACKAGE port="www" diff -Nru micro-httpd-20051212/debian/micro-httpd@.service micro-httpd-20051212/debian/micro-httpd@.service --- micro-httpd-20051212/debian/micro-httpd@.service 1970-01-01 01:00:00.000000000 +0100 +++ micro-httpd-20051212/debian/micro-httpd@.service 2016-07-02 18:14:04.000000000 +0200 @@ -0,0 +1,10 @@ +[Unit] +Description=micro-httpd +Documentation=man:micro-httpd(8) + +[Service] +User=nobody +Group=www-data +ExecStart=-/usr/sbin/micro-httpd /var/www/html +StandardInput=socket + diff -Nru micro-httpd-20051212/debian/micro-httpd.socket micro-httpd-20051212/debian/micro-httpd.socket --- micro-httpd-20051212/debian/micro-httpd.socket 1970-01-01 01:00:00.000000000 +0100 +++ micro-httpd-20051212/debian/micro-httpd.socket 2016-07-02 18:14:04.000000000 +0200 @@ -0,0 +1,10 @@ +[Unit] +Description=micro-httpd +Documentation=man:micro-httpd(8) + +[Socket] +ListenStream=0.0.0.0:80 +Accept=true + +[Install] +WantedBy=sockets.target diff -Nru micro-httpd-20051212/debian/pod2man.mk micro-httpd-20051212/debian/pod2man.mk --- micro-httpd-20051212/debian/pod2man.mk 2012-02-13 12:21:58.000000000 +0100 +++ micro-httpd-20051212/debian/pod2man.mk 2016-07-02 18:14:04.000000000 +0200 @@ -38,9 +38,10 @@ PACKAGE ?= package # Optional variables to set +BUILD_DATE ?= $$(dpkg-parsechangelog -S Date -lchangelog) MANSECT ?= 1 PODCENTER ?= User Commands -PODDATE ?= $$(date "+%Y-%m-%d") +PODDATE ?= $$(date -u "+%Y-%m-%d" -d "$(BUILD_DATE)") # Directories MANSRC ?= diff -Nru micro-httpd-20051212/debian/rules micro-httpd-20051212/debian/rules --- micro-httpd-20051212/debian/rules 2012-03-23 19:05:31.000000000 +0100 +++ micro-httpd-20051212/debian/rules 2016-07-02 18:14:04.000000000 +0200 @@ -30,8 +30,11 @@ rm -f $(MAN8DIR)/* $(INSTALL_DATA) debian/*.8 $(MAN8DIR) +override_dh_systemd_enable: + dh_systemd_enable micro-httpd\@.service micro-httpd.socket + %: - dh $@ + dh $@ --with systemd .PHONY: man
