From: Kern Sibbald Date: Thu, 10 Nov 2005 20:11:21 +0000 (+0000) Subject: Remove delete of CVS files X-Git-Tag: Release-1.38.1~13 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=10a2fa6f28f857c9a1976ddcbac6e9deb2de71ac;p=bacula%2Fbacula Remove delete of CVS files git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2570 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/ChangeLog b/bacula/ChangeLog index 0bea4ebf02..9c0a48ce2f 100644 --- a/bacula/ChangeLog +++ b/bacula/ChangeLog @@ -1,6 +1,12 @@ Changes to 1.38.1: +- Remove delete of CVS from all makefiles. +- Fix seg fault when clicking on Add button in wx-console + restore panel. Bug #470. +- Fix copyright date and URL typo -- bug #468. +- Change autostart install for FreeBSD to look for rc.conf + rather than rc.local as suggested fix for bug #466. - Apply patch supplied by Eric Bollinger to fix PostgreSQL grant on status. Bug #465 - Apply patch supplied by Eric Bollinger to fix PostgreSQL diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes index d55c20a771..ec9badc5e8 100644 --- a/bacula/ReleaseNotes +++ b/bacula/ReleaseNotes @@ -5,6 +5,7 @@ 20,440 additional lines of code since version 1.36.3 Changes since 1.38.0: +- Fix autostart install for FreeBSD. - Fix several problems with PostgreSQL scripts. - Critical: allow restore of the first file of non-portable Win32 backup. - Important: with muliple concurrent jobs the autochanger could get diff --git a/bacula/kes-1.38 b/bacula/kes-1.38 index b4eb64c7a4..7569459631 100644 --- a/bacula/kes-1.38 +++ b/bacula/kes-1.38 @@ -4,6 +4,7 @@ General: Changes to 1.38.1: +- Remove delete of CVS from all makefiles. - Fix seg fault when clicking on Add button in wx-console restore panel. Bug #470. - Fix copyright date and URL typo -- bug #468. diff --git a/bacula/kes-1.39 b/bacula/kes-1.39 index 0352d743f3..62a4e567c4 100644 --- a/bacula/kes-1.39 +++ b/bacula/kes-1.39 @@ -4,6 +4,7 @@ General: Changes to 1.39.0: +- Remove delete of CVS from all Makefiles - Fix seg fault when clicking on Add button in wx-console restore panel. Bug #470. - Fix copyright date and URL typo -- bug #468. diff --git a/bacula/platforms/Makefile.in b/bacula/platforms/Makefile.in index 046e4f1239..d0808e9768 100644 --- a/bacula/platforms/Makefile.in +++ b/bacula/platforms/Makefile.in @@ -91,12 +91,10 @@ clean: distclean: @rm -f Makefile - @rm -rf CVS @for subdir in ${SUBDIRS}; do \ if [ -f $${subdir}/Makefile ]; then \ (cd $${subdir}; $(MAKE) distclean) \ fi; \ - (cd $${subdir}; rm -rf CVS) \ done devclean: diff --git a/bacula/platforms/aix/Makefile.in b/bacula/platforms/aix/Makefile.in index 9116ee4f4c..0f66af0576 100644 --- a/bacula/platforms/aix/Makefile.in +++ b/bacula/platforms/aix/Makefile.in @@ -78,8 +78,6 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec - @rm -rf CVS devclean: clean @rm -f Makefile bacula-*.spec - diff --git a/bacula/platforms/alpha/Makefile.in b/bacula/platforms/alpha/Makefile.in index e0c9a1bdd8..a4c5c047f2 100644 --- a/bacula/platforms/alpha/Makefile.in +++ b/bacula/platforms/alpha/Makefile.in @@ -41,7 +41,6 @@ clean: distclean: clean @rm -f Makefile - @rm -rf CVS devclean: clean @rm -f Makefile diff --git a/bacula/platforms/bsdi/Makefile.in b/bacula/platforms/bsdi/Makefile.in index c070eed6c2..483686bee3 100644 --- a/bacula/platforms/bsdi/Makefile.in +++ b/bacula/platforms/bsdi/Makefile.in @@ -133,8 +133,6 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec - @rm -rf CVS devclean: clean @rm -f Makefile bacula-*.spec - diff --git a/bacula/platforms/darwin/Makefile.in b/bacula/platforms/darwin/Makefile.in index 0c2d64f417..c6fde3ee46 100644 --- a/bacula/platforms/darwin/Makefile.in +++ b/bacula/platforms/darwin/Makefile.in @@ -41,8 +41,6 @@ clean: distclean: clean @rm -f Makefile - @rm -rf CVS devclean: clean @rm -f Makefile - diff --git a/bacula/platforms/freebsd/Makefile.in b/bacula/platforms/freebsd/Makefile.in index 8855885714..2e8c110769 100644 --- a/bacula/platforms/freebsd/Makefile.in +++ b/bacula/platforms/freebsd/Makefile.in @@ -133,7 +133,6 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec - @rm -rf CVS devclean: clean @rm -f Makefile bacula-*.spec diff --git a/bacula/platforms/gentoo/Makefile.in b/bacula/platforms/gentoo/Makefile.in index bdc07d6e8a..a442fe70dd 100644 --- a/bacula/platforms/gentoo/Makefile.in +++ b/bacula/platforms/gentoo/Makefile.in @@ -50,8 +50,6 @@ clean: distclean: clean @rm -f Makefile - @rm -rf CVS devclean: clean @rm -f Makefile - diff --git a/bacula/platforms/irix/Makefile.in b/bacula/platforms/irix/Makefile.in index 2d156d06a5..067d092a1d 100644 --- a/bacula/platforms/irix/Makefile.in +++ b/bacula/platforms/irix/Makefile.in @@ -78,8 +78,6 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec - @rm -rf CVS devclean: clean @rm -f Makefile bacula-*.spec - diff --git a/bacula/platforms/mandrake/Makefile.in b/bacula/platforms/mandrake/Makefile.in index 1f455a023a..1d43bbb9e6 100644 --- a/bacula/platforms/mandrake/Makefile.in +++ b/bacula/platforms/mandrake/Makefile.in @@ -79,9 +79,7 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec @rm -f bacula-sd bacula-fd bacula-dir - @rm -rf CVS devclean: clean @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec @rm -f bacula-sd bacula-fd bacula-dir - diff --git a/bacula/platforms/openbsd/Makefile.in b/bacula/platforms/openbsd/Makefile.in index c070eed6c2..483686bee3 100644 --- a/bacula/platforms/openbsd/Makefile.in +++ b/bacula/platforms/openbsd/Makefile.in @@ -133,8 +133,6 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec - @rm -rf CVS devclean: clean @rm -f Makefile bacula-*.spec - diff --git a/bacula/platforms/redhat/Makefile.in b/bacula/platforms/redhat/Makefile.in index b99c29d2d8..09c37f7c70 100644 --- a/bacula/platforms/redhat/Makefile.in +++ b/bacula/platforms/redhat/Makefile.in @@ -84,7 +84,6 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec @rm -f bacula-sd bacula-fd bacula-dir - @rm -rf CVS devclean: clean @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec diff --git a/bacula/platforms/slackware/Makefile.in b/bacula/platforms/slackware/Makefile.in index 056b2705a7..590bfe75aa 100644 --- a/bacula/platforms/slackware/Makefile.in +++ b/bacula/platforms/slackware/Makefile.in @@ -59,7 +59,6 @@ clean: distclean: clean @rm -f Makefile - @rm -rf CVS devclean: clean @rm -f Makefile diff --git a/bacula/platforms/solaris/Makefile.in b/bacula/platforms/solaris/Makefile.in index b630488600..fadccf357d 100644 --- a/bacula/platforms/solaris/Makefile.in +++ b/bacula/platforms/solaris/Makefile.in @@ -81,8 +81,6 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec - @rm -rf CVS devclean: clean @rm -f Makefile bacula-*.spec - diff --git a/bacula/platforms/suse/Makefile.in b/bacula/platforms/suse/Makefile.in index 9e54418e7c..f4bbc6738a 100644 --- a/bacula/platforms/suse/Makefile.in +++ b/bacula/platforms/suse/Makefile.in @@ -78,7 +78,6 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec @rm -f bacula-sd bacula-fd bacula-dir - @rm -rf CVS devclean: clean @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec diff --git a/bacula/platforms/unknown/Makefile.in b/bacula/platforms/unknown/Makefile.in index bb11d6a8bd..124b381fdf 100644 --- a/bacula/platforms/unknown/Makefile.in +++ b/bacula/platforms/unknown/Makefile.in @@ -41,8 +41,6 @@ clean: distclean: @rm -f bacula-SD bacula-FD bacula-DIR Makefile bacula-*.spec - @rm -rf CVS devclean: @rm -f bacula-SD bacula-FD bacula-DIR Makefile bacula-*.spec - diff --git a/bacula/src/Makefile.in b/bacula/src/Makefile.in index cee9c1fce1..1111f8c724 100644 --- a/bacula/src/Makefile.in +++ b/bacula/src/Makefile.in @@ -52,7 +52,6 @@ distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi @(cd $(srcdir) && $(RMF) Makefile) @$(RMF) config.h host.h - @$(RMF) -r CVS devclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in index e67461dee0..f27d6255f8 100644 --- a/bacula/src/cats/Makefile.in +++ b/bacula/src/cats/Makefile.in @@ -84,7 +84,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) + (cd $(srcdir); $(RMF) Makefile) devclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in index b930c0b979..df679314bf 100644 --- a/bacula/src/console/Makefile.in +++ b/bacula/src/console/Makefile.in @@ -73,7 +73,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) + (cd $(srcdir); $(RMF) Makefile) devclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in index 96e9cb18f3..316ad3f50f 100644 --- a/bacula/src/dird/Makefile.in +++ b/bacula/src/dird/Makefile.in @@ -101,7 +101,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) + (cd $(srcdir); $(RMF) Makefile) devclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in index 0dc5ca171f..ff1dde0cd8 100755 --- a/bacula/src/filed/Makefile.in +++ b/bacula/src/filed/Makefile.in @@ -106,7 +106,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) + (cd $(srcdir); $(RMF) Makefile) if test -f win32/Makefile; then \ (cd win32; $(MAKE) distclean); \ fi diff --git a/bacula/src/filed/win32/Makefile.in b/bacula/src/filed/win32/Makefile.in index d7b01e6b73..377227c4fc 100755 --- a/bacula/src/filed/win32/Makefile.in +++ b/bacula/src/filed/win32/Makefile.in @@ -66,7 +66,6 @@ clean: distclean: clean @rm -f Makefile - @rm -rf bin/CVS CVS devclean: clean @rm -f Makefile diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in index 51eca1780f..c4b46994d1 100644 --- a/bacula/src/findlib/Makefile.in +++ b/bacula/src/findlib/Makefile.in @@ -61,7 +61,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) + (cd $(srcdir); $(RMF) Makefile) devclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi diff --git a/bacula/src/gnome2-console/Makefile.in b/bacula/src/gnome2-console/Makefile.in index 14bd4f762b..5a4c28f3d2 100644 --- a/bacula/src/gnome2-console/Makefile.in +++ b/bacula/src/gnome2-console/Makefile.in @@ -86,7 +86,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) + (cd $(srcdir); $(RMF) Makefile) devclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in index 573e294da1..862ebf8d80 100644 --- a/bacula/src/lib/Makefile.in +++ b/bacula/src/lib/Makefile.in @@ -122,7 +122,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) + (cd $(srcdir); $(RMF) Makefile) # Semi-automatic generation of dependencies: # Use gcc -MM because X11 `makedepend' doesn't work on all systems diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in index 3b5c43d58f..3851a1681d 100644 --- a/bacula/src/stored/Makefile.in +++ b/bacula/src/stored/Makefile.in @@ -193,7 +193,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) + (cd $(srcdir); $(RMF) Makefile) devclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in index 340909dd25..2debf389cb 100644 --- a/bacula/src/tools/Makefile.in +++ b/bacula/src/tools/Makefile.in @@ -88,7 +88,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) + (cd $(srcdir); $(RMF) Makefile) devclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi diff --git a/bacula/src/tray-monitor/Makefile.in b/bacula/src/tray-monitor/Makefile.in index 8860034004..f37e98c7ab 100644 --- a/bacula/src/tray-monitor/Makefile.in +++ b/bacula/src/tray-monitor/Makefile.in @@ -62,7 +62,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) + (cd $(srcdir); $(RMF) Makefile) devclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in index 3115125c4a..214887256d 100644 --- a/bacula/src/wx-console/Makefile.in +++ b/bacula/src/wx-console/Makefile.in @@ -96,7 +96,6 @@ clean: distclean: clean $(RMF) Makefile - $(RMF) -r CVS Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \