logo       

current/debian watch, 1.1, 1.2 README.Debian, 1.2, 1.3 changelog, 1.15, 1.1: msg#00015

web.privoxy.cvs

Subject: current/debian watch, 1.1, 1.2 README.Debian, 1.2, 1.3 changelog, 1.15, 1.16 compat, 1.2, 1.3 control, 1.10, 1.11 copyright, 1.1, 1.2 doc-base.user, 1.2, 1.3 init.d, 1.2, 1.3 logrotate, 1.1, 1.2 manpages, 1.1, 1.2 postinst, 1.4, 1.5 postrm, 1.2, 1.3 rules, 1.10, 1.11 .cvsignore, 1.2, NONE

Update of /cvsroot/ijbswa/current/debian
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26899/debian

Modified Files:
README.Debian changelog compat control copyright doc-base.user
init.d logrotate manpages postinst postrm rules
Added Files:
watch
Removed Files:
.cvsignore
Log Message:
Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
with what was really the latest development (the v_3_0_branch branch)



Index: README.Debian
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/README.Debian,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- README.Debian 1 Mar 2003 10:47:24 -0000 1.2
+++ README.Debian 18 Jul 2006 14:48:48 -0000 1.3
@@ -7,5 +7,16 @@
want to use these features, you can enable them in
/etc/privoxy/config and do a "/etc/init.d/privoxy restart".

