[pkg-bacula-commits] [bacula] 01/01: remove obsolete references to bacula-sd-DBTYPE packages

[Carsten Leonhardt]

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

leo pushed a commit to branch migrate-files
in repository bacula.

commit 68cbe571d0d6f0dd1ee800f2694f45252c2ddacd
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Jul 25 00:45:43 2016 +0200

    remove obsolete references to bacula-sd-DBTYPE packages
---
 debian/TODO                                          | 2 --
 debian/bacula-sd-mysql.maintscript                   | 1 -
 debian/bacula-sd-pgsql.maintscript                   | 1 -
 debian/bacula-sd-sqlite3.maintscript                 | 1 -
 debian/rules                                         | 7 ++-----
 debian/scripts/generate-doc-dir-to-symlink-migration | 2 +-
 6 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index d0ef1ad..b7a9baa 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,7 +1,5 @@
 Normal:
 
- * Unify bacula-sd-(pgsql|mysql|sqlite3) into bacula-sd-tools, they
-   all have the same content
  * Check if bacula-director-pgsql suggesting postgresql-contrib is useful
  * convert debian/copyright into machine readable format
    use follow fragment in the headers
diff --git a/debian/bacula-sd-mysql.maintscript b/debian/bacula-sd-mysql.maintscript
deleted file mode 100644
index f6bbcb6..0000000
--- a/debian/bacula-sd-mysql.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-sd-mysql bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-sd-pgsql.maintscript b/debian/bacula-sd-pgsql.maintscript
deleted file mode 100644
index 751379e..0000000
--- a/debian/bacula-sd-pgsql.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-sd-pgsql bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-sd-sqlite3.maintscript b/debian/bacula-sd-sqlite3.maintscript
deleted file mode 100644
index c0bf2b3..0000000
--- a/debian/bacula-sd-sqlite3.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-sd-sqlite3 bacula-common 7.0.5+dfsg-4~
diff --git a/debian/rules b/debian/rules
index 79032b0..dc6a928 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,12 +102,9 @@ endif
 override_dh_shlibdeps:
 	# Handle shlibs for the database packages specially so they get
 	# the deps on the correct libraries.
-	$(foreach db,$(VARIANTS),dh_shlibdeps -pbacula-sd-$(db) -Lbacula-common-$(db); \
-		dh_shlibdeps -pbacula-director-$(db) -Lbacula-common-$(db);)
+	$(foreach db,$(VARIANTS),dh_shlibdeps -pbacula-director-$(db) -Lbacula-common-$(db);)
 	# 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
+	dh_shlibdeps -a --remaining-packages
 
 override_dh_installinit-arch:
 	$(foreach db,$(VARIANTS),dh_installinit -pbacula-director-$(db) --name=bacula-director;)
diff --git a/debian/scripts/generate-doc-dir-to-symlink-migration b/debian/scripts/generate-doc-dir-to-symlink-migration
index 36d1a2b..b69168a 100755
--- a/debian/scripts/generate-doc-dir-to-symlink-migration
+++ b/debian/scripts/generate-doc-dir-to-symlink-migration
@@ -3,7 +3,7 @@
 # This script generates the debhelper files to facilitate the
 # transition from doc dirs to symlinks
 
-PACKAGES="bacula-common-mysql bacula-common-pgsql bacula-common-sqlite3 bacula-console bacula-console-qt bacula-director-common bacula-director-mysql bacula-director-pgsql bacula-director-sqlite3 bacula-fd bacula-sd bacula-sd-mysql bacula-sd-pgsql bacula-sd-sqlite3"
+PACKAGES="bacula-common-mysql bacula-common-pgsql bacula-common-sqlite3 bacula-console bacula-console-qt bacula-director-common bacula-director-mysql bacula-director-pgsql bacula-director-sqlite3 bacula-fd bacula-sd"
 
 for pkg in $PACKAGES; do
     echo dir_to_symlink /usr/share/doc/$pkg bacula-common 7.0.5+dfsg-4~ > debian/$pkg.maintscript

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git