[pkg-bacula-commits] [bacula] 01/07: Rename bacula-director-common to bacula-director
Carsten Leonhardt
leo at moszumanska.debian.org
Mon Jul 25 18:06:24 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 066f683f099e85b140752c3ef15b7d41e1349515
Author: Carsten Leonhardt <leo at debian.org>
Date: Mon Jul 25 18:49:48 2016 +0200
Rename bacula-director-common to bacula-director
---
debian/bacula-director-common.maintscript | 1 -
...a-director-common.dirs => bacula-director.dirs} | 0
...acula-director.init.in => bacula-director.init} | 0
...ctor-common.install => bacula-director.install} | 0
...or-common.manpages => bacula-director.manpages} | 0
...rector-common.postrm => bacula-director.postrm} | 0
debian/changelog | 1 +
debian/control | 38 +++++++++-------------
debian/rules | 17 +++++-----
9 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/debian/bacula-director-common.maintscript b/debian/bacula-director-common.maintscript
deleted file mode 100644
index 959cb5e..0000000
--- a/debian/bacula-director-common.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/bacula-director-common bacula-common 7.0.5+dfsg-4~
diff --git a/debian/bacula-director-common.dirs b/debian/bacula-director.dirs
similarity index 100%
rename from debian/bacula-director-common.dirs
rename to debian/bacula-director.dirs
diff --git a/debian/bacula-director-db.bacula-director.init.in b/debian/bacula-director.init
similarity index 100%
rename from debian/bacula-director-db.bacula-director.init.in
rename to debian/bacula-director.init
diff --git a/debian/bacula-director-common.install b/debian/bacula-director.install
similarity index 100%
rename from debian/bacula-director-common.install
rename to debian/bacula-director.install
diff --git a/debian/bacula-director-common.manpages b/debian/bacula-director.manpages
similarity index 100%
rename from debian/bacula-director-common.manpages
rename to debian/bacula-director.manpages
diff --git a/debian/bacula-director-common.postrm b/debian/bacula-director.postrm
similarity index 100%
rename from debian/bacula-director-common.postrm
rename to debian/bacula-director.postrm
diff --git a/debian/changelog b/debian/changelog
index a3449f3..44d8278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ bacula (7.4.3+dfsg-3) experimental; urgency=medium
* Move bcopy and btape from bacula-sd-DBTYPE to bacula-sd
* Move bscan into it's own package, making bacula-sd-DBTYPE obsolete
* Move libbacsql from bacula-common-DBTYPE to bacula-common
+ * Rename bacula-director-common to bacula-director
--
diff --git a/debian/control b/debian/control
index fa0c3db..076ff3b 100644
--- a/debian/control
+++ b/debian/control
@@ -113,11 +113,12 @@ Description: network backup service - MySQL common files
This package provides files that are useful for other Bacula packages
for the MySQL database.
-Package: bacula-director-common
+Package: bacula-director
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
bacula-common (= ${binary:Version}),
+ bacula-director-sqlite3 (= ${binary:Version}) | bacula-director-pgsql (= ${binary:Version}) | bacula-director-mysql (= ${binary:Version}),
bsd-mailx | mailx,
lsb-base,
${misc:Depends},
@@ -144,19 +145,16 @@ Package: bacula-director-sqlite3
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
- bacula-common-sqlite3
- (>= ${binary:Version}),
- bacula-director-common (= ${binary:Version}),
+ bacula-common-sqlite3 (= ${binary:Version}),
dbconfig-sqlite3 | dbconfig-no-thanks,
file,
sqlite3,
ucf,
${misc:Depends},
${shlibs:Depends}
-Conflicts: bacula-director
-Provides: bacula-director
-Replaces: bacula-director, bacula-director-common (<< 7.4.3+dfsg-3)
-Breaks: bacula-director-common (<< 7.4.3+dfsg-3)
+Conflicts: bacula-director-database
+Provides: bacula-director-database
+Replaces: bacula-director-database
Suggests: gawk, ${perl:Depends}
Description: network backup service - SQLite 3 storage for Director
Bacula is a set of programs to manage backup, recovery, and verification of
@@ -173,18 +171,15 @@ Package: bacula-director-mysql
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
- bacula-common-mysql
- (>= ${binary:Version}),
- bacula-director-common (= ${binary:Version}),
+ bacula-common-mysql (= ${binary:Version}),
dbconfig-mysql | dbconfig-no-thanks,
mysql-client | virtual-mysql-client,
ucf,
${misc:Depends},
${shlibs:Depends}
-Conflicts: bacula-director
-Provides: bacula-director
-Replaces: bacula-director, bacula-director-common (<< 7.4.3+dfsg-3)
-Breaks: bacula-director-common (<< 7.4.3+dfsg-3)
+Conflicts: bacula-director-database
+Provides: bacula-director-database
+Replaces: bacula-director-database
Recommends: mysql-server | virtual-mysql-server
Suggests: gawk, ${perl:Depends}
Description: network backup service - MySQL storage for Director
@@ -202,18 +197,15 @@ Package: bacula-director-pgsql
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
- bacula-common-pgsql
- (>= ${binary:Version}),
- bacula-director-common (= ${binary:Version}),
+ bacula-common-pgsql (= ${binary:Version}),
dbconfig-pgsql | dbconfig-no-thanks,
postgresql-client (>= 7.4),
ucf,
${misc:Depends},
${shlibs:Depends}
-Conflicts: bacula-director
-Provides: bacula-director
-Replaces: bacula-director, bacula-director-common (<< 7.4.3+dfsg-3)
-Breaks: bacula-director-common (<< 7.4.3+dfsg-3)
+Conflicts: bacula-director-database
+Provides: bacula-director-database
+Replaces: bacula-director-database
Recommends: postgresql (>= 7.4)
Suggests: gawk, postgresql-contrib, ${perl:Depends}
Description: network backup service - PostgreSQL storage for Director
@@ -267,7 +259,7 @@ Package: bacula-server
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends:
- bacula-director-sqlite3 (>= ${source:Version}) | bacula-director,
+ bacula-director (>= ${source:Version}),
bacula-sd (>= ${source:Version}),
bacula-bscan,
${misc:Depends}
diff --git a/debian/rules b/debian/rules
index dc6a928..5cf8eb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,18 +102,19 @@ 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-director-$(db) -Lbacula-common-$(db);)
+ dh_shlibdeps -pbacula-bscan -Lbacula-common -- -xbaculs-director-mysql -xbaculs-director-pgsql -xbaculs-director-sqlite3
+ dh_shlibdeps -pbacula-director -Lbacula-common -- -xbaculs-director-mysql -xbaculs-director-pgsql -xbaculs-director-sqlite3
# Now build all other shlibdeps.
dh_shlibdeps -a --remaining-packages
-override_dh_installinit-arch:
- $(foreach db,$(VARIANTS),dh_installinit -pbacula-director-$(db) --name=bacula-director;)
- dh_installinit --remaining-packages
+#override_dh_installinit-arch:
+# $(foreach db,$(VARIANTS),dh_installinit -pbacula-director-$(db) --name=bacula-director;)
+# dh_installinit --remaining-packages
-override_dh_systemd_start-arch:
- dh_systemd_start -pbacula-sd bacula-sd.service
- dh_systemd_start -pbacula-fd bacula-fd.service
- $(foreach db,$(VARIANTS),dh_systemd_start -pbacula-director-$(db) bacula-director.service;)
+#override_dh_systemd_start-arch:
+# dh_systemd_start -pbacula-sd bacula-sd.service
+# dh_systemd_start -pbacula-fd bacula-fd.service
+# $(foreach db,$(VARIANTS),dh_systemd_start -pbacula-director-$(db) bacula-director.service;)
override_dh_install-arch:
dh_install -a
--
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