[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-59-g960e5ed

Alexander Golovko alexandro at ankalagon.ru
Sun May 20 14:56:43 UTC 2012 

The following commit has been merged in the master branch:
commit a354655f2f6886b4cc62bdfbae2dcc31ede09cbd
Merge: 0f2040421d6cdd56fc00c7110a9d7852ca2dafd1 0a8a3fcf4c94d3062a859327b281e9bac450cdeb
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sun May 20 11:54:19 2012 +0400

    Merge commit '0a8a3fc'
    
    Changes from merged commit:
      fix bacula-fd.so installation
      cleanup bat binary installation
      fix dh_prep calling after real dh_auto_install
      fix overriting *-pgsql and *-mysql files by files, generated for *-sqlite3
      fix files living in *-mysql and *-sqlite3 from first *-pgsql build
      fix defconfig files installation
    
    Resulting packages don't differ from pre-merge, except:
      examples/nagios/check_bacula/Makefile.gz which must be removed
      from package

diff --combined debian/bacula-common.install
index 67c5fa1,3692a53..e412d72
--- a/debian/bacula-common.install
+++ b/debian/bacula-common.install
@@@ -1,15 -1,9 +1,15 @@@
- debian/tmp-install-sqlite3/usr/sbin/btraceback usr/lib/bacula
- debian/tmp-install-sqlite3/etc/bacula/scripts/btraceback.gdb etc/bacula/scripts
- debian/tmp-install-sqlite3/usr/lib/bacula/libbaccfg* usr/lib/bacula
- debian/tmp-install-sqlite3/usr/lib/bacula/libbacfind* usr/lib/bacula
- debian/tmp-install-sqlite3/usr/lib/bacula/libbac.* usr/lib/bacula
- debian/tmp-install-sqlite3/usr/lib/bacula/libbac-* usr/lib/bacula
- debian/tmp-install-sqlite3/usr/lib/bacula/libbacpy* usr/lib/bacula
- debian/tmp-install-sqlite3/usr/sbin/bsmtp		usr/lib/bacula
- debian/tmp-install-sqlite3/etc/bacula/tray-monitor.conf	usr/share/bacula-common/defconfig
- debian/tmp-install-sqlite3/etc/bacula/bat.conf			usr/share/bacula-common/defconfig
- debian/tmp-install-sqlite3/etc/bacula/bconsole.conf		usr/share/bacula-common/defconfig
- debian/tmp-install-sqlite3/etc/bacula/bacula-sd.conf		usr/share/bacula-common/defconfig
- debian/tmp-install-sqlite3/etc/bacula/bacula-fd.conf		usr/share/bacula-common/defconfig
- debian/tmp-install-sqlite3/etc/bacula/bacula-dir.conf		usr/share/bacula-common/defconfig
+ etc/bacula/scripts/btraceback.gdb
+ usr/lib/bacula/libbaccfg*
+ usr/lib/bacula/libbacfind*
+ usr/lib/bacula/libbac.*
+ usr/lib/bacula/libbac-*
+ usr/lib/bacula/libbacpy*
+ usr/sbin/btraceback		usr/lib/bacula
+ usr/sbin/bsmtp			usr/lib/bacula
  debian/common-functions		usr/share/bacula-common
++etc/bacula/tray-monitor.conf	usr/share/bacula-common/defconfig
++etc/bacula/bat.conf		usr/share/bacula-common/defconfig
++etc/bacula/bconsole.conf	usr/share/bacula-common/defconfig
++etc/bacula/bacula-sd.conf	usr/share/bacula-common/defconfig
++etc/bacula/bacula-fd.conf	usr/share/bacula-common/defconfig
++etc/bacula/bacula-dir.conf	usr/share/bacula-common/defconfig
diff --combined debian/bacula-console-qt.install
index ce9510e,03e1cc7..dba9e4b
--- a/debian/bacula-console-qt.install
+++ b/debian/bacula-console-qt.install
@@@ -1,1 -1,2 +1,1 @@@
--src/qt-console/.libs/bat usr/bin
 -etc/bacula/bat.conf
++usr/sbin/bat usr/bin
diff --combined debian/bacula-console.install
index 7234b56,2a60dc7..30f5b06
--- a/debian/bacula-console.install
+++ b/debian/bacula-console.install
@@@ -1,2 -1,1 +1,2 @@@
- debian/tmp-install-sqlite3/usr/sbin/bconsole usr/sbin
- debian/tmp-install-sqlite3/etc/bacula/bconsole.conf etc/bacula
+ usr/sbin/bconsole
++etc/bacula/bconsole.conf
diff --combined debian/bacula-fd.install
index b0c5263,e0e5465..f92725e
--- a/debian/bacula-fd.install
+++ b/debian/bacula-fd.install
@@@ -1,2 -1,2 +1,2 @@@
- debian/tmp-install-sqlite3/usr/sbin/bacula-fd usr/sbin
- debian/tmp-install-sqlite3/usr/lib/bacula/bpipe-fd.so usr/lib/bacula
+ usr/sbin/bacula-fd
 -usr/lib/bacula/bpipe-fd
++usr/lib/bacula/bpipe-fd.so
diff --combined debian/rules
index db951ad,84d17e7..ab2906d
--- a/debian/rules
+++ b/debian/rules
@@@ -9,7 -9,6 +9,6 @@@ VARIANTS := pgsql mysql sqlite
  
  ######################################################################
  
- INSTALLDIR := $(CURDIR)/debian/tmp-install
  DBC := usr/share/dbconfig-common/data/
  
  CONF_ALL	= --enable-smartalloc \
@@@ -17,15 -16,14 +16,14 @@@
  	--with-openssl \
  	--with-libiconv-prefix=/usr/include --with-readline=/usr/include/readline \
  	--disable-conio \
- 	--with-libintl-prefix=/usr/include --with-x \
+ 	--with-libintl-prefix=/usr/include \
  		--docdir=\$${prefix}/share/doc/bacula-common \
  		--htmldir=\$${prefix}/share/doc/bacula-common/html \
  		--libdir=\$${prefix}/lib/bacula \
  	--enable-batch-insert \
- 	--disable-bwx-console \
  	--without-qwt \
  	--enable-ipv6 \
 -	--with-dir-passowrd=XXX_DIRPASSWORD_XXX \
 +	--with-dir-password=XXX_DIRPASSWORD_XXX \
  	--with-fd-password=XXX_FDPASSWORD_XXX \
  	--with-sd-password=XXX_SDPASSWORD_XXX \
  	--with-mon-dir-password=XXX_MONDIRPASSWORD_XXX \
@@@ -43,22 -41,21 +41,21 @@@
  	--with-working-dir=/var/lib/bacula \
  	--with-subsys-dir=/var/lock
  
- 
- CONF_common	= --disable-gnome --disable-bwx-console --disable-tray-monitor \
- 			--disable-bat
- 
  ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
  CONF_ALL	+= --disable-acl --disable-xattr
  endif
  
- CONF_sqlite3	= --with-sqlite3 --without-mysql --without-postgresql --without-sqlite \
- 			--enable-tray-monitor --enable-bat
- CONF_mysql	= --with-mysql --without-sqlite --without-postgresql --without-sqlite3 $(CONF_common)
- CONF_pgsql	= --with-postgresql --without-sqlite --without-mysql --without-sqlite3 $(CONF_common)
+ # Only for the last variant we build client stuff
+ CONF_common	= --disable-tray-monitor --disable-bat
+ 
+ CONF_mysql	= --with-mysql --without-postgresql --without-sqlite3 $(CONF_common)
+ CONF_pgsql	= --with-postgresql --without-mysql --without-sqlite3 $(CONF_common)
+ CONF_sqlite3	= --with-sqlite3 --without-mysql --without-postgresql \
+ 		  --enable-bat --enable-tray-monitor --enable-bwx-console --with-x
  
- LONGNAME_sqlite3	= sqlite3
  LONGNAME_mysql		= mysql
  LONGNAME_pgsql		= postgresql
+ LONGNAME_sqlite3	= sqlite3
  
  ###########################################################################
  
@@@ -92,10 -89,6 +89,6 @@@ ende
  %:
  	dh $@ --with autotools_dev
  
- override_dh_clean:
- 	$(RM) -r $(INSTALLDIR)-*
- 	dh_clean
- 
  override_dh_shlibdeps:
  	# Handle shlibs for the database packages specially so they get
  	# the deps on the correct libraries.
@@@ -120,7 -113,7 +113,10 @@@ override_dh_installinit
  override_dh_install:
  	chmod 755 debian/additions/postinst-common
  	chmod 755 debian/scripts/extract_here
--	dh_install
++	dh_install \
++		-Nbacula-director-pgsql -Nbacula-sd-pgsql -Nbacula-common-pgsql \
++		-Nbacula-director-mysql -Nbacula-sd-mysql -Nbacula-common-mysql \
++		-Nbacula-director-sqlite3 -Nbacula-sd-sqlite3 -Nbacula-common-sqlite3
  	chmod 755 debian/bacula-common/usr/lib/bacula/btraceback
  	######### dbconfig-common stuff
  	# Sometimes the latest release doesn't have a copy of the data in updatedb.
@@@ -128,9 -121,9 +124,9 @@@
  	# versions to an ext-upgrade-db line.
  	#
  	# lenny -> squeeze is 10 -> 12
 -	$(foreach db,$(VARIANTS),$(call ext-upgrade-db,$(db),10_to_11,3.0.0))
 -	$(foreach db,$(VARIANTS),$(call ext-upgrade-latest-db,$(db),5.0.0))   # 5.0.0 upgrade 11 to 12
 -	$(foreach db,$(VARIANTS),$(call ext-install-db,$(db)))
 +	$(foreach db,$(VARIANTS),$(call ext-upgrade-db,$(db),10_to_11,3.0.0);)
 +	$(foreach db,$(VARIANTS),$(call ext-upgrade-latest-db,$(db),5.0.0);)   # 5.0.0 upgrade 11 to 12
 +	$(foreach db,$(VARIANTS),$(call ext-install-db,$(db));)
  
  override_dh_installdocs:
  	dh_installdocs -pbacula --link-doc=bacula-common
@@@ -140,18 -133,22 +136,25 @@@
  	dh_installdocs -Nbacula
  
  override_dh_auto_build:
 +	autoconf -I autoconf/ -o configure autoconf/configure.in
+ 	dh_prep
+ 	dh_installdirs
  	dh_auto_configure -- $(CONF_ALL) $(CONF_pgsql)
  	dh_auto_build --parallel
- 	dh_auto_install -- DESTDIR=$(INSTALLDIR)-pgsql
+ 	dh_auto_install
+ 	dh_install -pbacula-director-pgsql -pbacula-sd-pgsql -pbacula-common-pgsql
  	dh_auto_clean
++	rm -rf debian/tmp
  	dh_auto_configure -- $(CONF_ALL) $(CONF_mysql)
  	dh_auto_build --parallel
- 	dh_auto_install -- DESTDIR=$(INSTALLDIR)-mysql
+ 	dh_auto_install
+ 	dh_install -pbacula-director-mysql -pbacula-sd-mysql -pbacula-common-mysql
  	dh_auto_clean
++	rm -rf debian/tmp
  	dh_auto_configure -- $(CONF_ALL) $(CONF_sqlite3)
  	dh_auto_build --parallel
- 	dh_auto_install -- DESTDIR=$(INSTALLDIR)-sqlite3
+ 	dh_auto_install
+ 	dh_install -pbacula-director-sqlite3 -pbacula-sd-sqlite3 -pbacula-common-sqlite3
  
  override_dh_strip:
  	for pkg in $(DBGPKGS); do \
@@@ -159,6 -156,6 +162,7 @@@
  		done
  	dh_strip
  
++override_dh_prep:
  override_dh_auto_configure:
  override_dh_auto_test:
  override_dh_auto_install:

-- 
Bacula, a network backup, recovery and verification program

More information about the pkg-bacula-commits mailing list