[pkg-bacula-commits] [bacula] 02/16: debian/rules: improve, clean up and fix it to allow architecture dependent and independent builds.

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch bacula-fd5.2
in repository bacula.

commit 5118a10652310cf3dcaefa0c2060138aded54941
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.
    
    (cherry-picked from master)
---
 debian/changelog |  3 +++
 debian/rules     | 27 ++++++++++++---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bbbea0a..1f22b12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
+<<<<<<< HEAD
 bacula-fd5.2 (5.2.13+dfsg-2) unstable; urgency=medium
 
   [ Carsten Leonhardt ]
   * New package to address upgrade issues (Closes: #807242)
   * don't install systemd related files on non-linux ports
+  * Improve debian/rules and fix it to allow architecture dependent and
+    independent builds.
 
  --
 
diff --git a/debian/rules b/debian/rules
index ea7de57..9484c9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,7 +94,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
@@ -110,16 +110,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!
@@ -138,7 +135,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
@@ -151,14 +147,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; \
@@ -173,10 +171,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