diff options
| author | Arno Töll <arno@debian.org> | 2013-03-17 19:31:54 +0100 |
|---|---|---|
| committer | Arno Töll <arno@debian.org> | 2013-03-17 19:53:03 +0100 |
| commit | 5d03728f9ab051518f284036b4429b65f351a1fa (patch) | |
| tree | a41ace1c258b07056bb10a5920d328fea5e7565b | |
| parent | 5c733a9eafbc5c134c70a8b54c67680a504576ff (diff) | |
| download | lighttpd-5d03728f9ab051518f284036b4429b65f351a1fa.tar.gz | |
Fix #703215. The conffile was not removed properly
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/lighttpd.maintscript | 1 | ||||
| -rw-r--r-- | debian/lighttpd.postinst | 8 |
5 files changed, 21 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index defc8cb..5e52e90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ lighttpd (1.4.32-1) UNRELEASED; urgency=low * Drop the connection-dos.patch - merged upstream. - * Fix "mod_extforward missing configuration file": ship requeste + * Fix "mod_extforward missing configuration file": ship requested configuration file (Closes: #697304) + * Remove access.conf, an obsolete conffiles as we should have done since + 2010 (Closes: #703215) + * Push debhelper's compat mode to 9, the use of maintscript helper requires + 8.1 so we had to push the debhelper b-d anyway. + + -- Arno Töll <arno@debian.org> Sun, 17 Mar 2013 19:29:34 +0100 lighttpd (1.4.31-4) unstable; urgency=high diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index cd48277..326ed30 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Krzysztof Krzyżaniak (eloy) <eloy@debian.org>, Olaf van der Spek <olafvdspek@gmail.com>, Arno Töll <arno@debian.org> Homepage: http://lighttpd.net/ -Build-Depends: debhelper (>= 8), mime-support, libssl-dev, +Build-Depends: debhelper (>= 9), mime-support, libssl-dev, zlib1g-dev, libbz2-dev, libattr1-dev, libpcre3-dev, libmysqlclient-dev, libfam-dev, libldap2-dev, libfcgi-dev, libgdbm-dev, libmemcache-dev, liblua5.1-0-dev, pkg-config, uuid-dev, libsqlite3-dev, @@ -17,6 +17,9 @@ Standards-Version: 3.9.4 Package: lighttpd Architecture: any +# Omitting this triggers a Lintian error +# That's a false positive these days +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, lsb-base (>= 3.2-14) | systemd (>= 29.1), mime-support, libterm-readline-perl-perl diff --git a/debian/lighttpd.maintscript b/debian/lighttpd.maintscript new file mode 100644 index 0000000..c51f4a4 --- /dev/null +++ b/debian/lighttpd.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/lighttpd/conf-available/10-access.conf 1.4.31-4 lighttpd diff --git a/debian/lighttpd.postinst b/debian/lighttpd.postinst index 07401e4..6bfed29 100644 --- a/debian/lighttpd.postinst +++ b/debian/lighttpd.postinst @@ -8,6 +8,14 @@ if [ "$1" = "configure" ]; then then cp /usr/share/lighttpd/index.html /var/www/index.lighttpd.html fi + + # Remove a possibly dangling symlink for the obsolete conffile + if dpkg --compare-versions "$2" lt-nl "1.4.32-1" && \ + [ -L /etc/lighttpd/conf-enabled/10-access.conf -a \ + ! -f /etc/lighttpd/conf-available/10-access.conf ]; then + rm -f /etc/lighttpd/conf-enabled/10-access.conf + fi + fi # dh_installinit will call this function upon failure of rc.d invocation |