[pkg-bacula-commits] [bacula] 02/02: Uncluttered debian/ by automating creation and cleaning of most maintscript files

Carsten Leonhardt leo at moszumanska.debian.org
Tue Sep 6 16:50:18 UTC 2016


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

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

commit ce885ffe5f3cc6029d975d54a207934a0ca2746d
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Sep 6 18:48:17 2016 +0200

    Uncluttered debian/ by automating creation and cleaning of most
    maintscript files
---
 debian/bacula-common-mysql.maintscript             |  1 -
 debian/bacula-common-pgsql.maintscript             |  1 -
 debian/bacula-common-sqlite3.maintscript           |  1 -
 debian/bacula-console-qt.maintscript               |  1 -
 debian/bacula-console.maintscript                  |  1 -
 debian/bacula-director-mysql.maintscript           |  1 -
 debian/bacula-director-pgsql.maintscript           |  1 -
 debian/bacula-director-sqlite3.maintscript         |  1 -
 debian/bacula-fd.maintscript                       |  1 -
 debian/bacula-sd.maintscript                       |  1 -
 debian/changelog                                   |  2 ++
 debian/rules                                       |  2 ++
 .../scripts/generate-doc-dir-to-symlink-migration  | 22 +++++++++++++++++++---
 13 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/debian/bacula-common-mysql.maintscript b/debian/bacula-common-mysql.maintscript
deleted file mode 100644
index 94a38f5..0000000
--- a/debian/bacula-common-mysql.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-common-mysql bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-common-pgsql.maintscript b/debian/bacula-common-pgsql.maintscript
deleted file mode 100644
index 86dd951..0000000
--- a/debian/bacula-common-pgsql.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-common-pgsql bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-common-sqlite3.maintscript b/debian/bacula-common-sqlite3.maintscript
deleted file mode 100644
index 703ab44..0000000
--- a/debian/bacula-common-sqlite3.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-common-sqlite3 bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-console-qt.maintscript b/debian/bacula-console-qt.maintscript
deleted file mode 100644
index 552925e..0000000
--- a/debian/bacula-console-qt.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-console-qt bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-console.maintscript b/debian/bacula-console.maintscript
deleted file mode 100644
index fda6760..0000000
--- a/debian/bacula-console.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-console bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-director-mysql.maintscript b/debian/bacula-director-mysql.maintscript
deleted file mode 100644
index 599b08c..0000000
--- a/debian/bacula-director-mysql.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-director-mysql bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-director-pgsql.maintscript b/debian/bacula-director-pgsql.maintscript
deleted file mode 100644
index c103f59..0000000
--- a/debian/bacula-director-pgsql.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-director-pgsql bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-director-sqlite3.maintscript b/debian/bacula-director-sqlite3.maintscript
deleted file mode 100644
index 945f55a..0000000
--- a/debian/bacula-director-sqlite3.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-director-sqlite3 bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-fd.maintscript b/debian/bacula-fd.maintscript
deleted file mode 100644
index 87d4a93..0000000
--- a/debian/bacula-fd.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-fd bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-sd.maintscript b/debian/bacula-sd.maintscript
deleted file mode 100644
index b3876bd..0000000
--- a/debian/bacula-sd.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-sd bacula-common 7.0.5+dfsg-4~
diff --git a/debian/changelog b/debian/changelog
index c7bc7d2..51ef4d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ bacula (7.4.3+dfsg-5) unstable; urgency=medium
   * deleted obsolete code from various places in debian/*
   * Removed obsolete information from README.Debian
   * Removed obsolete check for insecure bacula-director passwords
+  * Uncluttered debian/ by automating creation and cleaning of most
+    maintscript files
 
  --
 
diff --git a/debian/rules b/debian/rules
index 686d943..b84f9ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -143,6 +143,7 @@ override_dh_auto_install-indep:
 
 override_dh_auto_configure-arch:
 	$(foreach db,$(VARIANTS),$(call db-templates-subst,$(db)))
+	debian/scripts/generate-doc-dir-to-symlink-migration create
 	autoconf -I autoconf/ -o configure autoconf/configure.in
 	dh_auto_configure -- $(CONF_ALL)
 
@@ -155,6 +156,7 @@ override_dh_clean:
 	$(foreach db,$(VARIANTS),$(call db-templates-cleanup,$(db)))
 	dh_autotools-dev_restoreconfig
 	dh_clean
+	debian/scripts/generate-doc-dir-to-symlink-migration clean
 
 override_dh_fixperms-arch:
 	dh_fixperms -a
diff --git a/debian/scripts/generate-doc-dir-to-symlink-migration b/debian/scripts/generate-doc-dir-to-symlink-migration
index b69168a..3c19b64 100755
--- a/debian/scripts/generate-doc-dir-to-symlink-migration
+++ b/debian/scripts/generate-doc-dir-to-symlink-migration
@@ -3,8 +3,24 @@
 # 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"
+# all binary packages except bacula-common
+PACKAGES="bacula-common-mysql bacula-common-pgsql bacula-common-sqlite3 bacula-console bacula-console-qt 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
-done;
+    case $1 in
+	create)
+	    if [ -f debian/$pkg.maintscript ]; then
+		echo "$0: error: debian/$pkg.maintscript already exists!"
+		exit 1
+	    fi
+	    echo dir_to_symlink /usr/share/doc/$pkg bacula-common 7.0.5+dfsg-4~ > debian/$pkg.maintscript
+	    ;;
+	clean)
+	    rm -f debian/$pkg.maintscript
+	    ;;
+	*)
+	    echo '$0: error: argument "create" or "clean" is missing'
+	    exit 1
+	    ;;
+    esac
+done

-- 
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