+- A patch was applied to access the local copy of the user manual
+ (/usr/share/doc/privoxy/user-manual/*) was applied. With the option
+ user-manual /usr/share/doc/privoxy/user-manual
+ in /etc/privoxy/config this is activated and the manual can be
+ accessed as http://config.privoxy.org/user-manual
+
+- A patch was applied to use multiple filter files. So you can leave
+ /etc/privoxy/default.filter untouched and use a local file like
+ /etc/privoxy/user.filter for your local changes (you have to enable
+ this file using a second filterfile directive in /etc/privoxy/config).
+
Roland Rosenfeld <roland@xxxxxxxxxx>
$Id$

Index: changelog
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/changelog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- changelog 1 Mar 2003 15:10:09 -0000 1.15
+++ changelog 18 Jul 2006 14:48:48 -0000 1.16
@@ -1,42 +1,168 @@
-privoxy (3.1.1-3) unstable; urgency=low
+privoxy (3.0.3-2-1) unstable; urgency=low

- * New build based on CVS as of 2003-03-01.
+ * New upstream version 3.0.3-2.
+ * Add debian/watch file.
+ * Remove parts of 13_memory.dpatch, which seem to be free too much
+ memory (Closes: #353110, #354611).
+
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Mon, 27 Feb 2006 23:28:52 +0100
+
+privoxy (3.0.3-6) unstable; urgency=low
+
+ * Now hopefully really redirect all output of logrotate to /dev/null
+ (Closes: #314868).
+ * Migrate all patches to dpatch mechanism.
+ * Upgrade to debhelper 5.
+ * Call htmldoc with parameter --no-embedfonts to keep PDF files small.
+ * Build-Depends on htmldoc (>= 1.8.25-1), because older versions caused
+ broken PDF documentation on 64bit systems.
+ * Fix some typos in user-manual.
+ * Add multiple filter file support (from CVS) (Closes: #201177).
+ * Fix some memory leaks, mallocs, double frees (from CVS).
+ * Remove CVS $-tags from config files to make it easier for users to
+ keep the configuration in a VCS (Closes: #350799).
+ * Remove trailing spaces from all config files now.
+ * Build man page (and HTML version of it) at build time.
+
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Sat, 11 Feb 2006 21:27:14 +0100
+
+privoxy (3.0.3-5) unstable; urgency=low
+
+ * Redirect output of restart script in logrotate to /dev/null
+ (Closes: #314868).
+ * Upgrade to Standards-Version 3.6.2:
+ - Recommends: doc-base
+ * Build-Depends on autotools-dev and copy config.guess and config.sub
+ from there on every build (Closes: #332767).
+ * After dechunking remove the "chunked"-header instead of replacing it
+ by an d"identity" header. Thanks to Michael Shields for reporting this
+ (Closes: #318683).
+ * Update address of FSF in copyright file.
+
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Sun, 9 Oct 2005 13:44:55 +0200
+
+privoxy (3.0.3-4) unstable; urgency=low
+
+ * Stop converting entities to 8bit chars in the documentation
+ (Closes: #203697).
+ * Fix typos ('persistant' and 'Januar') in man page and man page sources
+ (Closes: #302145).
+ * Restart privoxy in logrotate script instead of sendig a kill -HUP, to
+ triggering reopen of log files (Closes: #285059).
+ * Apply patch by Jindrich Makovicka to fix race conditions in log
+ writing functions (Closes: #299662).
+ * Stop hiding referrer for www.petitiononline.com/mod_perl/signed.cgi,
+ because this site does not work otherwise (Closes: #250407).
+
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Sun, 15 May 2005 15:28:56 +0200
+
+privoxy (3.0.3-3) unstable; urgency=low
+
+ * Now really remove multiproxy.org from all documentation, not only from
+ the config file (Closes: #198953).
+
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Sun, 15 Feb 2004 23:11:29 +0100
+
+privoxy (3.0.3-2) unstable; urgency=low
+
+ * no banners-by-side on "/valid-" images, because that's usually from
+ validator.w3.org (Closes: #221009).
+ * Upgrade to Standards-Version 3.6.1 (no changes).
+ * Add Homepage URL to the package description.
+ * If the privoxy user is already existing as a non-system user in
+ postinst, this no longer fails, but deletes the non-system user before
+ adding it again as a system user (Closes: #232724).
+ * Use deluser instead of userdel in postrm.
+ * Redirect stderr of privoxy to /var/log/privoxy/errfile to avoid
+ problems with kept open file descriptors (Closes: #200712).
+ * Remove comment from config file, which points to list of open proxies
+ at multiproxy.org (Closes: #198953).
+
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Sun, 15 Feb 2004 15:13:27 +0100
+
+privoxy (3.0.3-1) unstable; urgency=low
+
+ * New upstream version 3.0.3.
+ - This introduces workarounds for server (PHP <4.2.3) bugs including
+ the "blank page" problem (Closes: #215231).
+ - Avoid the conversion of "open" in scripts to "PrivoxyWindowOpen"
+ (Closes: #197995).
+ - "advocancy" is no longer blocked (Closes: #202042).
+ - Fixed yet another two memory leaks (Closes: #215911).
+ * Stop backup of pdf directory, because it is no longer contained in the
+ upstream package.
+ * Create doc/pdf, which is missing upstream.
+ * disable filter{unsolicited-popups} for www.perl.com/language/newdocs/pod/
+ to avoid problems with "PrivoxyWindowOpen" in Perl manuals
+ (Closes: #195311).
+ * Apply patch make privoxy compilable on woody where htmldoc --version
+ doesn't exist (Closes: #216524).
+
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Sat, 31 Jan 2004 11:25:53 +0100
+
+privoxy (3.0.2-5) unstable; urgency=low
+
+ * Merge corrections from upstream default.action 1.7.
+ - demoronizer filter (which caused trouble on non latin1 charsets) is
+ now switched off by default (Closes: #202234).
+
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Tue, 9 Sep 2003 21:31:51 +0200
+
+privoxy (3.0.2-4) unstable; urgency=low
+
+ * Add a versioned build dependency on htmldoc (>= 1.8.20), because there
+ seem to be some options mission in the old 1.8.17 (Closes: #192457).
+ * Merge rotation of logfile and jarfile in logrotate script.
+ * Test whether /var/run/privoxy.pid is existing and don't bother when no
+ privoxy is running in logrotate script (Closes: #191838).
+ * Remove /var/run/privoxy.pid on privoxy stop in init.d script.
+ * Mention apt-get instead of dpkg in user-manual (Closes: #189239).
+ * Remove trailing whitespace from text versions of user-manual,
+ developer-manual and faq (Closes: #192566).
+
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Fri, 9 May 2003 08:21:30 +0200
+
+privoxy (3.0.2-3) unstable; urgency=low
+
+ * Stop filtering favicon.ico, which may cause trouble (Closes: #188947).
+ * Send SIGHUP to privoxy instead of touching /etc/provoxy/config in
+ logrotate script to tell privoxy that the logfiles were rotated
+ (Closes: #189240).
+ * Remove trailing spaces from config file (Closes: #189240).
+ * Install man page as privoxy(8) instead of privoxy(1), because this is
+ a system binary.
* Build HTML, text, and PDF versions of the documentation from source.
+ * Fix setting of dodk in configure.in.
+ * Add option "--linkcolor #0000ff" to htmldoc call in ldp_print to be
+ independent of ~/.htmldocrc color setting.
* Mention PDF and text version of the documentation in doc-base files.
* Install PDF version of the documentation, too.
* Install HTML version of the man page, too.

- -- Roland Rosenfeld <roland@xxxxxxxxxx> Sat, 1 Mar 2003 13:54:32 +0100
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Mon, 21 Apr 2003 11:11:31 +0200

-privoxy (3.1.1-2) unstable; urgency=low
+privoxy (3.0.2-2) unstable; urgency=low

- * Stop creating documentation, it's usually available upstream and can
- be used as is without depending on docbook and the like.
- * Added LICENSE, pdfs, privoxy-index and HTMLized man-page from package.
- The LICENSE is already mentioned in debian/copyright (adding a
- separate file conflicts with the policy), the man page is available in
- nroff format and the PDFs are not better than the HTML version.
+ * Don't apply any filters to {bugs|lists}.debian.org (Closes: #186537).
+ * Prepend "http://config.privoxy.org"; before "/user-manual/" to always
+ get a correct URL for the local user-manual (also on 404 error pages).
+ (Closes SF-719724).

- -- Roland Rosenfeld <roland@xxxxxxxxxx> Fri, 6 Sep 2002 18:37:19 +0200
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Sun, 13 Apr 2003 12:49:15 +0200

-privoxy (3.1.1-1) unstable; urgency=low
+privoxy (3.0.2-1) unstable; urgency=low

- * Removed build dependency on w3m.
- * Removed ./configure argument for docbook, moving the path to the
- configure.in.
- * Added LICENSE, pdfs, privoxy-index and HTMLized man-page
+ * New upstream version 3.0.2.
+ * Update Standards-Version to 3.5.9 (no changes).

- -- Devin Bayer <devin@xxxxxxxxxxxxx> Tue, 28 May 2002 21:21:48 -0400
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Wed, 26 Mar 2003 19:45:07 +0100

-privoxy (3.1.1-0) unstable; urgency=low
+privoxy (3.0.0-6) unstable; urgency=low

- * Added debian-dist and debian-upload targets to the top level makefile.
- debian-dist runs "dpkg-buildpackage -rfakeroot -us -uc" so that
- any debian user can build it.
- * Removed build dependency on docbook, leaving generation of docs to
- another target or makefile.
-
- -- Devin Bayer <devin@xxxxxxxxxxxxx> Sat, 25 May 2002 22:49:30 -0400
+ * Fixed a bug in local user-manual patch, which failed when accessing
+ http://config.privoxy.org/user-manual/ (without a file name).
+
+ -- Roland Rosenfeld <roland@xxxxxxxxxx> Sun, 2 Mar 2003 13:40:48 +0100

privoxy (3.0.0-5) unstable; urgency=low


Index: compat
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/compat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- compat 1 Mar 2003 10:47:25 -0000 1.2
+++ compat 18 Jul 2006 14:48:48 -0000 1.3
@@ -1 +1 @@
-4
+5

Index: control
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/control,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- control 1 Mar 2003 15:10:09 -0000 1.10
+++ control 18 Jul 2006 14:48:48 -0000 1.11
@@ -2,12 +2,13 @@
Section: web
Priority: optional
Maintainer: Roland Rosenfeld <roland@xxxxxxxxxx>
-Build-Depends: debhelper (>= 4.0.0), autoconf, libpcre3-dev, jade,
docbook-dsssl, w3m, sp, sgmlspl, groff, htmldoc
-Standards-Version: 3.5.8
+Build-Depends: debhelper (>= 5.0.0), autoconf, autotools-dev, libpcre3-dev,
jade, docbook-dsssl, w3m, sp, sgmlspl, groff, htmldoc (>= 1.8.25-1), man2html,
dpatch
+Standards-Version: 3.6.2

Package: privoxy
Architecture: any
-Depends: ${shlibs:Depends}, logrotate, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate, adduser
+Recommends: doc-base
Description: Privacy enhancing HTTP Proxy
Privoxy is a web proxy with advanced filtering capabilities for
protecting privacy, filtering web page content, managing cookies,
@@ -17,3 +18,5 @@
has application for both stand-alone systems and multi-user networks.
.
Privoxy is based on Internet Junkbuster (tm).
+ .
+ Homepage: http://www.privoxy.org/

Index: copyright
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/copyright,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- copyright 29 Mar 2002 22:03:19 -0000 1.1
+++ copyright 18 Jul 2006 14:48:48 -0000 1.2
@@ -1,19 +1,18 @@
+
This package was debianized by Roland Rosenfeld <roland@xxxxxxxxxx> on
Fri, 29 Mar 2002 11:52:03 +0100.

-It was downloaded from http://privoxy.org/ and
+It was downloaded from http://www.privoxy.org/ and
http://sourceforge.net/project/showfiles.php?group_id=11118

Upstream Authors: ijbswa-developers@xxxxxxxxxxxxxxxxxxxxx

-Current Project developers:
+Current Development Team:

- Stefan Waldherr
- Andreas Oesterhelt
+ Hal Burgiss (docs)
Jon Foster
-
- Markus Breitenbach
- Thomas Steudten
+ Andreas Oesterhelt
+ David Schmidt (OS/2, Mac OSX ports)

Originally developed by:

@@ -42,8 +41,8 @@
The GNU General Public License should be included with
this file. If not, you can view it at
http://www.gnu.org/copyleft/gpl.html
- or write to the Free Software Foundation, Inc., 59
- Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ or write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.

The complete GNU General Public License can be found at
/usr/share/common-licenses/GPL

Index: doc-base.user
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/doc-base.user,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- doc-base.user 1 Mar 2003 15:10:10 -0000 1.2
+++ doc-base.user 18 Jul 2006 14:48:48 -0000 1.3
@@ -14,4 +14,3 @@

Format: pdf
Files: /usr/share/doc/privoxy/privoxy-user-manual.pdf
-

Index: init.d
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/init.d,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- init.d 6 Sep 2002 16:14:30 -0000 1.2
+++ init.d 18 Jul 2006 14:48:48 -0000 1.3
@@ -17,13 +17,14 @@
echo -n "Starting $DESC: "
start-stop-daemon --oknodo --start --quiet --pidfile $PIDFILE \
--exec $DAEMON -- --pidfile $PIDFILE --user $OWNER $CONFIGFILE \
- 2>/dev/null
+ 2>> /var/log/privoxy/errorfile
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
--exec $DAEMON
+ rm -f $PIDFILE
echo "$NAME."
;;
#reload)
@@ -44,12 +45,14 @@
# option to the "reload" entry above. If not, "force-reload" is
# just the same as "restart".
#
- echo "Restarting $DESC: "
+ echo -n "Restarting $DESC: "
start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
--exec $DAEMON
sleep 1
start-stop-daemon --oknodo --start --quiet --pidfile $PIDFILE \
- --exec $DAEMON -- --pidfile $PIDFILE --user $OWNER $CONFIGFILE
+ --exec $DAEMON -- --pidfile $PIDFILE --user $OWNER $CONFIGFILE \
+ 2>> /var/log/privoxy/errorfile
+ echo "$NAME."
;;
*)
N=/etc/init.d/$NAME

Index: logrotate
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- logrotate 29 Mar 2002 22:03:19 -0000 1.1
+++ logrotate 18 Jul 2006 14:48:48 -0000 1.2
@@ -1,21 +1,17 @@
-/var/log/privoxy/logfile {
- create 0640 privoxy adm
- missingok
- weekly
- rotate 7
- compress
- postrotate
- touch /etc/privoxy/config
- endscript
-}
-
-/var/log/privoxy/jarfile {
+/var/log/privoxy/logfile /var/log/privoxy/jarfile /var/log/privoxy/errorfile {
create 0640 privoxy adm
missingok
weekly
rotate 7
compress
+ sharedscripts
postrotate
- touch /etc/privoxy/config
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d privoxy restart > /dev/null
+ else
+ if [ -f /var/run/privoxy.pid ]; then
+ /etc/init.d/privoxy restart > /dev/null
+ fi
+ fi
endscript
}

Index: manpages
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/manpages,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- manpages 29 Mar 2002 22:03:19 -0000 1.1
+++ manpages 18 Jul 2006 14:48:48 -0000 1.2
@@ -1 +1 @@
-privoxy.1
+privoxy.8

Index: postinst
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/postinst,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- postinst 1 Mar 2003 10:47:25 -0000 1.4
+++ postinst 18 Jul 2006 14:48:48 -0000 1.5
@@ -25,8 +25,15 @@

case "$1" in
configure)
- adduser --quiet --system --home /etc/privoxy --ingroup nogroup \
- --disabled-password privoxy
+ if ! adduser --quiet --system --home /etc/privoxy --no-create-home \
+ --ingroup nogroup --disabled-password privoxy
+ then
+ # user privoxy seems to exist
+ # -> remove him before newly adding him.
+ deluser --quiet privoxy
+ adduser --quiet --system --home /etc/privoxy --no-create-home \
+ --ingroup nogroup --disabled-password privoxy
+ fi
chown -R privoxy.adm /var/log/privoxy
chmod 750 /var/log/privoxy
chown privoxy /etc/privoxy/*.action /etc/privoxy/trust

Index: postrm
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/postrm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- postrm 1 Mar 2003 10:47:25 -0000 1.2
+++ postrm 18 Jul 2006 14:48:48 -0000 1.3
@@ -20,7 +20,7 @@

case "$1" in
purge)
- userdel privoxy || echo "WARNING: Problem removing user privoxy."
+ deluser --quiet privoxy
rm -rf /var/log/privoxy /etc/privoxy
;;


Index: rules
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/rules,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- rules 1 Mar 2003 15:27:34 -0000 1.10
+++ rules 18 Jul 2006 14:48:48 -0000 1.11
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
+#
+# (C) 2002-2006 Roland Rosenfeld <roland@xxxxxxxxxx>, based on
# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This file is public domain software, originally written by Joey Hess.

# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -19,72 +21,54 @@
OPTIMIZE=-O2
endif

-configure: configure-stamp
-configure-stamp:
+build: build-stamp
+build-stamp: patch-stamp
dh_testdir

autoheader
autoconf
env CFLAGS="$(OPTIMIZE) -g" \
./configure --prefix=/usr --sysconfdir=/etc \
- --mandir=/usr/share/man $(WITHDEBUG)
-
- touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
+ --mandir=/usr/share/man $(WITHDEBUG) \
+ --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
$(MAKE)
+# create missing doc/pdf directory if necessary:
+ [ -d doc/pdf ] || mkdir doc/pdf
+ $(MAKE) dok-pdf
+ $(MAKE) dok
+ env -u LANG $(MAKE) man
+ $(MAKE) man2html

-# backup formatted upstream documentation:
- for x in text webserver pdf; do \
- if [ ! -d doc/$$x.dist ]; then \
- cp -a doc/$$x doc/$$x.dist; \
- fi; \
- done
- for x in INSTALL README privoxy.1; do \
- if [ ! -f $$x.dist ]; then \
- cp -a $$x $$x.dist; \
- fi; \
+# remove trailing whitespaces:
+ for x in developer-manual user-manual faq; do \
+ sed -e 's/[ ]*$$//' < doc/text/$$x.txt > doc/text/$$x.nws;\
+ mv -f doc/text/$$x.nws doc/text/$$x.txt; \
done

- (cd doc/source; $(MAKE) pdf)
- (cd doc/source; $(MAKE) all)
-
touch build-stamp

-clean:
+clean: clean1 unpatch
+clean1:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp

-$(MAKE) clean
-$(MAKE) distclean
- rm -f privoxy
- rm -f configure config.h GNUmakefile
- rm -f doc/source/ldp.dsl
+ rm -f configure config.h GNUmakefile
+ rm -f privoxy.8
+
rm -rf obj
rm -f ActivityConsole.jar
rm -f src/java/org/privoxy/activityconsole/*.class

-# restore formatted upstream documentation:
- for x in text webserver pdf; do \
- if [ -d doc/$$x.dist ]; then \
- rm -rf doc/$$x; \
- mv doc/$$x.dist doc/$$x; \
- fi; \
- done
- for x in INSTALL README privoxy.1; do \
- if [ -f $$x.dist ]; then \
- rm -f $$x; \
- mv $$x.dist $$x; \
- fi; \
- done
+ rm -f doc/source/ldp.dsl
+ rm -rf doc/source/temp
+ rm -rf doc/pdf

dh_clean

-install: build
+install: build-stamp
dh_testdir
dh_testroot
dh_clean -k
@@ -92,14 +76,7 @@

install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy

- sed -e 's/^\(\(trust\|proxy\)-info-url\|admin-address\)/#\1/' \
- -e 's/^\(enable-\(edit-actions\|remote-toggle\)\)[ ]*1/\1 0/' \
- -e 's#^confdir .*#confdir /etc/privoxy#' \
- -e 's#^logdir .*#logdir /var/log/privoxy#' \
- -e 's%^#\(user-manual\).*%\1 /usr/share/doc/privoxy/user-manual%' \
- -e 's/\(Sample Configuration File for Privoxy\).*/\1/' \
- -e 's/Id: config,v.*/Id: config,v $$/' \
- < config > $(DEBDIR)/etc/privoxy/config
+ install -m 644 config $(DEBDIR)/etc/privoxy/config
install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
install -m 0644 standard.action $(DEBDIR)/etc/privoxy/standard.action
install -m 0644 user.action $(DEBDIR)/etc/privoxy/user.action
@@ -110,13 +87,23 @@
rm -f $(DEBDIR)/etc/privoxy/templates/*~
rm -rf $(DEBDIR)/etc/privoxy/templates/CVS

+# Remove CVS tags and trailing spaces from config files:
+ find $(DEBDIR)/etc/privoxy -type f \
+ | xargs grep -l '\$$[A-Z][^$$]*:[^$$]*\$$' \
+ | while read f; do \
+ sed -e 's/\$$\(Id: [^$$]*,v\)[^$$]*\$$/\1/' \
+ -e 's/\$$\(Source: [^$$]*\)\$$/\1/' \
+ -e 's/\$$\(Log: [^$$]*\)\$$/\1/' \
+ -e 's/ *$$//' < $$f > $$f.new; \
+ mv -f $$f.new $$f; \
+ done

# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-stamp install
# We have nothing to do by default.

# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-stamp install
dh_testdir
dh_testroot
# dh_installdebconf
@@ -147,5 +134,17 @@
dh_md5sums
dh_builddeb

+patch: patch-stamp
+patch-stamp:
+ dpatch apply-all
+ touch patch-stamp
+ #dpatch call-all -a=pkg-info >patch-stamp
+
+unpatch:
+ dpatch deapply-all
+ rm -rf patch-stamp debian/patched
+
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
+ clean1

--- .cvsignore DELETED ---


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV


<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

News | FAQ | advertise