From 86d03f32fc9c0ea0a7fb050de76071dfd18d3bec Mon Sep 17 00:00:00 2001 From: Roland Rosenfeld Date: Sun, 11 Aug 2002 09:25:38 +0000 Subject: [PATCH] * New upstream version. * Disable docbook, we use the precompiled docs (Closes: #155989). * Use start-stop-daemon for starting privoxy to avoid problems on start, when privoxy is already running (Closes: #154882). * Undo broken -Ipcre inclusion in GNUmakefile.in, which causes trouble with using wrong pcreposix.h. --- debian/changelog | 22 ++++++++++++++++++++++ debian/init.d | 9 ++++++--- debian/rules | 3 ++- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ca1b4f0..ef8b75e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +privoxy (2.9.20-1) unstable; urgency=low + + * New upstream version. + + -- Roland Rosenfeld Sun, 11 Aug 2002 11:05:01 +0200 + +privoxy (2.9.18-2) unstable; urgency=low + + * Disable docbook, we use the precompiled docs (Closes: #155989). + + -- Roland Rosenfeld Sat, 10 Aug 2002 09:36:58 +0200 + +privoxy (2.9.18-1) unstable; urgency=low + + * New upstream version. + * Use start-stop-daemon for starting privoxy to avoid problems on start, + when privoxy is already running (Closes: #154882). + * Undo broken -Ipcre inclusion in GNUmakefile.in, which causes trouble + with using wrong pcreposix.h. + + -- Roland Rosenfeld Thu, 8 Aug 2002 21:01:48 +0200 + privoxy (2.9.16-1) unstable; urgency=low * New upstream version. diff --git a/debian/init.d b/debian/init.d index cca3a8be..012668da 100644 --- a/debian/init.d +++ b/debian/init.d @@ -15,8 +15,10 @@ set -e case "$1" in start) echo -n "Starting $DESC: " - $DAEMON --pidfile $PIDFILE --user $OWNER $CONFIGFILE 2>/dev/null - echo "$NAME." + start-stop-daemon --oknodo --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- --pidfile $PIDFILE --user $OWNER $CONFIGFILE \ + 2>/dev/null + echo "$NAME." ;; stop) echo -n "Stopping $DESC: " @@ -46,7 +48,8 @@ case "$1" in start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \ --exec $DAEMON sleep 1 - $DAEMON --pidfile $PIDFILE --user $OWNER $CONFIGFILE + start-stop-daemon --oknodo --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- --pidfile $PIDFILE --user $OWNER $CONFIGFILE ;; *) N=/etc/init.d/$NAME diff --git a/debian/rules b/debian/rules index 3e2a1419..7ccb7313 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,8 @@ configure-stamp: autoconf env CFLAGS=$(CFLAGS) ./configure --prefix=/usr --sysconfdir=/etc \ - --mandir=/usr/share/man $(WITHDEBUG) $(WITHOUTPTHREAD) + --mandir=/usr/share/man $(WITHDEBUG) $(WITHOUTPTHREAD) \ + --with-docbook=no touch configure-stamp -- 2.49.0