From: swa Date: Sun, 24 Mar 2002 12:56:21 +0000 (+0000) Subject: name change related issues. X-Git-Tag: v_2_9_13~36 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=41a0f58d7a5dfd377d0831fa5642947eb9ecc2ac name change related issues. --- diff --git a/GNUmakefile.in b/GNUmakefile.in index a215b897..420deb1a 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.20 2002/03/24 11:39:17 jongfoster Exp $ +# $Id: GNUmakefile.in,v 1.21 2002/03/24 12:43:57 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://ijbswa.sourceforge.net @@ -39,7 +39,7 @@ CODE_STATUS = @CODE_STATUS@ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT) # will automatically be postfixed with -$(RPM_PACKAGEV) in the SPECfile RPM_VERSION = $(VERSION) -RPM_PACKAGEV = 3 +RPM_PACKAGEV = 1 ############################################################################# @@ -55,7 +55,7 @@ MAN_DEST = @mandir@ # Build tools ############################################################################# -PROGRAM = jbng@EXEEXT@ +PROGRAM = privoxy@EXEEXT@ CC = @CC@ ECHO = echo GZIP_PROG = gzip @@ -89,7 +89,7 @@ DOSFILTER = perl -p -e 's/\n/\r\n/' # Setup for make distribution rh and suse for now ############################################################################# -TAR_ARCH = /tmp/Privoxy-$(RPM_VERSION).tar.gz +TAR_ARCH = /tmp/privoxy-$(RPM_VERSION).tar.gz RPM_BASE = @RPM_BASE@ ############################################################################# @@ -342,8 +342,8 @@ tarball-dist: @make clean make $(PROGRAM) # remove all objects and create the tarball with the binary - cd .. && $(RM) ijb/a.out ijb/core ijb/*.@OBJEXT@ && tar --exclude "ijb/CVS" -cvzf ../Privoxy-distribution-$(VERSION).tar.gz ijb/ - chmod a+r ../../Privoxy-distribution-$(VERSION).tar.gz + cd .. && $(RM) ijb/a.out ijb/core ijb/*.@OBJEXT@ && tar --exclude "ijb/CVS" -cvzf ../privoxy-distribution-$(VERSION).tar.gz ijb/ + chmod a+r ../../privoxy-distribution-$(VERSION).tar.gz @$(ECHO) Tarball with binary created. ############################################################################# @@ -489,9 +489,9 @@ tags: $(SRCS) $(HDRS) etags $(SRCS) $(HDRS) tarball-src: clobber - $(LN) -s current ../Privoxy-$(VERSION)-$(CODE_STATUS) - $(TAR) -C.. -cvhzf Privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz Privoxy-$(VERSION)-$(CODE_STATUS) - $(RM) ../Privoxy-$(VERSION)-$(CODE_STATUS) + $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) + $(TAR) -C.. -cvhzf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz privoxy-$(VERSION)-$(CODE_STATUS) + $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) install: all # @@ -518,6 +518,9 @@ install: all ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.21 2002/03/24 12:43:57 swa +# name change +# # Revision 1.20 2002/03/24 11:39:17 jongfoster # Renaming config files # diff --git a/configure.in b/configure.in index f3a7d415..611add3f 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl $Id: configure.in,v 1.41 2002/03/19 19:30:04 morcego Exp $ +dnl $Id: configure.in,v 1.42 2002/03/22 18:11:37 jongfoster Exp $ dnl dnl Written by and Copyright (C) 2001 the SourceForge dnl IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,9 @@ dnl or write to the Free Software Foundation, Inc., 59 dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl dnl $Log: configure.in,v $ +dnl Revision 1.42 2002/03/22 18:11:37 jongfoster +dnl Bumping version number to 2.9.12 +dnl dnl Revision 1.41 2002/03/19 19:30:04 morcego dnl - Fixing stylesheet checking on configure. If it is found, no further checks dnl should be done @@ -277,7 +280,7 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.41 $) +AC_REVISION($Revision: 1.42 $) AC_INIT(jcc.c) AC_CONFIG_HEADER(config.h) AC_CANONICAL_HOST @@ -311,7 +314,7 @@ dnl ================================================================= VERSION_MAJOR=2 VERSION_MINOR=9 -VERSION_POINT=12 +VERSION_POINT=13 CODE_STATUS="beta" dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be diff --git a/privoxy-rh.spec b/privoxy-rh.spec index 504af0a6..a8d39fce 100644 --- a/privoxy-rh.spec +++ b/privoxy-rh.spec @@ -1,4 +1,4 @@ -# $Id: privoxy-rh.spec,v 1.1 2002/03/24 11:23:44 swa Exp $ +# $Id: privoxy-rh.spec,v 1.2 2002/03/24 11:40:14 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge # PRIVOXY team. http://ijbswa.sourceforge.net @@ -98,7 +98,7 @@ install -s -m 744 jbng %{buildroot}%{_sbindir}/jbng # do we need this??? #sed -e 's@^.TH JUNKBUSTER 1@.TH JUNKBUSTER 8@g' %{oldname}.1 > %{buildroot}%{_mandir}/man8/%{oldname}.8 cp -f *.action %{buildroot}%{privoxyconf}/ -cp -f re_filterfile %{buildroot}%{privoxyconf}/re_filterfile +cp -f default.filter %{buildroot}%{privoxyconf}/default.filter cp -f trust %{buildroot}%{privoxyconf}/trust cp -f templates/* %{buildroot}%{privoxyconf}/templates/ cp -f %{oldname}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{oldname} @@ -112,15 +112,15 @@ install -m 711 -d %{buildroot}%{_localstatedir}/log/%{name} cat config | \ sed 's@^confdir.*@confdir %{privoxyconf}@g' | \ # sed 's/^permissionsfile.*/permissionsfile \/etc\/%{name}\/permissionsfile/g' | \ -# sed 's/^re_filterfile.*/re_filterfile \/etc\/%{name}\/re_filterfile/g' | \ +# sed 's/^filterfile.*/default.filter \/etc\/%{name}\/default.filter/g' | \ # sed 's/^logfile.*/logfile \%{_localstatedir}\/log\/%{name}\/logfile/g' | \ # sed 's/^jarfile.*/jarfile \%{_localstatedir}\/log\/%{name}\/jarfile/g' | \ # sed 's/^forward.*/forward \/etc\/%{name}\/forward/g' | \ # sed 's/^aclfile.*/aclfile \/etc\/%{name}\/aclfile/g' > \ sed 's@^logdir.*@logdir %{_localstatedir}/log/%{name}@g' > \ %{buildroot}%{privoxyconf}/config -perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' ijb.action >\ - %{buildroot}%{privoxyconf}/ijb.action +perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' default.action >\ + %{buildroot}%{privoxyconf}/default.action ## Macros are expanded even on commentaries. So, we have to use %% ## -- morcego @@ -194,11 +194,11 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true # We should not use wildchars here. This could mask missing files problems # -- morcego %config %{privoxyconf}/config -%config %{privoxyconf}/ijb-advanced.action -%config %{privoxyconf}/ijb-basic.action -%config %{privoxyconf}/ijb-intermediate.action -%config %{privoxyconf}/ijb.action -%config %{privoxyconf}/re_filterfile +%config %{privoxyconf}/advanced.action +%config %{privoxyconf}/basic.action +%config %{privoxyconf}/intermediate.action +%config %{privoxyconf}/default.action +%config %{privoxyconf}/default.filter %config %{privoxyconf}/trust %config %{privoxyconf}/templates/blocked @@ -480,6 +480,9 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true additional "-r @" flag. # $Log: privoxy-rh.spec,v $ +# Revision 1.2 2002/03/24 11:40:14 swa +# name change +# # Revision 1.1 2002/03/24 11:23:44 swa # name change # diff --git a/privoxy-suse.spec b/privoxy-suse.spec index 32962987..43ed6956 100644 --- a/privoxy-suse.spec +++ b/privoxy-suse.spec @@ -1,4 +1,4 @@ -# $Id: privoxy-suse.spec,v 1.2 2002/03/24 11:40:14 swa Exp $ +# $Id: privoxy-suse.spec,v 1.3 2002/03/24 12:44:31 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge # PRIVOXY team. http://ijbswa.sourceforge.net @@ -108,7 +108,7 @@ gzip README AUTHORS ChangeLog privoxy.1 || /bin/true install -s -m 744 privoxy $RPM_BUILD_ROOT%{_sbindir}/privoxy cp -f privoxy.1.gz $RPM_BUILD_ROOT%{_mandir}/man8/privoxy.8.gz cp -f *.action $RPM_BUILD_ROOT%{ijbconf}/ -cp -f re_filterfile $RPM_BUILD_ROOT%{ijbconf}/re_filterfile +cp -f default.filter $RPM_BUILD_ROOT%{ijbconf}/default.filter cp -f trust $RPM_BUILD_ROOT%{ijbconf}/trust cp -f templates/* $RPM_BUILD_ROOT%{ijbconf}/templates/ cp -f privoxy.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/privoxy @@ -121,7 +121,7 @@ ln -sf /etc/init.d/privoxy $RPM_BUILD_ROOT/usr/sbin/rcprivoxy cat config | \ sed 's/^confdir.*/confdir \/etc\/privoxy/g' | \ # sed 's/^permissionsfile.*/permissionsfile \/etc\/privoxy\/permissionsfile/g' | \ -# sed 's/^re_filterfile.*/re_filterfile \/etc\/privoxy\/re_filterfile/g' | \ +# sed 's/^filterfile.*/default.filter \/etc\/privoxy\/default.filter/g' | \ # sed 's/^logfile.*/logfile \/var\/log\/privoxy\/logfile/g' | \ # sed 's/^jarfile.*/jarfile \/var\/log\/privoxy\/jarfile/g' | \ # sed 's/^forward.*/forward \/etc\/privoxy\/forward/g' | \ @@ -283,6 +283,9 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true - new package: version 2.0 # $Log: privoxy-suse.spec,v $ +# Revision 1.3 2002/03/24 12:44:31 swa +# new version string +# # Revision 1.2 2002/03/24 11:40:14 swa # name change #