Update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5746 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 68aba65dc7d59e037770e8f5c493c6cbaff3d5c4..53431e0ce7e80bbc84e0e2e991ac516227224a9b 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -67,14 +67,6 @@ configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autocon
        autoconf/configure.in > configure
        chmod 755 configure
 
-old-configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h
-       cd $(srcdir);
-       ${RMF} -f config.cache config.log config.out config.status src/config.h
-       autoconf --include=$(srcdir)/autoconf \
-       autoconf/configure.in > configure
-       chmod 755 configure
-       @rm -f config.cache
-
 config.status:
        if test -x config.status; then config.status --recheck; \
        else $(SHELL) configure; fi

diff --git a/bacula/kernstodo b/bacula/kernstodo
index d840d86f2d585399e05a105642a9fa999553eaca..7a1c1ee607b97ea8892a929decb59313099a93cf 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -66,6 +66,7 @@ Professional Needs:
    Complete rework of the scheduling system (not in list)
    Performance and usage instrumentation (not in list)
    See email of 21Aug2007 for details.
+- Implement Diff,Inc Retention Periods
 
 Priority:
 - Erabt if min_block_size > max_block_size

diff --git a/bacula/src/win32/stored/who.h b/bacula/src/win32/stored/who.h
index 910d00d5fcfd93e276a913c464484aeada990226..999347d5180d5374dae4f755e1ab87e472e20236 100644 (file)
--- a/bacula/src/win32/stored/who.h
+++ b/bacula/src/win32/stored/who.h
@@ -36,7 +36,7 @@
 
 #define APP_NAME "Bacula-sd"
 #define LC_APP_NAME "bacula-sd"
-#define APP_DESC "Bacula Storagee Service"
+#define APP_DESC "Bacula Storage Service"
 
 #define terminate_app(x) terminate_stored(x)
 extern void terminate_stored(int sig);