packages: bacula/bacula-link.patch, bacula/bacula-mtx-changer.patch - up to...

glen glen at pld-linux.org
Thu Feb 25 11:18:01 CET 2010 

Author: glen                         Date: Thu Feb 25 10:18:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.0.1

---- Files affected:
packages/bacula:
   bacula-link.patch (1.2 -> 1.3) , bacula-mtx-changer.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/bacula/bacula-link.patch
diff -u packages/bacula/bacula-link.patch:1.2 packages/bacula/bacula-link.patch:1.3
--- packages/bacula/bacula-link.patch:1.2	Sat Apr 11 00:39:43 2009
+++ packages/bacula/bacula-link.patch	Thu Feb 25 11:17:55 2010
@@ -1,29 +1,29 @@
---- bacula-3.0.0/src/lib/Makefile.in_	2009-04-10 22:10:09.584897968 +0000
-+++ bacula-3.0.0/src/lib/Makefile.in	2009-04-10 22:11:28.661552416 +0000
-@@ -116,7 +116,7 @@
+--- bacula-5.0.1/src/lib/Makefile.in~	2010-02-24 17:33:48.000000000 +0200
++++ bacula-5.0.1/src/lib/Makefile.in	2010-02-25 11:57:20.038428596 +0200
+@@ -126,7 +126,7 @@
  
- libbac.la: Makefile $(LIBBAC_OBJS)
+ libbac.la: Makefile $(LIBBAC_LOBJS)
  	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_CURRENT):$(LIBBAC_LT_REVISION):$(LIBBAC_LT_AGE) $(WRAPLIBS)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_CURRENT):$(LIBBAC_LT_REVISION):$(LIBBAC_LT_AGE) $(WRAPLIBS) $(OPENSSL_LIBS) $(LIBS)
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS) $(OPENSSL_LIBS) $(LIBS)
  
  libbaccfg.a: $(LIBBACCFG_OBJS) 
  	@echo "Making $@ ..."
-@@ -125,7 +125,7 @@
+@@ -135,7 +135,7 @@
  
- libbaccfg.la: Makefile $(LIBBACCFG_OBJS) 
+ libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) 
  	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_CURRENT):$(LIBBACCFG_LT_REVISION):$(LIBBACCFG_LT_AGE)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_CURRENT):$(LIBBACCFG_LT_REVISION):$(LIBBACCFG_LT_AGE) $(OPENSSL_LIBS) $(LIBS)
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE) $(OPENSSL_LIBS) $(LIBS)
  
  libbacpy.a: $(LIBBACPY_OBJS) 
  	@echo "Making $@ ..."
-@@ -134,7 +134,7 @@
+@@ -144,7 +144,7 @@
  
- libbacpy.la: Makefile $(LIBBACPY_OBJS) 
+ libbacpy.la: Makefile $(LIBBACPY_LOBJS) 
  	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_CURRENT):$(LIBBACPY_LT_REVISION):$(LIBBACPY_LT_AGE) $(PYTHON_LIBS)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_CURRENT):$(LIBBACPY_LT_REVISION):$(LIBBACPY_LT_AGE) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_CURRENT).$(LIBBACPY_LT_REVISION).$(LIBBACPY_LT_AGE) $(PYTHON_LIBS)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_CURRENT).$(LIBBACPY_LT_REVISION).$(LIBBACPY_LT_AGE) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
  
  Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
  	cd $(topdir) \

================================================================
Index: packages/bacula/bacula-mtx-changer.patch
diff -u packages/bacula/bacula-mtx-changer.patch:1.1 packages/bacula/bacula-mtx-changer.patch:1.2
--- packages/bacula/bacula-mtx-changer.patch:1.1	Wed Apr 15 18:00:40 2009
+++ packages/bacula/bacula-mtx-changer.patch	Thu Feb 25 11:17:55 2010
@@ -1,9 +1,17 @@
---- bacula-3.0.0/scripts/mtx-changer.in.org	2009-04-15 15:10:55.507667883 +0000
-+++ bacula-3.0.0/scripts/mtx-changer.in	2009-04-15 15:12:18.968782941 +0000
-@@ -47,7 +47,7 @@
+--- bacula-5.0.1/scripts/mtx-changer.in~	2010-02-24 17:33:48.000000000 +0200
++++ bacula-5.0.1/scripts/mtx-changer.in	2010-02-25 11:49:14.545143118 +0200
+@@ -47,13 +47,13 @@
  #
  
  # source our conf file
+-if test ! -f @scriptdir@/mtx-changer.conf ; then
++if test ! -f /etc/bacula/mtx-changer.conf ; then
+   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+-  echo "ERROR: @scriptdir@/mtx-changer.conf file not found!!!!"
++  echo "ERROR: /etc/bacula/mtx-changer.conf file not found!!!!"
+   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+   exit 1
+ fi
 -. @scriptdir@/mtx-changer.conf
 +. /etc/bacula/mtx-changer.conf
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-link.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-mtx-changer.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list