[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-71-gbbe3dd6
Alexander Golovko
alexandro at ankalagon.ru
Wed May 23 13:55:47 UTC 2012
The following commit has been merged in the master branch:
commit bbe3dd63a7a545a58696d69eee865087531bba56
Merge: a0f66ca48a3423ede76eed6e1dff96fb60b0053e c370db1f507bd707325554a62800a31c8fda5f46
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date: Wed May 23 02:18:07 2012 +0400
Merge commit 'c370db1'
common for all databases parts was moved into "*-db.*.in" files
other changes and cleanups rejected
resulting packages look very similiar to packages before changes.
diff --combined debian/bacula-director-db.bacula-director.init.in
index ca03266,95f9bc2..ca03266
--- a/debian/bacula-director-db.bacula-director.init.in
+++ b/debian/bacula-director-db.bacula-director.init.in
@@@ -32,12 -32,12 +32,12 @@@ f
PIDFILE=/var/run/bacula/$NAME.$PORT.pid
. /lib/lsb/init-functions
-. /usr/share/bacula-common/common-functions
-if [ -r /etc/default/bacula-dir ]; then
- . /etc/default/bacula-dir
+. /usr/share/bacula-common/common-functions.init
+if [ -r /etc/default/$NAME ]; then
+ . /etc/default/$NAME
fi
-CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
+CONFIG="${CONFIG:-/etc/bacula/$NAME.conf}"
create_var_run_dir
@@@ -92,8 -92,13 +92,8 @@@ do_stop(
case "$1" in
start)
- if [ -f /etc/bacula/do_not_run ]; then
- log_failure_msg "Not starting $DESC: disabled via /etc/bacula/do_not_run"
- exit 0
- fi
-
if [ "$ENABLED" = "no" ]; then
- log_failure_msg "Not starting $DESC: disabled via /etc/default/bacula-dir"
+ log_failure_msg "Not starting $DESC: disabled via /etc/default/$NAME"
exit 0
fi
diff --combined debian/bacula-director-db.config.in
index 0000000,0c76026..543405b
mode 000000,100644..100644
--- a/debian/bacula-director-db.config.in
+++ b/debian/bacula-director-db.config.in
@@@ -1,0 -1,21 +1,34 @@@
+ #!/bin/sh
++
+ set -e
+
-THISDB=XX_DB_XX
+
+ . /usr/share/debconf/confmodule
++db_version 2.0
+
-dbc_first_version=1.38.9-3
-dbc_dbuser=bacula
-dbc_dbname=bacula
+
-if [ "$THISDB" = "sqlite3" ]; then
- dbc_first_version=3.0.3-3
- dbc_dbname=bacula.db
- dbc_basepath=/var/lib/bacula
-fi
++THISDB=XX_DB_XX
++
++case "$THISDB" in
++ mysql)
++ dbc_first_version=1.38.9-3
++ dbc_dbuser=bacula
++ dbc_dbname=bacula
++ ;;
++ pgsql)
++ dbc_first_version=1.38.9-2
++ dbc_dbuser=bacula
++ dbc_dbname=bacula
++ ;;
++ sqlite3)
++ dbc_first_version=3.0.3-3
++ dbc_dbname=bacula.db
++ dbc_basepath=/var/lib/bacula
++ ;;
++esac
++
+
+ if [ -f /usr/share/dbconfig-common/dpkg/config.$THISDB ]; then
+ . /usr/share/dbconfig-common/dpkg/config.$THISDB
+ dbc_go bacula-director-$THISDB $@
+ fi
diff --combined debian/bacula-director-db.postrm.in
index 0000000,efe1878..fcb3f8f
mode 000000,100644..100644
--- a/debian/bacula-director-db.postrm.in
+++ b/debian/bacula-director-db.postrm.in
@@@ -1,0 -1,16 +1,43 @@@
+ #! /bin/sh
++
+ set -e
+
++
+ THISDB=XX_DB_XX
++CONFFILE=/etc/bacula/bacula-dir.conf
++
+
+ if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_version 2.0
+ fi
+
+ if [ -f /usr/share/dbconfig-common/dpkg/postrm.$THISDB ]; then
+ . /usr/share/dbconfig-common/dpkg/postrm.$THISDB
+ dbc_go bacula-director-$THISDB $@
+ fi
+
++
++case "$1" in
++ purge)
++ rm -f $CONFFILE $CONFFILE.dist
++
++ # purge /etc/default/bacula-dir
++ rm -f /etc/default/bacula-dir /etc/default/bacula-dir.ucf-old \
++ /etc/default/bacula-dir.ucf-new /etc/default/bacula-dir.ucf-dist
++ if which ucf >/dev/null; then
++ ucf --purge /etc/default/bacula-dir
++ fi
++ if which ucfr >/dev/null; then
++ ucfr --purge bacula-director-$THISDB /etc/default/bacula-dir
++ fi
++ ;;
++esac
++
++
++# dh_installdeb will replace this with shell code automatically
++# generated by other debhelper scripts.
++
+ #DEBHELPER#
++
++exit 0
diff --combined debian/bacula-director-db.prerm.in
index 0000000,b386e25..85512fb
mode 000000,100644..100644
--- a/debian/bacula-director-db.prerm.in
+++ b/debian/bacula-director-db.prerm.in
@@@ -1,0 -1,29 +1,22 @@@
+ #! /bin/sh
++
+ set -e
+
-THISDB=XX_DB_XX
+
+ . /usr/share/debconf/confmodule
++db_version 2.0
+
-dbc_first_version=1.38.9-2
-dbc_dbuser=bacula
-dbc_dbname=bacula
-
-if [ "$THISDB" = "sqlite3" ]; then
- dbc_first_version=3.0.3-3
- dbc_dbname=bacula.db
- dbc_basepath=/var/lib/bacula
-fi
+
++THISDB=XX_DB_XX
+ if [ -f /usr/share/dbconfig-common/dpkg/prerm.$THISDB ]; then
+ . /usr/share/dbconfig-common/dpkg/prerm.$THISDB
+ dbc_go bacula-director-$THISDB $@
+ fi
+
-case "$1" in
- remove|deconfigure)
- invoke-rc.d bacula-director stop
- ;;
-esac
++
++# dh_installdeb will replace this with shell code automatically
++# generated by other debhelper scripts.
+
+ #DEBHELPER#
++
++exit 0
diff --combined debian/rules
index 0ec0979,3735e9f..5792acc
--- a/debian/rules
+++ b/debian/rules
@@@ -7,6 -7,10 +7,10 @@@ DBGPKGS := $(shell sed -n -e 's/Package
VARIANTS := pgsql mysql sqlite3
+ # auto-generated files in debian/
+ FILETYPES := install manpages config postinst postrm preinst prerm bacula-director.init
+ PACKAGES := director sd
+
######################################################################
DBC := usr/share/dbconfig-common/data/
@@@ -23,7 -27,7 +27,7 @@@ CONF_ALL = --enable-smartalloc
--enable-batch-insert \
--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 \
@@@ -62,7 -66,7 +66,7 @@@ LONGNAME_sqlite3 = sqlite
# Macro to extract a here document and put it in place
# args: 1 -- db name, 2 -- file to extract, 3 -- version
define ext-upgrade
- debian/scripts/extract_here < $(2) > debian/bacula-director-$(1)/$(DBC)/bacula-director-$(1)/upgrade/$(1)/$(3)
+ mkdir -p debian/bacula-director-$(1)/$(DBC)/bacula-director-$(1)/upgrade/$(1) && debian/scripts/extract_here < $(2) > debian/bacula-director-$(1)/$(DBC)/bacula-director-$(1)/upgrade/$(1)/$(3)
endef
# Macro to upgrade db
@@@ -83,9 -87,9 +87,35 @@@ ende
# Macro to extract a here document for install and put it in place
# 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)
+ mkdir -p debian/bacula-director-$(1)/$(DBC)/bacula-director-$(1)/install && debian/scripts/extract_here < $(CURDIR)/src/cats/make_$(LONGNAME_$(1))_tables.in > debian/bacula-director-$(1)/$(DBC)/bacula-director-$(1)/install/$(1)
+ endef
+
++# Macro for generate file for specified database from specified template
++# args: 1 -- template file
++# 2 -- db type
++define template-subst
++sed -e 's/XX_DB_XX/$(2)/' '$(1)' > '$(patsubst %.in,%,$(subst -db.,-$(2).,$(1)))';
++endef
++
++# Macro for cleanup file generated for specified database from specified template
++# args: 1 -- template file
++# 2 -- db type
++define template-cleanup
++rm -f '$(patsubst %.in,%,$(subst -db.,-$(2).,$(1)))';
++endef
++
++# Macro for generate from all templates files for specified database
++# args: 1 -- db type
++define db-templates-subst
++$(foreach template,$(wildcard debian/*-db.*.in),$(call template-subst,$(template),$(1)))
++endef
++
++# Macro for cleanup all files generated for specified database from templates
++# args: 1 -- db type
++define db-templates-cleanup
++$(foreach template,$(wildcard debian/*-db.*.in),$(call template-cleanup,$(template),$(1)))
+endef
+
%:
dh $@ --with autotools_dev
@@@ -106,17 -110,13 +136,17 @@@ override_dh_shlibdeps
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
+ dh_installinit -pbacula-director-pgsql --name=bacula-director -- defaults 92 8
+ dh_installinit -pbacula-director-mysql --name=bacula-director -- defaults 92 8
+ dh_installinit -pbacula-director-sqlite3 --name=bacula-director -- defaults 92 8
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.
@@@ -124,9 -124,9 +154,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
@@@ -135,8 -135,7 +165,8 @@@
done
dh_installdocs -Nbacula
- override_dh_auto_build:
+ override_dh_auto_build: maintfiles
+ autoconf -I autoconf/ -o configure autoconf/configure.in
dh_prep
dh_installdirs
dh_auto_configure -- $(CONF_ALL) $(CONF_pgsql)
@@@ -144,13 -143,11 +174,13 @@@
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
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
@@@ -165,7 -162,18 +195,14 @@@ override_dh_strip
override_dh_makeshlibs:
dh_makeshlibs -n
++override_dh_clean:
++ $(foreach db,$(VARIANTS),$(call db-templates-cleanup,$(db)))
++ dh_clean
++
+override_dh_prep:
override_dh_auto_configure:
override_dh_auto_test:
override_dh_auto_install:
+
+ maintfiles:
- for pkg in $(PACKAGES); do \
- for ft in $(FILETYPES); do \
- for var in $(VARIANTS); do \
- [ ! -f debian/bacula-$$pkg-db.$$ft.in ] || \
- sed -e "s/XX_DB_XX/$$var/g" debian/bacula-$$pkg-db.$$ft.in > debian/bacula-$$pkg-$$var.$$ft; \
- [ ! -f debian/bacula-$$pkg-$$var.$$ft.in ] || \
- cat debian/bacula-$$pkg-$$var.$$ft.in >> debian/bacula-$$pkg-$$var.$$ft; \
- done; \
- done; \
- done
++ $(foreach db,$(VARIANTS),$(call db-templates-subst,$(db)))
--
Bacula, a network backup, recovery and verification program
More information about the pkg-bacula-commits
mailing list