SOURCES: privoxy-DESTDIR.patch - readded - fix against $DESTDIR/etc/privoxy...

[twittner]

Author: twittner                     Date: Tue Oct 14 18:39:18 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- readded - fix against $DESTDIR/etc/privoxy/{config,trust}.new files
  when /etc/privoxy/{config,trust} files already exist in system 

---- Files affected:
SOURCES:
   privoxy-DESTDIR.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/privoxy-DESTDIR.patch
diff -u /dev/null SOURCES/privoxy-DESTDIR.patch:1.4
--- /dev/null	Tue Oct 14 20:39:19 2008
+++ SOURCES/privoxy-DESTDIR.patch	Tue Oct 14 20:39:12 2008
@@ -0,0 +1,11 @@
+--- privoxy-3.0.10-stable/GNUmakefile.in~	2008-10-14 19:47:45.000000000 +0200
++++ privoxy-3.0.10-stable/GNUmakefile.in	2008-10-14 19:48:00.000000000 +0200
+@@ -1139,7 +1139,7 @@
+ 			$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
+ 			$(ECHO) Installing fresh $$i;\
+ 			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+-		elif [ -s "$(CONF_DEST)/$$i" ]; then \
++		elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
+ 			$(ECHO) Installing $$i as $$i.new ;\
+ 			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+ 			NEW=1;\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/privoxy-DESTDIR.patch?r1=1.3&r2=1.4&f=u