[pkg-bacula-commits] [bacula] 01/01: debian/rules: improve, clean up and fix it to allow architecture dependent and independent builds. (Closes: #806605)
Carsten Leonhardt
leo at moszumanska.debian.org
Tue Dec 1 11:01:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to branch master
in repository bacula.
commit 48ba70385dd96c7c0a3b7f6047c3a00289f0784f
Author: Carsten Leonhardt <leo at debian.org>
Date: Tue Dec 1 12:00:29 2015 +0100
debian/rules: improve, clean up and fix it to allow architecture
dependent and independent builds. (Closes: #806605)
---
debian/changelog | 7 +++++++
debian/rules | 27 ++++++++++++---------------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a07e873..dfc638a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bacula (7.0.5+dfsg-4) unstable; urgency=medium
+
+ * Improve debian/rules and fix it to allow architecture dependent and
+ independent builds. (Closes: #806605)
+
+ --
+
bacula (7.0.5+dfsg-3) unstable; urgency=low
* Corrected logrotate configuration. (Closes: #694046, #716666)
diff --git a/debian/rules b/debian/rules
index c970059..02367fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,7 +93,7 @@ $(foreach template,$(wildcard debian/*-db.*.in),$(call template-cleanup,$(templa
endef
%:
- dh $@ --with autotools_dev
+ dh $@ --with autotools_dev --parallel
override_dh_shlibdeps:
# Handle shlibs for the database packages specially so they get
@@ -109,16 +109,13 @@ override_dh_shlibdeps:
-Nbacula-sd-sqlite3 -Nbacula-director-sqlite3 \
-Nbacula-sd-pgsql -Nbacula-director-pgsql
-override_dh_installinit:
+override_dh_installinit-arch:
dh_installinit -pbacula-sd -- defaults 90 10
dh_installinit -pbacula-fd -- defaults 91 9
dh_installinit -pbacula-director-common --name=bacula-director --no-start -- defaults 92 8
-override_dh_install:
- chmod 755 debian/additions/postinst-common
- chmod 755 debian/scripts/install-dbconfig
- dh_install
- chmod 755 debian/bacula-common/usr/lib/bacula/btraceback
+override_dh_install-arch:
+ dh_install -a
######### 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!
@@ -134,7 +131,6 @@ override_dh_install:
-e "s/XX_DBLONGNAME_XX/$(LONGNAME_$(db))/" \
debian/bacula-director-$(db)/etc/bacula/scripts/make_catalog_backup \
debian/bacula-director-$(db)/etc/bacula/scripts/make_catalog_backup.pl;)
- $(info HAVE_SYSTEMD=$(HAVE_SYSTEMD))
ifeq ($(HAVE_SYSTEMD),1)
# only install systemd related files if systemd is enabled during build
install -m 644 platforms/systemd/bacula.conf -D debian/bacula-common/usr/lib/tmpfiles.d/bacula.conf
@@ -147,14 +143,16 @@ override_dh_installdocs:
done
dh_installdocs -Nbacula
-override_dh_auto_configure:
+# avoid compiling anything when building the metapackages
+override_dh_auto_configure-indep:
+override_dh_auto_build-indep:
+override_dh_auto_install-indep:
+
+override_dh_auto_configure-arch:
$(foreach db,$(VARIANTS),$(call db-templates-subst,$(db)))
autoconf -I autoconf/ -o configure autoconf/configure.in
dh_auto_configure -- $(CONF_ALL)
-override_dh_auto_build:
- dh_auto_build --parallel
-
override_dh_strip:
for pkg in $(DBGPKGS); do \
dh_strip -p$$pkg --dbg-package=$$pkg-dbg; \
@@ -171,10 +169,9 @@ override_dh_clean:
dh_autotools-dev_restoreconfig
dh_clean
-override_dh_fixperms:
- dh_fixperms
+override_dh_fixperms-arch:
+ dh_fixperms -a
chmod -x debian/bacula-sd/etc/bacula/scripts/mtx-changer.conf
chmod -x debian/bacula-common/usr/share/doc/bacula-common/examples/nagios/check_bacula/README
- chmod +x debian/bacula-director-*/etc/bacula/scripts/make_catalog_backup_awk
override_dh_auto_test:
--
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