[pkg-bacula-commits] [bacula] 03/03: cleansed debian/rules from things unrelated to bacula-fd

Carsten Leonhardt leo at moszumanska.debian.org
Mon Dec 7 22:27:56 UTC 2015


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 2d2d572c87b56a247123a7995bc7d0240cb8c8c7
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Dec 7 23:26:40 2015 +0100

    cleansed debian/rules from things unrelated to bacula-fd
---
 debian/rules | 92 ++----------------------------------------------------------
 1 file changed, 2 insertions(+), 90 deletions(-)

diff --git a/debian/rules b/debian/rules
index 9484c9d..9684e50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,15 +5,12 @@
 DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DBGPKGS := $(shell sed -n -e 's/Package: \(.*\)-dbg/\1/p' debian/control)
 
-VARIANTS := pgsql mysql sqlite3
-
 ######################################################################
 
 DBC := usr/share/dbconfig-common/data/
 
 CONF_ALL	= \
 	--enable-smartalloc \
-	--with-python \
 	--with-tcp-wrappers \
 	--with-openssl \
 	--with-libiconv-prefix=/usr/include \
@@ -25,15 +22,8 @@ CONF_ALL	= \
 	--libdir=\$${prefix}/lib/bacula \
 	--enable-batch-insert \
 	--enable-ipv6 \
-	--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 \
 	--with-mon-fd-password=XXX_MONFDPASSWORD_XXX \
-	--with-mon-sd-password=XXX_MONSDPASSWORD_XXX \
-	--with-db-name=XXX_DBNAME_XXX \
-	--with-db-user=XXX_DBUSER_XXX \
-	--with-db-password=XXX_DBPASSWORD_XXX \
 	--config-cache \
 	--with-archivedir=/nonexistant/path/to/file/archive/dir \
 	--sysconfdir=/etc/bacula \
@@ -47,8 +37,7 @@ CONF_ALL	= \
 	--with-subsys-dir=/var/lock \
 	--with-dump-email=root \
 	--with-job-email=root \
-	--with-mysql --with-postgresql --with-sqlite3 \
-	--enable-bat --enable-tray-monitor --enable-bwx-console --with-x
+	--enable-client-only
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 CONF_ALL	+= --with-systemd=/lib/systemd/system
@@ -61,99 +50,28 @@ endif
 #set to 1 if configured with systemd
 HAVE_SYSTEMD = $(findstring 1,$(shell egrep "^\#define HAVE_SYSTEMD" config.log))
 
-LONGNAME_mysql		= mysql
-LONGNAME_pgsql		= postgresql
-LONGNAME_sqlite3	= sqlite3
-
 ###########################################################################
 
-# 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)/' -e 's/XX_DBLONGNAME_XX/$(LONGNAME_$(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 --parallel
 
-override_dh_shlibdeps:
-	# Handle shlibs for the database packages specially so they get
-	# the deps on the correct libraries.
-	dh_shlibdeps -pbacula-sd-mysql -Lbacula-common-mysql
-	dh_shlibdeps -pbacula-director-mysql -Lbacula-common-mysql
-	dh_shlibdeps -pbacula-sd-sqlite3 -Lbacula-common-sqlite3
-	dh_shlibdeps -pbacula-director-sqlite3 -Lbacula-common-sqlite3
-	dh_shlibdeps -pbacula-sd-pgsql -Lbacula-common-pgsql
-	dh_shlibdeps -pbacula-director-pgsql -Lbacula-common-pgsql
-	# Now build all other shlibdeps.
-	dh_shlibdeps -a -Nbacula-sd-mysql -Nbacula-director-mysql \
-		-Nbacula-sd-sqlite3 -Nbacula-director-sqlite3 \
-		-Nbacula-sd-pgsql -Nbacula-director-pgsql
-
 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-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!
-	#
-	# lenny -> squeeze is 10 -> 12
-	$(foreach db,$(VARIANTS),$(shell debian/scripts/install-dbconfig $(db) 3.0.0 11)) # 3.0.0 upgrade 10 to 11
-	$(foreach db,$(VARIANTS),$(shell debian/scripts/install-dbconfig $(db) 5.0.0 12)) # 5.0.0 upgrade 11 to 12
-	$(foreach db,$(VARIANTS),$(shell debian/scripts/install-dbconfig $(db) 5.2.0))    # 5.2.0 upgrade 12 to 14
-	$(foreach db,$(VARIANTS),$(shell debian/scripts/install-dbconfig $(db)))
-	# dh_install can not rename files, so doing here
-	mv debian/bacula-traymonitor/usr/share/pixmaps/generic.xpm \
-		debian/bacula-traymonitor/usr/share/pixmaps/bacula-tray-monitor.xpm
-	# fix database type in some scripts
-	$(foreach db,$(VARIANTS),sed -i \
-	  -e "s/XX_DB_XX/$(db)/" \
-		-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;)
 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
 endif
 
 override_dh_installdocs:
-	dh_installdocs -pbacula --link-doc=bacula-common
 	for pkg in $(DBGPKGS); do \
 		dh_installdocs -p$$pkg-dbg --link-doc=$$pkg; \
 		done
-	dh_installdocs -Nbacula
-
-# avoid compiling anything when building the metapackages
-override_dh_auto_configure-indep:
-override_dh_auto_build-indep:
-override_dh_auto_install-indep:
+	dh_installdocs --remaining-packages
 
 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)
 
@@ -167,13 +85,7 @@ override_dh_makeshlibs:
 	dh_makeshlibs -n -Xbpipe-fd.so
 
 override_dh_clean:
-	$(foreach db,$(VARIANTS),$(call db-templates-cleanup,$(db)))
 	dh_autotools-dev_restoreconfig
 	dh_clean
 
-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
-
 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