[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-43-geac3ea4
Alexander Golovko
alexandro at ankalagon.ru
Sat May 19 11:53:12 UTC 2012
The following commit has been merged in the master branch:
commit a0c3bafb1b1dfd94ce13d5aa1dde58038022ce6b
Merge: 0f4409a468a6749837e6b852024b6a52f93c74cb 1b033cf4c4f8707f6cf85af901bbf63731a301f5
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date: Sat May 19 03:44:51 2012 +0400
Merge commit '1b033cf'
Merge info:
Packages builded from this revision was compared with packages, builded
from previous revision (0f4409a468a6749837e6b852024b6a52f93c74cb)
For binary files and libraries was compared list of linked shared libraries.
No changes discovered.
All other files from package and metadata was compared by diff
Changes:
Included patch remove-use-statement-for-mysql
bacula-director init script moved from bacula-director-common package into
bacula-director-<dbtype> packages
Need resolv in next commits:
incorrect file path: /usr/sbin/bacula-console/bconsole
empty /usr/share/dbconfig-common/data/...
added /usr/share/doc/bacula-common/examples/nagios/check_bacula/Makefile.gz
diff --combined debian/control
index 7792cd8,2a6d89f..23e437d
--- a/debian/control
+++ b/debian/control
@@@ -3,10 -3,10 +3,10 @@@ Section: admi
Priority: optional
Maintainer: Debian Bacula packaging Group <pkg-bacula-devel at lists.alioth.debian.org>
Uploaders: Jan Hauke Rahm <jhr at debian.org>
- Build-Depends: autotools-dev, autoconf, debhelper (>= 6.0.7~), po-debconf (>= 0.8.2),
-Build-Depends: autotools-dev, debhelper (>= 8.1.3), po-debconf (>= 0.8.2),
++Build-Depends: autotools-dev, autoconf, debhelper (>= 8.1.3), po-debconf (>= 0.8.2),
zlib1g-dev, libreadline-dev, libjconv-dev,
- libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4),
- postgresql-server-dev-8.4,
+ libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 9.1),
+ postgresql-server-dev-all,
libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10),
libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev,
libx11-dev, mtx, bc, libxt-dev, dpkg-dev (>= 1.13.19), libqt4-dev,
@@@ -138,11 -138,11 +138,11 @@@ Description: network backup, recovery a
Package: bacula-director-pgsql
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0
Architecture: any
-Depends: bacula-director-common (= ${binary:Version}), dbconfig-common (>= 1.8.19), postgresql-client (>= 7.4) | postgresql-client-8.4, ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ${misc:Depends}
+Depends: bacula-director-common (= ${binary:Version}), dbconfig-common (>= 1.8.19), postgresql-client (>= 7.4), ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ${misc:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
-Recommends: postgresql-8.4 | postgresql-8.3 | postgresql-8.2 | postgresql-8.1 | postgresql-8.0 | postgresql (>= 7.4)
+Recommends: postgresql (>= 7.4)
Suggests: postgresql-contrib, postgresql-doc
Description: network backup, recovery and verification - PostgreSQL storage for Director
Bacula is a set of programs to manage backup, recovery and verification of
diff --combined debian/patches/series
index 1173151,cbabeb4..ee6861f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,4 +1,8 @@@
-fix-binutils-gold
+upstream-1623_debian-591293___file_jpfid_idx.patch
fix-default-config
fix-sql-bindir
+switch-nonfree-sha1-to-openssl.patch
+fix-binutils-gold-linking.patch
+fix-mysql-autoconf.patch
+fix-readline-ncurses-depends.patch
+ remove-use-statement-for-mysql
diff --combined debian/rules
index d1ced95,3a2c871..5fa3643
--- a/debian/rules
+++ b/debian/rules
@@@ -1,43 -1,14 +1,14 @@@
#!/usr/bin/make -f
#export DH_VERBOSE=1
- # These are used for cross-compiling and for saving the configure script
- # from having to guess our platform (since we know it already)
- DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
- DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
- CFLAGS = -g -Wall
- INSTALL_PROGRAM = install
-
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- else
- CFLAGS += -O2
- endif
-
- ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
- endif
-
-
- VARIANTS := sqlite3 pgsql mysql
+ VARIANTS := pgsql mysql sqlite3
######################################################################
- NAME=bacula
-
- # The variant that is used when we install non-variant-specific stuff.
- # Only bother building extra consoles and stuff for this one.
- DEFAULTVARIANT := sqlite3
- TEMPLATES = $(wildcard debian/*.templates)
- BUILDDIR := $(CURDIR)/debian/tmp-build
INSTALLDIR := $(CURDIR)/debian/tmp-install
- DEFAULTINSTALLDIR := $(INSTALLDIR)-$(DEFAULTVARIANT)
DBC := usr/share/dbconfig-common/data/
CONF_ALL = --enable-smartalloc \
@@@ -53,7 -24,7 +24,7 @@@
--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 \
@@@ -61,7 -32,15 +32,15 @@@
--with-mon-sd-password=XXX_MONSDPASSWORD_XXX \
--with-db-name=XXX_DBNAME_XXX \
--with-db-user=XXX_DBUSER_XXX \
- --with-db-password=XXX_DBPASSWORD_XXX
+ --with-db-password=XXX_DBPASSWORD_XXX \
+ --config-cache \
+ --with-archivedir=/nonexistant/path/to/file/archive/dir \
+ --sysconfdir=/etc/bacula --with-scriptdir=/etc/bacula/scripts \
+ --sharedstatedir=/var/lib/bacula \
+ --localstatedir=/var/lib/bacula \
+ --with-pid-dir=/var/run/bacula --with-smtp-host=localhost \
+ --with-working-dir=/var/lib/bacula \
+ --with-subsys-dir=/var/lock
CONF_common = --disable-gnome --disable-bwx-console --disable-tray-monitor \
@@@ -76,88 -55,11 +55,11 @@@ CONF_sqlite3 = --with-sqlite3 --without
CONF_mysql = --with-mysql --without-sqlite --without-postgresql --without-sqlite3 $(CONF_common)
CONF_pgsql = --with-postgresql --without-sqlite --without-mysql --without-sqlite3 $(CONF_common)
- ###########################################################################
-
- extract: extract-stamp
- extract-stamp: $(foreach s,$(VARIANTS),extract-stamp-$(s))
- extract-stamp-%:
- @echo " *** DEBIAN *** VARIANT $(*): EXTRACTING to $(BUILDDIR)-$(*)"
- mkdir $(BUILDDIR)-$(*)
- tar -cSf - --exclude=./.git --exclude=./debian . | tar -xSpf - -C $(BUILDDIR)-$(*)
- touch $@
-
- configure-stamp-%: extract-stamp-%
- dh_testdir
- @echo " *** DEBIAN *** CONFIGURING VARIANT $*"
- cp /usr/share/misc/config.guess /usr/share/misc/config.sub \
- $(BUILDDIR)-$(*)/autoconf/
- cd $(BUILDDIR)-$(*)/autoconf && \
- autoconf configure.in > ../configure
- cd $(BUILDDIR)-$(*) && \
- QMAKE=/usr/bin/qmake-qt4 ./configure --config-cache \
- --host=${DEB_HOST_GNU_TYPE} --build=${DEB_BUILD_GNU_TYPE} \
- --prefix=/usr \
- --with-archivedir=/nonexistant/path/to/file/archive/dir \
- --sysconfdir=/etc/bacula --with-scriptdir=/etc/bacula/scripts \
- --sharedstatedir=/var/lib/bacula \
- --localstatedir=/var/lib/bacula \
- --with-pid-dir=/var/run/bacula --with-smtp-host=localhost \
- --with-working-dir=/var/lib/bacula \
- --with-subsys-dir=/var/lock \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- $(CONF_ALL) $(CONF_$(*))
- touch $@
-
- build-stamp-%: configure-stamp-%
- dh_testdir
- @echo " *** DEBIAN *** BUILDING VARIANT $*"
-
- # Main building process
- $(MAKE) -C $(BUILDDIR)-$(*)
-
- # Grrr... client-only does not build needed db-independent 'bsmtp', 'stored'
- $(MAKE) -C $(BUILDDIR)-$(*)/src/tools
- $(MAKE) -C $(BUILDDIR)-$(*)/src/stored
-
- chmod 755 debian/additions/postinst-common
- chmod 755 debian/additions/bconsole
-
- touch $@
-
- build-arch: build-stamp
- build-stamp: $(foreach v,$(VARIANTS),build-stamp-$(v))
- touch $@
-
- build-indep: build-indep-stamp
- build-indep-stamp:
- dh_testdir
-
- touch $@
-
-
- build: build-arch build-indep
-
- ###############################################
- # Cleaning macro
- ###############################################
-
- clean:
-
- $(RM) *stamp*
-
- dh_clean
-
- $(RM) -r debian/tmp* debian/bacula-doc \
- scripts/disk-changer
-
- ## delete ${FLAVORED_BINARIES}
- $(RM) $(foreach pkg,$(VARIANTS), src/dird/bacula-dir.$(pkg) src/tools/dbcheck.$(pkg) src/stored/bscan.$(pkg) src/stored/bcopy.$(pkg))
-
- #-$(MAKE) -C doc/latex clean
-
- $(RM) build-arch-flavor-stamp
+ LONGNAME_sqlite3 = sqlite3
+ LONGNAME_mysql = mysql
+ LONGNAME_pgsql = postgresql
+ ###########################################################################
# Macro to extract a here document and put it in place
# args: 1 -- db name, 2 -- file to extract, 3 -- version
@@@ -165,171 -67,88 +67,89 @@@ define ext-upgrad
debian/scripts/extract_here < $(2) > debian/bacula-director-$(1)/$(DBC)/bacula-director-$(1)/upgrade/$(1)/$(3)
endef
- # Macro to process upgrades for all flavors
- # args: 1 -- file to extract relative to updatedb/update_x_tables_
- # 2 -- version
- define ext-upgrade-all
- $(call ext-upgrade,pgsql,debian/tmp-build-pgsql/updatedb/update_postgresql_tables_$(1),$(2))
- $(call ext-upgrade,mysql,debian/tmp-build-mysql/updatedb/update_mysql_tables_$(1),$(2))
- $(call ext-upgrade,sqlite3,debian/tmp-build-sqlite3/updatedb/update_sqlite3_tables_$(1),$(2))
+ # Macro to upgrade db
+ # args: 1 -- db type
+ # 2 -- db version path (e.g. 10_to_11)
+ # 3 -- package version
+ define ext-upgrade-db
+ $(call ext-upgrade,$(1),$(CURDIR)/updatedb/update_$(LONGNAME_$(1))_tables_$(2).in,$(3))
endef
- # Macro to process latest version upgrades for all flavors
- # args: 1 -- version
- define ext-upgrade-latest
- $(call ext-upgrade,pgsql,debian/tmp-build-pgsql/src/cats/update_postgresql_tables,$(1))
- $(call ext-upgrade,mysql,debian/tmp-build-mysql/src/cats/update_mysql_tables,$(1))
- $(call ext-upgrade,sqlite3,debian/tmp-build-sqlite3/src/cats/update_sqlite3_tables,$(1))
+ # Macro to process latest version upgrades for db
+ # args: 1 -- db type
+ # 2 -- package version
+ define ext-upgrade-latest-db
+ $(call ext-upgrade,$(1),$(CURDIR)/src/cats/update_$(LONGNAME_$(1))_tables.in,$(2))
endef
# Macro to extract a here document for install and put it in place
- # args: 1 -- db name, 2 -- file to extract
- # We append so we can do the postgresql hack for datestyle
- define ext-install
- debian/scripts/extract_here < $(2) > debian/bacula-director-$(1)/$(DBC)/bacula-director-$(1)/install/$(1)
+ # args: 1 -- db name
+ define ext-install-db
+ debian/scripts/extract_here < $(CURDIR)/src/cats/make_$(LONGNAME_$(1))_tables.in > debian/bacula-director-$(1)/$(DBC)/bacula-director-$(1)/install/$(1)
endef
- install: build install-stamp
- install-stamp: build-stamp $(foreach v,$(VARIANTS),install-stamp-$(v))
- dh_installdirs -a
- dh_install -pbacula-director-common
-
- dh_install -pbacula-fd
- dh_install -pbacula-console -pbacula-console-qt
- cp $(DEFAULTINSTALLDIR)/usr/sbin/bconsole debian/bacula-console/usr/sbin/bacula-console
- cp debian/tmp-build-$(DEFAULTVARIANT)/src/qt-console/.libs/bat debian/bacula-console-qt/usr/bin/bat
- chmod 755 debian/scripts/extract_here
- chmod 755 debian/additions/bconsole
-
- ######### dbconfig-common stuff
- # $(call ext-upgrade-all,7_to_8,1.36.0)
- # $(call ext-upgrade-all,8_to_9,1.38.0)
- # $(call ext-upgrade-all,9_to_10,2.0.0)
- # above lines commented out because they are pre-lenny and no longer needed
- $(call ext-upgrade-all,10_to_11,3.0.0)
-
- # Sometimes the latest release doesn't have a copy of the data in updatedb.
- # Manually install those. CHECK THIS FOR EACH NEW RELEASE, and move older
- # versions to an ext-upgrade-all line as above.
-
- $(call ext-upgrade-latest,5.0.0) # 5.0.0 upgrade 11 to 12
-
-
- # PostgreSQL
- echo "ALTER DATABASE _DBC_DBNAME_ SET datestyle TO 'ISO, YMD';" > \
- debian/bacula-director-pgsql/$(DBC)/bacula-director-pgsql/install-dbadmin/pgsql
-
- $(call ext-install,pgsql,debian/tmp-build-pgsql/src/cats/make_postgresql_tables)
- # MySQL
- $(call ext-install,mysql,debian/tmp-build-mysql/src/cats/make_mysql_tables)
- # Remove USE bacula -- dbconfig-common selects the database for us
- sed -i -e 's/USE \$${db_name};//' -e 's/USE bacula;//' debian/bacula-director-mysql/$(DBC)/bacula-director-mysql/install/mysql debian/bacula-director-mysql/$(DBC)/bacula-director-mysql/upgrade/mysql/*
-
- # SQLite3
- $(call ext-install,sqlite3,debian/tmp-build-sqlite3/src/cats/make_sqlite3_tables)
-
- dh_link -pbacula-console usr/share/man/man8/bconsole.8.gz usr/share/man/man8/bacula-console.8.gz
-
- touch $@
-
- install-stamp-%: build-stamp-%
- @echo " *** DEBIAN *** INSTALLING VARIANT $*"
- dh_installdirs -pbacula-director-$(*)
- mkdir $(INSTALLDIR)-$(*)
- $(MAKE) -C $(BUILDDIR)-$(*) install DESTDIR=$(INSTALLDIR)-$(*)
-
- dh_install -pbacula-director-$(*)
- touch $@
-
+ %:
+ dh $@ --with autotools_dev
- install-indep: build install-stamp
- dh_testdir
- dh_testroot
- dh_install -i
- dh_installdirs -i
- dh_link -pbacula-director-common
- dh_install -pbacula -pbacula-client -pbacula-server
- #install doc/html-manual/* \
- # $(CURDIR)/debian/bacula-doc/usr/share/doc/bacula-doc/html-manual
- #$(RM) $(CURDIR)/debian/bacula-doc/usr/share/doc/bacula-doc/html-manual/*.wml
-
- install-arch: build install-stamp
- dh_install -a
- dh_link -pbacula-common
-
- cp $(CURDIR)/debian/common-functions $(CURDIR)/debian/bacula-common/usr/share/bacula-common
- chmod 755 $(CURDIR)/debian/bacula-common/usr/lib/bacula/btraceback
-
- # Build architecture-independent files here.
- # Pass -i to all debhelper commands in this target to reduce clutter.
- binary-indep: build install-indep
- dh_testdir -i
- dh_testroot -i
- # dh_installdebconf -i
- dh_installdocs -i -X.cvsignore -X1 -X*.wml -X*.inc -X*.list -X*.pl -X*.apf -X*.book -Nbacula
- dh_installexamples -i
- # dh_installmenu -i
- dh_installlogrotate -i
- # dh_installinit -i
- dh_installcron -i
- dh_installman -i
- dh_installinfo -i
- dh_installchangelogs ChangeLog -i
- rm -r debian/bacula/usr/share/doc/bacula
- dh_link -i
- dh_compress -i -X.pdf
- dh_lintian -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-
- # Build architecture-dependent files here.
- binary-arch: build install install-arch binary-arch-common
-
- binary-arch-common: DH_OPTIONS=
- binary-arch-common: build install
- dh_testdir -a
- dh_testroot -a
- dh_installdebconf -a
- dh_installdocs -a
- dh_installexamples -a
- dh_installmenu -pbacula-console -pbacula-console-qt
- dh_installlogrotate -a
- dh_installinit -pbacula-sd -- defaults 90 10
- dh_installinit -pbacula-fd -- defaults 91 9
- dh_installinit --name=bacula-director -pbacula-director-common --no-start -- defaults 92 8
- # dh_installcron -a
- dh_installman -a
- dh_installinfo -a
- dh_installchangelogs ChangeLog -a
- dh_strip -a
- dh_link -a
- dh_lintian -a
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -a
- dh_installdeb -a
+ override_dh_clean:
+ $(RM) -r $(INSTALLDIR)-*
+ dh_clean
- # Handle shlibs for the database packages specially so they get
- # the deps on the correct libraries.
+ override_dh_shlibdeps:
+ # Handle shlibs for the database packages specially so they get
+ # the deps on the correct libraries.
dh_shlibdeps -pbacula-sd-mysql -Lbacula-common-mysql
dh_shlibdeps -pbacula-director-mysql -Lbacula-common-mysql
dh_shlibdeps -pbacula-sd-sqlite3 -Lbacula-common-sqlite3
dh_shlibdeps -pbacula-director-sqlite3 -Lbacula-common-sqlite3
dh_shlibdeps -pbacula-sd-pgsql -Lbacula-common-pgsql
dh_shlibdeps -pbacula-director-pgsql -Lbacula-common-pgsql
-
- # Now build all other shlibdeps.
+ # Now build all other shlibdeps.
dh_shlibdeps -a -Nbacula-sd-mysql -Nbacula-director-mysql \
-Nbacula-sd-sqlite3 -Nbacula-director-sqlite3 \
-Nbacula-sd-pgsql -Nbacula-director-pgsql
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+ override_dh_installinit:
+ dh_installinit -pbacula-sd -- defaults 90 10
+ dh_installinit -pbacula-fd -- defaults 91 9
+ dh_installinit --name=bacula-director -pbacula-director-pgsql --no-start -- defaults 92 8
+ dh_installinit --name=bacula-director -pbacula-director-mysql --no-start -- defaults 92 8
+ dh_installinit --name=bacula-director -pbacula-director-sqlite3 --no-start -- defaults 92 8
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install build-arch
+ override_dh_install:
+ chmod 755 debian/additions/postinst-common
+ chmod 755 debian/scripts/extract_here
+ chmod 755 debian/additions/bconsole
+ dh_install
+ 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.
+ # Manually install those. CHECK THIS FOR EACH NEW RELEASE, and move older
+ # 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)))
+
+ override_dh_installdocs:
+ dh_installdocs -pbacula --link-doc=bacula-common
+ dh_installdocs -Nbacula
+
+ override_dh_auto_build:
++ autoconf -I autoconf/ -o configure autoconf/configure.in
+ dh_auto_configure -- $(CONF_ALL) $(CONF_pgsql)
+ dh_auto_build --parallel
+ dh_auto_install -- DESTDIR=$(INSTALLDIR)-pgsql
+ dh_auto_clean
+ dh_auto_configure -- $(CONF_ALL) $(CONF_mysql)
+ dh_auto_build --parallel
+ dh_auto_install -- DESTDIR=$(INSTALLDIR)-mysql
+ dh_auto_clean
+ dh_auto_configure -- $(CONF_ALL) $(CONF_sqlite3)
+ dh_auto_build --parallel
+ dh_auto_install -- DESTDIR=$(INSTALLDIR)-sqlite3
+
+ 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