[pkg-bacula-commits] [bacula] 20/35: Create common maintainer scripts at build time
Carsten Leonhardt
leo at moszumanska.debian.org
Wed Jul 20 10:21:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to tag development/2011-04-29
in repository bacula.
commit 47a28148f334145a15ece0a81b96ccf6c8833aa2
Author: Jan Hauke Rahm <jhr at debian.org>
Date: Tue Apr 19 14:39:22 2011 +0200
Create common maintainer scripts at build time
In oder to avoid inconsistencies between packages that only differ
reagrding their database bindings, create their installation files and
maintainer scripts during build instead of duplicating actual files.
Most directories are crated automatically by upstream's make and
dh_install. Two changes were suitable here:
* /var/{lib,log}/bacula are created in bacula-common.postinst
* The dirs needed by dbconfig stuff are created on-the-fly
---
.gitignore | 29 ++++++++++++++++++++
debian/bacula-common.dirs | 7 -----
debian/bacula-common.postinst | 1 +
debian/bacula-console-qt.dirs | 2 --
debian/bacula-director-common.dirs | 4 ---
debian/bacula-director-db.config.in | 21 +++++++++++++++
debian/bacula-director-db.install.in | 4 +++
...sql.manpages => bacula-director-db.manpages.in} | 0
debian/bacula-director-db.postinst.in | 31 ++++++++++++++++++++++
debian/bacula-director-db.postrm.in | 16 +++++++++++
debian/bacula-director-db.prerm.in | 29 ++++++++++++++++++++
debian/bacula-director-mysql.config | 15 -----------
debian/bacula-director-mysql.dirs | 6 -----
debian/bacula-director-mysql.install | 7 -----
debian/bacula-director-mysql.postinst | 27 -------------------
debian/bacula-director-mysql.postrm | 13 ---------
debian/bacula-director-mysql.prerm | 22 ---------------
debian/bacula-director-pgsql.config | 16 -----------
debian/bacula-director-pgsql.dirs | 6 -----
debian/bacula-director-pgsql.install | 9 -------
debian/bacula-director-pgsql.install.in | 2 ++
debian/bacula-director-pgsql.manpages | 2 --
debian/bacula-director-pgsql.postinst | 29 --------------------
debian/bacula-director-pgsql.postrm | 14 ----------
debian/bacula-director-pgsql.prerm | 22 ---------------
debian/bacula-director-sqlite3.config | 16 -----------
debian/bacula-director-sqlite3.dirs | 5 ----
debian/bacula-director-sqlite3.install | 7 -----
debian/bacula-director-sqlite3.manpages | 2 --
debian/bacula-director-sqlite3.postinst | 29 --------------------
debian/bacula-director-sqlite3.postrm | 14 ----------
debian/bacula-director-sqlite3.prerm | 10 -------
debian/bacula-fd.dirs | 5 ----
...-sd-sqlite3.install => bacula-sd-db.install.in} | 0
...-sd-mysql.manpages => bacula-sd-db.manpages.in} | 0
debian/bacula-sd-mysql.install | 3 ---
debian/bacula-sd-pgsql.install | 3 ---
debian/bacula-sd-pgsql.manpages | 2 --
debian/bacula-sd-sqlite3.manpages | 2 --
debian/bacula-sd.dirs | 4 ---
debian/bacula-traymonitor.dirs | 2 --
debian/rules | 22 ++++++++++++---
42 files changed, 152 insertions(+), 308 deletions(-)
diff --git a/.gitignore b/.gitignore
index b477388..aef4a66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1352,3 +1352,32 @@ platforms/osx/dl
platforms/osx/products
platforms/osx/tools
TAGS
+
+# debian ignores
+debian/bacula-director-mysql.config
+debian/bacula-director-mysql.dirs
+debian/bacula-director-mysql.install
+debian/bacula-director-mysql.manpages
+debian/bacula-director-mysql.postinst
+debian/bacula-director-mysql.postrm
+debian/bacula-director-mysql.prerm
+debian/bacula-director-pgsql.config
+debian/bacula-director-pgsql.dirs
+debian/bacula-director-pgsql.install
+debian/bacula-director-pgsql.manpages
+debian/bacula-director-pgsql.postinst
+debian/bacula-director-pgsql.postrm
+debian/bacula-director-pgsql.prerm
+debian/bacula-director-sqlite3.config
+debian/bacula-director-sqlite3.dirs
+debian/bacula-director-sqlite3.install
+debian/bacula-director-sqlite3.manpages
+debian/bacula-director-sqlite3.postinst
+debian/bacula-director-sqlite3.postrm
+debian/bacula-director-sqlite3.prerm
+debian/bacula-sd-mysql.install
+debian/bacula-sd-mysql.manpages
+debian/bacula-sd-pgsql.install
+debian/bacula-sd-pgsql.manpages
+debian/bacula-sd-sqlite3.install
+debian/bacula-sd-sqlite3.manpages
diff --git a/debian/bacula-common.dirs b/debian/bacula-common.dirs
deleted file mode 100644
index 2ba15e2..0000000
--- a/debian/bacula-common.dirs
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/bacula
-var/lib/bacula
-var/log/bacula
-usr/share/bacula-common
-usr/share/bacula-common/defconfig
-usr/lib/bacula
-usr/share/doc/bacula-common
diff --git a/debian/bacula-common.postinst b/debian/bacula-common.postinst
index 73c09c6..edc0595 100644
--- a/debian/bacula-common.postinst
+++ b/debian/bacula-common.postinst
@@ -6,6 +6,7 @@ db_version 2.0
case "$1" in
configure)
+ mkdir -p /var/lib/bacula /var/log/bacula
chown bacula:bacula /var/lib/bacula
chmod 700 /var/lib/bacula
chown bacula:adm /var/log/bacula
diff --git a/debian/bacula-console-qt.dirs b/debian/bacula-console-qt.dirs
deleted file mode 100644
index 76f9c5f..0000000
--- a/debian/bacula-console-qt.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-etc/bacula
diff --git a/debian/bacula-director-common.dirs b/debian/bacula-director-common.dirs
deleted file mode 100644
index e3d0586..0000000
--- a/debian/bacula-director-common.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/bacula
-var/lib/bacula
-var/log/bacula
-usr/share/bacula-director
diff --git a/debian/bacula-director-db.config.in b/debian/bacula-director-db.config.in
new file mode 100644
index 0000000..0c76026
--- /dev/null
+++ b/debian/bacula-director-db.config.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+THISDB=XX_DB_XX
+
+. /usr/share/debconf/confmodule
+
+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
+
+if [ -f /usr/share/dbconfig-common/dpkg/config.$THISDB ]; then
+ . /usr/share/dbconfig-common/dpkg/config.$THISDB
+ dbc_go bacula-director-$THISDB $@
+fi
diff --git a/debian/bacula-director-db.install.in b/debian/bacula-director-db.install.in
new file mode 100644
index 0000000..ac45350
--- /dev/null
+++ b/debian/bacula-director-db.install.in
@@ -0,0 +1,4 @@
+etc/bacula/scripts/*catalog_backup
+etc/bacula/scripts/*catalog_backup.pl
+usr/sbin/bacula-dir
+etc/bacula/bacula-dir.conf
diff --git a/debian/bacula-director-mysql.manpages b/debian/bacula-director-db.manpages.in
similarity index 100%
rename from debian/bacula-director-mysql.manpages
rename to debian/bacula-director-db.manpages.in
diff --git a/debian/bacula-director-db.postinst.in b/debian/bacula-director-db.postinst.in
new file mode 100644
index 0000000..38ec36c
--- /dev/null
+++ b/debian/bacula-director-db.postinst.in
@@ -0,0 +1,31 @@
+#! /bin/bash
+set -e
+
+THISDB=XX_DB_XX
+
+. /usr/share/debconf/confmodule
+
+dbc_first_version=1.38.9-2
+if [ "$THISDB" = "sqlite3" ]; then
+ dbc_first_version=3.0.3-3
+ dbc_dbfile_owner=bacula:bacula
+fi
+
+invoke-rc.d --quiet bacula-director stop
+sleep 1
+
+# source dbconfig-common shell library, and call the hook function
+if [ -f /usr/share/dbconfig-common/dpkg/postinst.$THISDB ]; then
+ . /usr/share/dbconfig-common/dpkg/postinst.$THISDB
+ if [ "$THISDB" = "pgsql" ]; then
+ dbc_pgsql_createdb_encoding="SQL_ASCII"
+ dbc_sql_substitutions="1"
+ fi
+ dbc_go bacula-director-$THISDB $@
+fi
+
+db_stop
+
+invoke-rc.d --quiet bacula-director start
+
+#DEBHELPER#
diff --git a/debian/bacula-director-db.postrm.in b/debian/bacula-director-db.postrm.in
new file mode 100644
index 0000000..efe1878
--- /dev/null
+++ b/debian/bacula-director-db.postrm.in
@@ -0,0 +1,16 @@
+#! /bin/sh
+set -e
+
+THISDB=XX_DB_XX
+
+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
+
+#DEBHELPER#
diff --git a/debian/bacula-director-db.prerm.in b/debian/bacula-director-db.prerm.in
new file mode 100644
index 0000000..f82bc8a
--- /dev/null
+++ b/debian/bacula-director-db.prerm.in
@@ -0,0 +1,29 @@
+#! /bin/sh
+set -e
+
+THISDB=XX_DB_XX
+
+. /usr/share/debconf/confmodule
+
+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
+
+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
+
+#DEBHELPER#
diff --git a/debian/bacula-director-mysql.config b/debian/bacula-director-mysql.config
deleted file mode 100644
index eba916e..0000000
--- a/debian/bacula-director-mysql.config
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# config script for bacula-dir ( MySQL flavor )
-set -e
-
-. /usr/share/debconf/confmodule
-#db_version 2.0
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
- dbc_first_version=1.38.9-3
- dbc_dbuser=bacula
- dbc_dbname=bacula
- . /usr/share/dbconfig-common/dpkg/config.mysql
- dbc_go bacula-director-mysql $@
-fi
diff --git a/debian/bacula-director-mysql.dirs b/debian/bacula-director-mysql.dirs
deleted file mode 100644
index 30cef59..0000000
--- a/debian/bacula-director-mysql.dirs
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/sbin
-usr/lib/bacula
-etc/bacula
-usr/share/dbconfig-common/data/bacula-director-mysql/upgrade/mysql
-usr/share/dbconfig-common/scripts/bacula-director-mysql/upgrade/mysql
-usr/share/dbconfig-common/data/bacula-director-mysql/install
diff --git a/debian/bacula-director-mysql.install b/debian/bacula-director-mysql.install
deleted file mode 100644
index 5ce3538..0000000
--- a/debian/bacula-director-mysql.install
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/bacula/scripts/make_mysql_tables usr/share/bacula-director
-etc/bacula/scripts/update_mysql* usr/share/bacula-director
-etc/bacula/scripts/*catalog_backup
-etc/bacula/scripts/*catalog_backup.pl
-usr/sbin/bacula-dir
-usr/sbin/dbcheck
-etc/bacula/bacula-dir.conf
diff --git a/debian/bacula-director-mysql.postinst b/debian/bacula-director-mysql.postinst
deleted file mode 100644
index 683fc4d..0000000
--- a/debian/bacula-director-mysql.postinst
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/bash
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-dbc_first_version=1.38.9-3
-# set in config, must not be set here: dbc_dbuser=bacula
-# set in config, must not be set here: dbc_dbname=bacula
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
- . /usr/share/dbconfig-common/dpkg/postinst.mysql
- dbc_go bacula-director-mysql $@
-fi
-
-if [ -n "$2" ]; then
- /etc/init.d/bacula-director stop || true
- sleep 1
-fi
-
-# Do start daemon
-db_stop
-
-invoke-rc.d --quiet bacula-director start
-
-#DEBHELPER#
diff --git a/debian/bacula-director-mysql.postrm b/debian/bacula-director-mysql.postrm
deleted file mode 100644
index 3b527b3..0000000
--- a/debian/bacula-director-mysql.postrm
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
-fi
-
-if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then
- . /usr/share/dbconfig-common/dpkg/postrm.mysql
- dbc_go bacula-director-mysql $@
-fi
-
-#DEBHELPER#
diff --git a/debian/bacula-director-mysql.prerm b/debian/bacula-director-mysql.prerm
deleted file mode 100644
index 46bea2a..0000000
--- a/debian/bacula-director-mysql.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-set -e
-
-. /usr/share/debconf/confmodule
-
-dbc_first_version=1.38.9-3
-dbc_dbuser=bacula
-dbc_dbname=bacula
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
- . /usr/share/dbconfig-common/dpkg/prerm.mysql
- dbc_go bacula-director-mysql $@
-fi
-
-case "$1" in
- remove|deconfigure)
- /usr/sbin/invoke-rc.d bacula-director stop
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/bacula-director-pgsql.config b/debian/bacula-director-pgsql.config
deleted file mode 100644
index 6fbae58..0000000
--- a/debian/bacula-director-pgsql.config
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# config script for bacula-dir ( PostgreSQL flavor )
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-dbc_first_version=1.38.9-2
-dbc_dbuser=bacula
-dbc_dbname=bacula
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
- . /usr/share/dbconfig-common/dpkg/config.pgsql
- dbc_go bacula-director-pgsql $@
-fi
diff --git a/debian/bacula-director-pgsql.dirs b/debian/bacula-director-pgsql.dirs
deleted file mode 100644
index 64ab526..0000000
--- a/debian/bacula-director-pgsql.dirs
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/sbin
-usr/lib/bacula
-etc/bacula
-usr/share/dbconfig-common/data/bacula-director-pgsql/upgrade/pgsql
-usr/share/dbconfig-common/data/bacula-director-pgsql/install
-usr/share/dbconfig-common/data/bacula-director-pgsql/install-dbadmin
diff --git a/debian/bacula-director-pgsql.install b/debian/bacula-director-pgsql.install
deleted file mode 100644
index 9249ae0..0000000
--- a/debian/bacula-director-pgsql.install
+++ /dev/null
@@ -1,9 +0,0 @@
-etc/bacula/scripts/make_postgresql_tables usr/share/bacula-director
-etc/bacula/scripts/grant_postgresql_privileges usr/share/bacula-director
-etc/bacula/scripts/update_postgres* usr/share/bacula-director
-etc/bacula/scripts/*catalog_backup
-etc/bacula/scripts/*catalog_backup.pl
-usr/sbin/bacula-dir
-usr/sbin/dbcheck
-debian/additions/pgsql usr/share/dbconfig-common/data/bacula-director-pgsql/install-dbadmin
-etc/bacula/bacula-dir.conf
diff --git a/debian/bacula-director-pgsql.install.in b/debian/bacula-director-pgsql.install.in
new file mode 100644
index 0000000..3df0f51
--- /dev/null
+++ b/debian/bacula-director-pgsql.install.in
@@ -0,0 +1,2 @@
+usr/sbin/dbcheck
+debian/additions/pgsql usr/share/dbconfig-common/data/bacula-director-pgsql/install-dbadmin
diff --git a/debian/bacula-director-pgsql.manpages b/debian/bacula-director-pgsql.manpages
deleted file mode 100644
index 3f2b8f2..0000000
--- a/debian/bacula-director-pgsql.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-manpages/bacula-dir.8
-manpages/dbcheck.8
diff --git a/debian/bacula-director-pgsql.postinst b/debian/bacula-director-pgsql.postinst
deleted file mode 100644
index c4bf0c7..0000000
--- a/debian/bacula-director-pgsql.postinst
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/bash
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-dbc_first_version=1.38.9-2
-# set in config, must not be set here: dbc_dbuser=bacula
-# set in config, must not be set here: dbc_dbname=bacula
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then
- . /usr/share/dbconfig-common/dpkg/postinst.pgsql
- dbc_pgsql_createdb_encoding="SQL_ASCII"
- dbc_sql_substitutions="1"
- dbc_go bacula-director-pgsql $@
-fi
-
-if [ -n "$2" ]; then
- /etc/init.d/bacula-director stop || true
- sleep 1
-fi
-
-# Do start daemon
-db_stop
-
-invoke-rc.d --quiet bacula-director start
-
-#DEBHELPER#
diff --git a/debian/bacula-director-pgsql.postrm b/debian/bacula-director-pgsql.postrm
deleted file mode 100644
index 575422b..0000000
--- a/debian/bacula-director-pgsql.postrm
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- db_version 2.0
-fi
-
-if [ -f /usr/share/dbconfig-common/dpkg/postrm.pgsql ]; then
- . /usr/share/dbconfig-common/dpkg/postrm.pgsql
- dbc_go bacula-director-pgsql $@
-fi
-
-#DEBHELPER#
diff --git a/debian/bacula-director-pgsql.prerm b/debian/bacula-director-pgsql.prerm
deleted file mode 100644
index ec37d99..0000000
--- a/debian/bacula-director-pgsql.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-set -e
-
-. /usr/share/debconf/confmodule
-
-dbc_first_version=1.38.9-2
-dbc_dbuser=bacula
-dbc_dbname=bacula
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/prerm.pgsql ]; then
- . /usr/share/dbconfig-common/dpkg/prerm.pgsql
- dbc_go bacula-director-pgsql $@
-fi
-
-case "$1" in
- remove|deconfigure)
- /usr/sbin/invoke-rc.d bacula-director stop
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/bacula-director-sqlite3.config b/debian/bacula-director-sqlite3.config
deleted file mode 100644
index d9c8299..0000000
--- a/debian/bacula-director-sqlite3.config
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# config script for bacula-director (SQLite3 flavor)
-set -e
-
-. /usr/share/debconf/confmodule
-#db_version 2.0
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/config.sqlite3 ]; then
- dbc_first_version=3.0.3-3
- dbc_dbuser=bacula
- dbc_dbname=bacula.db
- dbc_basepath=/var/lib/bacula
- . /usr/share/dbconfig-common/dpkg/config.sqlite3
- dbc_go bacula-director-sqlite3 $@
-fi
diff --git a/debian/bacula-director-sqlite3.dirs b/debian/bacula-director-sqlite3.dirs
deleted file mode 100644
index ed7a421..0000000
--- a/debian/bacula-director-sqlite3.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/sbin
-usr/lib/bacula
-etc/bacula
-usr/share/dbconfig-common/data/bacula-director-sqlite3/upgrade/sqlite3
-usr/share/dbconfig-common/data/bacula-director-sqlite3/install
diff --git a/debian/bacula-director-sqlite3.install b/debian/bacula-director-sqlite3.install
deleted file mode 100644
index 31ebb5e..0000000
--- a/debian/bacula-director-sqlite3.install
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/bacula/scripts/make_sqlite*tables usr/share/bacula-director
-etc/bacula/scripts/update_sqlite* usr/share/bacula-director
-etc/bacula/scripts/*catalog_backup
-etc/bacula/scripts/*catalog_backup.pl
-usr/sbin/bacula-dir
-usr/sbin/dbcheck
-etc/bacula/bacula-dir.conf
diff --git a/debian/bacula-director-sqlite3.manpages b/debian/bacula-director-sqlite3.manpages
deleted file mode 100644
index 3f2b8f2..0000000
--- a/debian/bacula-director-sqlite3.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-manpages/bacula-dir.8
-manpages/dbcheck.8
diff --git a/debian/bacula-director-sqlite3.postinst b/debian/bacula-director-sqlite3.postinst
deleted file mode 100644
index 77ecf5c..0000000
--- a/debian/bacula-director-sqlite3.postinst
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/bash
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-dbc_first_version=3.0.3-3
-dbc_dbfile_owner=bacula:bacula
-# set in config, must not be set here: dbc_dbuser=bacula
-# set in config, must not be set here: dbc_dbname=bacula.db
-# set in config, must not be set here: dbc_basepath=/var/lib/bacula
-
-if [ -n "$2" ]; then
- /etc/init.d/bacula-director stop || true
- sleep 1
-fi
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/config.sqlite3 ]; then
- . /usr/share/dbconfig-common/dpkg/postinst.sqlite3
- dbc_go bacula-director-sqlite3 $@
-fi
-
-# Do start daemon
-db_stop
-
-invoke-rc.d --quiet bacula-director start
-
-#DEBHELPER#
diff --git a/debian/bacula-director-sqlite3.postrm b/debian/bacula-director-sqlite3.postrm
deleted file mode 100644
index 781350e..0000000
--- a/debian/bacula-director-sqlite3.postrm
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- db_version 2.0
-fi
-
-if [ -f /usr/share/dbconfig-common/dpkg/postrm.sqlite3 ]; then
- . /usr/share/dbconfig-common/dpkg/postrm.sqlite3
- dbc_go bacula-director-sqlite3 $@
-fi
-
-#DEBHELPER#
diff --git a/debian/bacula-director-sqlite3.prerm b/debian/bacula-director-sqlite3.prerm
deleted file mode 100644
index 37d65a4..0000000
--- a/debian/bacula-director-sqlite3.prerm
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-set -e
-
-case "$1" in
- remove|deconfigure)
- /usr/sbin/invoke-rc.d bacula-director stop
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/bacula-fd.dirs b/debian/bacula-fd.dirs
deleted file mode 100644
index 1327cd8..0000000
--- a/debian/bacula-fd.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/sbin
-usr/lib/bacula
-var/lib/bacula
-etc/bacula
-etc/bacula/scripts
diff --git a/debian/bacula-sd-sqlite3.install b/debian/bacula-sd-db.install.in
similarity index 100%
rename from debian/bacula-sd-sqlite3.install
rename to debian/bacula-sd-db.install.in
diff --git a/debian/bacula-sd-mysql.manpages b/debian/bacula-sd-db.manpages.in
similarity index 100%
rename from debian/bacula-sd-mysql.manpages
rename to debian/bacula-sd-db.manpages.in
diff --git a/debian/bacula-sd-mysql.install b/debian/bacula-sd-mysql.install
deleted file mode 100644
index b18738c..0000000
--- a/debian/bacula-sd-mysql.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/sbin/bscan usr/bin
-usr/sbin/bcopy usr/bin
-usr/sbin/btape
diff --git a/debian/bacula-sd-pgsql.install b/debian/bacula-sd-pgsql.install
deleted file mode 100644
index b18738c..0000000
--- a/debian/bacula-sd-pgsql.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/sbin/bscan usr/bin
-usr/sbin/bcopy usr/bin
-usr/sbin/btape
diff --git a/debian/bacula-sd-pgsql.manpages b/debian/bacula-sd-pgsql.manpages
deleted file mode 100644
index 56c0349..0000000
--- a/debian/bacula-sd-pgsql.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-manpages/bcopy.8
-manpages/bscan.8
diff --git a/debian/bacula-sd-sqlite3.manpages b/debian/bacula-sd-sqlite3.manpages
deleted file mode 100644
index 56c0349..0000000
--- a/debian/bacula-sd-sqlite3.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-manpages/bcopy.8
-manpages/bscan.8
diff --git a/debian/bacula-sd.dirs b/debian/bacula-sd.dirs
deleted file mode 100644
index 6a47e3d..0000000
--- a/debian/bacula-sd.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/sbin
-usr/lib/bacula
-var/lib/bacula
-etc/bacula
diff --git a/debian/bacula-traymonitor.dirs b/debian/bacula-traymonitor.dirs
deleted file mode 100644
index b85d017..0000000
--- a/debian/bacula-traymonitor.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/pixmaps
diff --git a/debian/rules b/debian/rules
index ec6b118..2c2bde8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,10 @@ DBGPKGS := $(shell fgrep dbg debian/control | sed -e 's/Package: //' -e 's/-dbg/
VARIANTS := pgsql mysql sqlite3
+# auto-generated files in debian/
+FILETYPES := install manpages config postinst postrm preinst prerm
+PACKAGES := director sd
+
######################################################################
DBC := usr/share/dbconfig-common/data/
@@ -62,7 +66,7 @@ LONGNAME_sqlite3 = sqlite3
# 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,7 +87,7 @@ endef
# 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
%:
@@ -136,7 +140,7 @@ override_dh_installdocs:
done
dh_installdocs -Nbacula
-override_dh_auto_build:
+override_dh_auto_build: maintfiles
dh_prep
dh_installdirs
# autoreconf doesn't work :-/
@@ -170,3 +174,15 @@ override_dh_makeshlibs:
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list