[pkg-bacula-commits] [bacula] 12/35: Simplify installation process
Carsten Leonhardt
leo at moszumanska.debian.org
Wed Jul 20 10:21:37 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 7a8de3b7160a84a51bb45d47b8656f3483d2f386
Author: Jan Hauke Rahm <jhr at debian.org>
Date: Wed Apr 27 12:38:13 2011 +0200
Simplify installation process
---
debian/bacula-common-mysql.install | 2 +-
debian/bacula-common-pgsql.install | 2 +-
debian/bacula-common-sqlite3.install | 2 +-
debian/bacula-common.install | 22 ++++++++--------------
debian/bacula-common.manpages | 2 +-
debian/bacula-console-qt.install | 1 +
debian/bacula-console.dirs | 3 ---
debian/bacula-console.install | 1 +
debian/bacula-director-common.install | 6 +++---
debian/bacula-director-mysql.install | 12 ++++++------
debian/bacula-director-pgsql.install | 14 +++++++-------
debian/bacula-director-sqlite3.install | 12 ++++++------
debian/bacula-fd.install | 4 ++--
debian/bacula-sd-mysql.install | 6 +++---
debian/bacula-sd-pgsql.install | 6 +++---
debian/bacula-sd-sqlite3.install | 6 +++---
debian/bacula-sd.install | 14 +++++++-------
debian/bacula-traymonitor.install | 2 +-
debian/rules | 33 +++++++++++++++++----------------
19 files changed, 72 insertions(+), 78 deletions(-)
diff --git a/debian/bacula-common-mysql.install b/debian/bacula-common-mysql.install
index 49afd55..bfb2ffd 100644
--- a/debian/bacula-common-mysql.install
+++ b/debian/bacula-common-mysql.install
@@ -1 +1 @@
-debian/tmp-install-mysql/usr/lib/bacula/libbacsql* usr/lib/bacula
+usr/lib/bacula/libbacsql*
diff --git a/debian/bacula-common-pgsql.install b/debian/bacula-common-pgsql.install
index 4153b80..bfb2ffd 100644
--- a/debian/bacula-common-pgsql.install
+++ b/debian/bacula-common-pgsql.install
@@ -1 +1 @@
-debian/tmp-install-pgsql/usr/lib/bacula/libbacsql* usr/lib/bacula
+usr/lib/bacula/libbacsql*
diff --git a/debian/bacula-common-sqlite3.install b/debian/bacula-common-sqlite3.install
index 77b1203..bfb2ffd 100644
--- a/debian/bacula-common-sqlite3.install
+++ b/debian/bacula-common-sqlite3.install
@@ -1 +1 @@
-debian/tmp-install-sqlite3/usr/lib/bacula/libbacsql* usr/lib/bacula
+usr/lib/bacula/libbacsql*
diff --git a/debian/bacula-common.install b/debian/bacula-common.install
index 67c5fa1..3692a53 100644
--- a/debian/bacula-common.install
+++ b/debian/bacula-common.install
@@ -1,15 +1,9 @@
-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
diff --git a/debian/bacula-common.manpages b/debian/bacula-common.manpages
index af154f7..09c3101 100644
--- a/debian/bacula-common.manpages
+++ b/debian/bacula-common.manpages
@@ -1,5 +1,5 @@
manpages/bacula.8
-#debian/tmp-install-sqlite3/usr/share/man/man8/bacula.8.gz
+#usr/share/man/man8/bacula.8.gz
manpages/bsmtp.1
manpages/btraceback.8
diff --git a/debian/bacula-console-qt.install b/debian/bacula-console-qt.install
index ce9510e..03e1cc7 100644
--- a/debian/bacula-console-qt.install
+++ b/debian/bacula-console-qt.install
@@ -1 +1,2 @@
src/qt-console/.libs/bat usr/bin
+etc/bacula/bat.conf
diff --git a/debian/bacula-console.dirs b/debian/bacula-console.dirs
deleted file mode 100644
index d3e637b..0000000
--- a/debian/bacula-console.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/sbin
-etc/bacula
diff --git a/debian/bacula-console.install b/debian/bacula-console.install
new file mode 100644
index 0000000..2a60dc7
--- /dev/null
+++ b/debian/bacula-console.install
@@ -0,0 +1 @@
+usr/sbin/bconsole
diff --git a/debian/bacula-director-common.install b/debian/bacula-director-common.install
index 4fb63a1..4e9de64 100644
--- a/debian/bacula-director-common.install
+++ b/debian/bacula-director-common.install
@@ -1,4 +1,4 @@
-debian/tmp-install-sqlite3/etc/bacula/scripts/query.sql etc/bacula/scripts
-debian/tmp-install-sqlite3/usr/sbin/bwild usr/sbin
-debian/tmp-install-sqlite3/usr/sbin/bregex usr/sbin
+etc/bacula/scripts/query.sql
+usr/sbin/bwild
+usr/sbin/bregex
debian/additions/postinst-common usr/share/bacula-director
diff --git a/debian/bacula-director-mysql.install b/debian/bacula-director-mysql.install
index 820374b..83fd407 100644
--- a/debian/bacula-director-mysql.install
+++ b/debian/bacula-director-mysql.install
@@ -1,6 +1,6 @@
-debian/tmp-install-mysql/etc/bacula/scripts/make_mysql_tables usr/share/bacula-director
-debian/tmp-install-mysql/etc/bacula/scripts/update_mysql* usr/share/bacula-director
-debian/tmp-install-mysql/etc/bacula/scripts/*catalog_backup etc/bacula/scripts
-debian/tmp-install-mysql/etc/bacula/scripts/*catalog_backup.pl etc/bacula/scripts
-debian/tmp-install-mysql/usr/sbin/bacula-dir usr/sbin
-debian/tmp-install-mysql/usr/sbin/dbcheck usr/sbin
+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
diff --git a/debian/bacula-director-pgsql.install b/debian/bacula-director-pgsql.install
index 6b76557..0557e23 100644
--- a/debian/bacula-director-pgsql.install
+++ b/debian/bacula-director-pgsql.install
@@ -1,8 +1,8 @@
-debian/tmp-install-pgsql/etc/bacula/scripts/make_postgresql_tables usr/share/bacula-director
-debian/tmp-install-pgsql/etc/bacula/scripts/grant_postgresql_privileges usr/share/bacula-director
-debian/tmp-install-pgsql/etc/bacula/scripts/update_postgres* usr/share/bacula-director
-debian/tmp-install-pgsql/etc/bacula/scripts/*catalog_backup etc/bacula/scripts
-debian/tmp-install-pgsql/etc/bacula/scripts/*catalog_backup.pl etc/bacula/scripts
-debian/tmp-install-pgsql/usr/sbin/bacula-dir usr/sbin
-debian/tmp-install-pgsql/usr/sbin/dbcheck usr/sbin
+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
diff --git a/debian/bacula-director-sqlite3.install b/debian/bacula-director-sqlite3.install
index 4e817bc..6d6e9f0 100644
--- a/debian/bacula-director-sqlite3.install
+++ b/debian/bacula-director-sqlite3.install
@@ -1,6 +1,6 @@
-debian/tmp-install-sqlite3/etc/bacula/scripts/make_sqlite*tables usr/share/bacula-director
-debian/tmp-install-sqlite3/etc/bacula/scripts/update_sqlite* usr/share/bacula-director
-debian/tmp-install-sqlite3/etc/bacula/scripts/*catalog_backup etc/bacula/scripts
-debian/tmp-install-sqlite3/etc/bacula/scripts/*catalog_backup.pl etc/bacula/scripts
-debian/tmp-install-sqlite3/usr/sbin/bacula-dir usr/sbin
-debian/tmp-install-sqlite3/usr/sbin/dbcheck usr/sbin
+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
diff --git a/debian/bacula-fd.install b/debian/bacula-fd.install
index b0c5263..e0e5465 100644
--- a/debian/bacula-fd.install
+++ b/debian/bacula-fd.install
@@ -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
diff --git a/debian/bacula-sd-mysql.install b/debian/bacula-sd-mysql.install
index f1a96a4..b18738c 100644
--- a/debian/bacula-sd-mysql.install
+++ b/debian/bacula-sd-mysql.install
@@ -1,3 +1,3 @@
-debian/tmp-install-mysql/usr/sbin/bscan usr/bin
-debian/tmp-install-mysql/usr/sbin/bcopy usr/bin
-debian/tmp-install-mysql/usr/sbin/btape usr/sbin
+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
index 17dbb90..b18738c 100644
--- a/debian/bacula-sd-pgsql.install
+++ b/debian/bacula-sd-pgsql.install
@@ -1,3 +1,3 @@
-debian/tmp-install-pgsql/usr/sbin/bscan usr/bin
-debian/tmp-install-pgsql/usr/sbin/bcopy usr/bin
-debian/tmp-install-pgsql/usr/sbin/btape usr/sbin
+usr/sbin/bscan usr/bin
+usr/sbin/bcopy usr/bin
+usr/sbin/btape
diff --git a/debian/bacula-sd-sqlite3.install b/debian/bacula-sd-sqlite3.install
index 21560df..618f02e 100644
--- a/debian/bacula-sd-sqlite3.install
+++ b/debian/bacula-sd-sqlite3.install
@@ -1,3 +1,3 @@
-debian/tmp-install-sqlite3/usr/sbin/bscan usr/bin
-debian/tmp-install-sqlite3/usr/sbin/bcopy usr/bin
-debian/tmp-install-sqlite3/usr/sbin/btape usr/sbin
+usr/sbin/bscan usr/bin
+usr/sbin/bcopy usr/bin
+usr/sbin/btape
diff --git a/debian/bacula-sd.install b/debian/bacula-sd.install
index c731612..b5b5ea2 100644
--- a/debian/bacula-sd.install
+++ b/debian/bacula-sd.install
@@ -1,7 +1,7 @@
-debian/tmp-install-sqlite3/usr/sbin/bacula-sd usr/sbin
-debian/tmp-install-sqlite3/usr/sbin/bls usr/sbin
-debian/tmp-install-sqlite3/usr/sbin/bextract usr/sbin
-debian/tmp-install-sqlite3/etc/bacula/scripts/mtx-changer etc/bacula/scripts
-debian/tmp-install-sqlite3/etc/bacula/scripts/mtx-changer.conf etc/bacula/scripts
-debian/tmp-install-sqlite3/etc/bacula/scripts/disk-changer etc/bacula/scripts
-debian/tmp-install-sqlite3/etc/bacula/scripts/dvd-handler etc/bacula/scripts
+usr/sbin/bacula-sd
+usr/sbin/bls
+usr/sbin/bextract
+etc/bacula/scripts/mtx-changer
+etc/bacula/scripts/mtx-changer.conf
+etc/bacula/scripts/disk-changer
+etc/bacula/scripts/dvd-handler
diff --git a/debian/bacula-traymonitor.install b/debian/bacula-traymonitor.install
index 6794b3e..4da6816 100644
--- a/debian/bacula-traymonitor.install
+++ b/debian/bacula-traymonitor.install
@@ -1,2 +1,2 @@
-debian/tmp-install-sqlite3/usr/sbin/bacula-tray-monitor usr/bin
+usr/sbin/bacula-tray-monitor usr/bin
src/tray-monitor/generic.xpm usr/share/pixmaps/bacula-traymonitor.xpm
diff --git a/debian/rules b/debian/rules
index a861c6b..027a728 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ VARIANTS := pgsql mysql sqlite3
######################################################################
-INSTALLDIR := $(CURDIR)/debian/tmp-install
DBC := usr/share/dbconfig-common/data/
CONF_ALL = --enable-smartalloc \
@@ -17,12 +16,11 @@ CONF_ALL = --enable-smartalloc \
--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 \
@@ -43,22 +41,21 @@ CONF_ALL = --enable-smartalloc \
--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
###########################################################################
@@ -93,7 +90,6 @@ endef
dh $@
override_dh_clean:
- $(RM) -r $(INSTALLDIR)-*
[ ! -f autoconf/config.guess.upstream ] || mv autoconf/config.guess.upstream autoconf/config.guess
[ ! -f autoconf/config.sub.upstream ] || mv autoconf/config.sub.upstream autoconf/config.sub
dh_clean
@@ -142,21 +138,26 @@ override_dh_installdocs:
dh_installdocs -Nbacula
override_dh_auto_build:
+ dh_prep
+ dh_installdirs
# autoreconf doesn't work :-/
mv autoconf/config.guess autoconf/config.guess.upstream
mv autoconf/config.sub autoconf/config.sub.upstream
cp /usr/share/misc/config.guess /usr/share/misc/config.sub autoconf/
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
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
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 \
--
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