[pkg-bacula-commits] [bacula] 01/01: used "wrap-and-sort -s" on debian/rules and debian/*.install
Carsten Leonhardt
leo at moszumanska.debian.org
Tue Dec 1 22:40:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to branch master
in repository bacula.
commit aec8476924722dd5534aacd0bf40c3cd70417fd5
Author: Carsten Leonhardt <leo at debian.org>
Date: Tue Dec 1 15:35:12 2015 +0100
used "wrap-and-sort -s" on debian/rules and debian/*.install
---
debian/bacula-common.install | 20 ++---
debian/bacula-console-qt.install | 4 +-
debian/bacula-director-common.install | 4 +-
debian/bacula-director-mysql.install | 8 +-
debian/bacula-director-pgsql.install | 12 +--
debian/bacula-director-sqlite3.install | 10 +--
debian/bacula-fd.install | 2 +-
debian/bacula-sd.install | 10 +--
debian/control | 142 ++++++++++++++++++++++-----------
9 files changed, 132 insertions(+), 80 deletions(-)
diff --git a/debian/bacula-common.install b/debian/bacula-common.install
index f25581d..eb60fcc 100644
--- a/debian/bacula-common.install
+++ b/debian/bacula-common.install
@@ -1,14 +1,14 @@
+debian/additions/common-functions.dpkg usr/share/bacula-common
+debian/additions/common-functions.init usr/share/bacula-common
+etc/bacula/bacula-dir.conf usr/share/bacula-common/defconfig
+etc/bacula/bacula-fd.conf usr/share/bacula-common/defconfig
+etc/bacula/bacula-sd.conf usr/share/bacula-common/defconfig
+etc/bacula/bat.conf usr/share/bacula-common/defconfig
+etc/bacula/bconsole.conf usr/share/bacula-common/defconfig
etc/bacula/scripts/btraceback.gdb
+usr/lib/bacula/libbac-*.so
+usr/lib/bacula/libbac.so
usr/lib/bacula/libbaccfg*.so
usr/lib/bacula/libbacfind*.so
-usr/lib/bacula/libbac.so
-usr/lib/bacula/libbac-*.so
-usr/sbin/btraceback usr/lib/bacula
usr/sbin/bsmtp
-debian/additions/common-functions.init usr/share/bacula-common
-debian/additions/common-functions.dpkg usr/share/bacula-common
-etc/bacula/bat.conf usr/share/bacula-common/defconfig
-etc/bacula/bconsole.conf usr/share/bacula-common/defconfig
-etc/bacula/bacula-sd.conf usr/share/bacula-common/defconfig
-etc/bacula/bacula-fd.conf usr/share/bacula-common/defconfig
-etc/bacula/bacula-dir.conf usr/share/bacula-common/defconfig
+usr/sbin/btraceback usr/lib/bacula
diff --git a/debian/bacula-console-qt.install b/debian/bacula-console-qt.install
index 4ddd179..069dc9c 100644
--- a/debian/bacula-console-qt.install
+++ b/debian/bacula-console-qt.install
@@ -1,3 +1,3 @@
-usr/sbin/bat
-src/qt-console/images/bat_icon.png usr/share/pixmaps
scripts/bat.desktop usr/share/applications
+src/qt-console/images/bat_icon.png usr/share/pixmaps
+usr/sbin/bat
diff --git a/debian/bacula-director-common.install b/debian/bacula-director-common.install
index 4e9de64..57822cb 100644
--- a/debian/bacula-director-common.install
+++ b/debian/bacula-director-common.install
@@ -1,4 +1,4 @@
+debian/additions/postinst-common usr/share/bacula-director
etc/bacula/scripts/query.sql
-usr/sbin/bwild
usr/sbin/bregex
-debian/additions/postinst-common usr/share/bacula-director
+usr/sbin/bwild
diff --git a/debian/bacula-director-mysql.install b/debian/bacula-director-mysql.install
index 7ee3d70..a52d387 100644
--- a/debian/bacula-director-mysql.install
+++ b/debian/bacula-director-mysql.install
@@ -1,8 +1,8 @@
+debian/additions/mysql/make_catalog_backup_awk etc/bacula/scripts
+etc/bacula/scripts/*catalog_backup.pl
+etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
+etc/bacula/scripts/make_catalog_backup
etc/bacula/scripts/make_mysql_tables usr/share/bacula-director
etc/bacula/scripts/update_mysql* usr/share/bacula-director
-etc/bacula/scripts/make_catalog_backup
-etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
-etc/bacula/scripts/*catalog_backup.pl
-debian/additions/mysql/make_catalog_backup_awk etc/bacula/scripts
usr/sbin/bacula-dir
usr/sbin/dbcheck
diff --git a/debian/bacula-director-pgsql.install b/debian/bacula-director-pgsql.install
index 6627f58..b4e2b57 100644
--- a/debian/bacula-director-pgsql.install
+++ b/debian/bacula-director-pgsql.install
@@ -1,10 +1,10 @@
-etc/bacula/scripts/make_postgresql_tables usr/share/bacula-director
+debian/additions/pgsql/database/pgsql usr/share/dbconfig-common/data/bacula-director-pgsql/install-dbadmin
+debian/additions/pgsql/make_catalog_backup_awk etc/bacula/scripts
+etc/bacula/scripts/*catalog_backup.pl
+etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
etc/bacula/scripts/grant_postgresql_privileges usr/share/bacula-director
-etc/bacula/scripts/update_postgres* usr/share/bacula-director
etc/bacula/scripts/make_catalog_backup
-etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
-etc/bacula/scripts/*catalog_backup.pl
-debian/additions/pgsql/make_catalog_backup_awk etc/bacula/scripts
+etc/bacula/scripts/make_postgresql_tables usr/share/bacula-director
+etc/bacula/scripts/update_postgres* usr/share/bacula-director
usr/sbin/bacula-dir
usr/sbin/dbcheck
-debian/additions/pgsql/database/pgsql usr/share/dbconfig-common/data/bacula-director-pgsql/install-dbadmin
diff --git a/debian/bacula-director-sqlite3.install b/debian/bacula-director-sqlite3.install
index a895be0..454b462 100644
--- a/debian/bacula-director-sqlite3.install
+++ b/debian/bacula-director-sqlite3.install
@@ -1,9 +1,9 @@
-etc/bacula/scripts/make_sqlite*tables usr/share/bacula-director
-etc/bacula/scripts/update_sqlite* usr/share/bacula-director
-etc/bacula/scripts/make_catalog_backup
debian/additions/sqlite3/delete_catalog_backup.md5sum usr/share/bacula-common/defconfig/scripts
-etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
-etc/bacula/scripts/*catalog_backup.pl
debian/additions/sqlite3/make_catalog_backup_awk etc/bacula/scripts
+etc/bacula/scripts/*catalog_backup.pl
+etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
+etc/bacula/scripts/make_catalog_backup
+etc/bacula/scripts/make_sqlite*tables usr/share/bacula-director
+etc/bacula/scripts/update_sqlite* usr/share/bacula-director
usr/sbin/bacula-dir
usr/sbin/dbcheck
diff --git a/debian/bacula-fd.install b/debian/bacula-fd.install
index f92725e..adadbb6 100644
--- a/debian/bacula-fd.install
+++ b/debian/bacula-fd.install
@@ -1,2 +1,2 @@
-usr/sbin/bacula-fd
usr/lib/bacula/bpipe-fd.so
+usr/sbin/bacula-fd
diff --git a/debian/bacula-sd.install b/debian/bacula-sd.install
index b5b5ea2..05f7e11 100644
--- a/debian/bacula-sd.install
+++ b/debian/bacula-sd.install
@@ -1,7 +1,7 @@
-usr/sbin/bacula-sd
-usr/sbin/bls
-usr/sbin/bextract
-etc/bacula/scripts/mtx-changer
-etc/bacula/scripts/mtx-changer.conf
etc/bacula/scripts/disk-changer
etc/bacula/scripts/dvd-handler
+etc/bacula/scripts/mtx-changer
+etc/bacula/scripts/mtx-changer.conf
+usr/sbin/bacula-sd
+usr/sbin/bextract
+usr/sbin/bls
diff --git a/debian/control b/debian/control
index 6955876..4e900cd 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Homepage: http://www.bacula.org/
Package: bacula
Architecture: all
-Depends: bacula-server, bacula-client, ${misc:Depends}
+Depends: bacula-client, bacula-server, ${misc:Depends}
Suggests: bacula-doc
Description: network backup service - metapackage
Bacula is a set of programs to manage backup, recovery, and verification
@@ -53,7 +53,7 @@ Package: bacula-common
Replaces: bacula-director-common
Architecture: any
Pre-Depends: adduser
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: bacula-doc
Description: network backup service - common support files
Bacula is a set of programs to manage backup, recovery, and verification of
@@ -74,9 +74,9 @@ Description: network backup service - common support files (debugging)
Package: bacula-common-sqlite3
Architecture: any
-Depends: bacula-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: bacula-common, ${misc:Depends}, ${shlibs:Depends}
Suggests: bacula-doc
-Conflicts: bacula-common-pgsql, bacula-common-mysql
+Conflicts: bacula-common-mysql, bacula-common-pgsql
Description: network backup service - SQLite v3 common files
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -89,7 +89,7 @@ Section: debug
Priority: extra
Architecture: any
Depends: bacula-common-sqlite3 (= ${binary:Version}), ${misc:Depends}
-Conflicts: bacula-common-pgsql-dbg, bacula-common-mysql-dbg
+Conflicts: bacula-common-mysql-dbg, bacula-common-pgsql-dbg
Description: network backup service - SQLite v3 common files (debugging)
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -98,9 +98,9 @@ Description: network backup service - SQLite v3 common files (debugging)
Package: bacula-common-pgsql
Architecture: any
-Depends: bacula-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: bacula-common, ${misc:Depends}, ${shlibs:Depends}
Suggests: bacula-doc
-Conflicts: bacula-common-sqlite3, bacula-common-mysql
+Conflicts: bacula-common-mysql, bacula-common-sqlite3
Description: network backup service - PostgreSQL common files
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -113,7 +113,7 @@ Section: debug
Priority: extra
Architecture: any
Depends: bacula-common-pgsql (= ${binary:Version}), ${misc:Depends}
-Conflicts: bacula-common-sqlite3-dbg, bacula-common-mysql-dbg
+Conflicts: bacula-common-mysql-dbg, bacula-common-sqlite3-dbg
Description: network backup service - PostgreSQL common files (debugging)
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -122,9 +122,9 @@ Description: network backup service - PostgreSQL common files (debugging)
Package: bacula-common-mysql
Architecture: any
-Depends: bacula-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: bacula-common, ${misc:Depends}, ${shlibs:Depends}
Suggests: bacula-doc
-Conflicts: bacula-common-sqlite3, bacula-common-pgsql
+Conflicts: bacula-common-pgsql, bacula-common-sqlite3
Description: network backup service - MySQL common files
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -137,7 +137,7 @@ Section: debug
Priority: extra
Architecture: any
Depends: bacula-common-mysql (= ${binary:Version}), ${misc:Depends}
-Conflicts: bacula-common-sqlite3-dbg, bacula-common-pgsql-dbg
+Conflicts: bacula-common-pgsql-dbg, bacula-common-sqlite3-dbg
Description: network backup service - MySQL common files (debugging)
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -146,8 +146,12 @@ Description: network backup service - MySQL common files (debugging)
Package: bacula-director-common
Architecture: any
-Depends: bacula-common (= ${binary:Version}), bsd-mailx | mailx, lsb-base,
- ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ bacula-common (= ${binary:Version}),
+ bsd-mailx | mailx,
+ lsb-base,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: network backup service - Director common files
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -171,9 +175,16 @@ Description: network backup service - Director common files (debugging)
Package: bacula-director-sqlite3
Architecture: any
-Depends: bacula-director-common (= ${binary:Version}), bacula-common-sqlite3
- (>= ${binary:Version}), sqlite3, file, dbconfig-common, ucf,
- ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ bacula-common-sqlite3
+ (>= ${binary:Version}),
+ bacula-director-common (= ${binary:Version}),
+ dbconfig-common,
+ file,
+ sqlite3,
+ ucf,
+ ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
@@ -188,7 +199,7 @@ Description: network backup service - SQLite 3 storage for Director
.
This package stores Bacula's catalog in an SQLite 3 database, and thus is
suitable for smaller installations.
-
+
Package: bacula-director-sqlite3-dbg
Section: debug
Priority: extra
@@ -205,9 +216,15 @@ Description: network backup service - SQLite 3 storage for Director (debugging)
Package: bacula-director-mysql
Architecture: any
-Depends: bacula-director-common (= ${binary:Version}), bacula-common-mysql
- (>= ${binary:Version}), dbconfig-common, mysql-client | virtual-mysql-client, ucf,
- ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ bacula-common-mysql
+ (>= ${binary:Version}),
+ bacula-director-common (= ${binary:Version}),
+ dbconfig-common,
+ mysql-client | virtual-mysql-client,
+ ucf,
+ ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
@@ -240,9 +257,15 @@ Description: network backup service - MySQL storage for Director (debugging)
Package: bacula-director-pgsql
Architecture: any
-Depends: bacula-director-common (= ${binary:Version}), bacula-common-pgsql
- (>= ${binary:Version}), dbconfig-common, postgresql-client (>= 7.4), ucf,
- ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ bacula-common-pgsql
+ (>= ${binary:Version}),
+ bacula-director-common (= ${binary:Version}),
+ dbconfig-common,
+ postgresql-client (>= 7.4),
+ ucf,
+ ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
@@ -275,8 +298,11 @@ Description: network backup service - PostgreSQL storage for Director (debugging
Package: bacula-client
Architecture: all
-Depends: bacula-console (>= ${source:Version}), bacula-fd
- (>= ${source:Version}), ${misc:Depends}
+Depends:
+ bacula-console (>= ${source:Version}),
+ bacula-fd
+ (>= ${source:Version}),
+ ${misc:Depends}
Description: network backup service - client metapackage
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -290,8 +316,12 @@ Description: network backup service - client metapackage
Package: bacula-fd
Architecture: any
-Depends: bacula-common (= ${binary:Version}), lsb-base, ucf, ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ bacula-common (= ${binary:Version}),
+ lsb-base,
+ ucf,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: network backup service - file daemon
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -313,9 +343,11 @@ Description: network backup service - file daemon (debugging)
Package: bacula-server
Architecture: all
-Depends: bacula-director-sqlite3 (>= ${source:Version}) | bacula-director,
- bacula-sd (>= ${source:Version}), bacula-sd-sqlite3 (>= ${source:Version}) |
- bacula-sd-tools, ${misc:Depends}
+Depends:
+ bacula-director-sqlite3 (>= ${source:Version}) | bacula-director,
+ bacula-sd (>= ${source:Version}),
+ bacula-sd-sqlite3 (>= ${source:Version}) | bacula-sd-tools,
+ ${misc:Depends}
Recommends: bacula-fd
Description: network backup service - server metapackage
Bacula is a set of programs to manage backup, recovery, and verification of
@@ -326,10 +358,15 @@ Description: network backup service - server metapackage
Package: bacula-sd
Architecture: any
-Depends: bacula-common (= ${binary:Version}), mtx [!hurd-any], lsb-base, ucf,
- ${shlibs:Depends}, ${misc:Depends}
-Recommends: mt-st, bacula-sd-sqlite3 (>= ${source:Version}) | bacula-sd-tools
-Suggests: dds2tar, scsitools, sg3-utils, python
+Depends:
+ bacula-common (= ${binary:Version}),
+ lsb-base,
+ mtx [!hurd-any],
+ ucf,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: bacula-sd-sqlite3 (>= ${source:Version}) | bacula-sd-tools, mt-st
+Suggests: dds2tar, python, scsitools, sg3-utils
Description: network backup service - storage daemon
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -345,7 +382,7 @@ Package: bacula-sd-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: ${misc:Depends}, bacula-sd (= ${binary:Version})
+Depends: bacula-sd (= ${binary:Version}), ${misc:Depends}
Description: network backup service - storage daemon (debugging)
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -354,8 +391,11 @@ Description: network backup service - storage daemon (debugging)
Package: bacula-sd-sqlite3
Architecture: any
-Depends: bacula-sd (= ${binary:Version}), ${shlibs:Depends},
- bacula-common-sqlite3 (>= ${binary:Version}), ${misc:Depends}
+Depends:
+ bacula-common-sqlite3 (>= ${binary:Version}),
+ bacula-sd (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: bacula-sd-tools
Replaces: bacula-sd-tools
Provides: bacula-sd-tools
@@ -386,8 +426,12 @@ Description: network backup service - SQLite 3 SD tools (debugging)
Package: bacula-sd-mysql
Architecture: any
-Depends: bacula-sd (= ${binary:Version}), bacula-common-mysql
- (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ bacula-common-mysql
+ (>= ${binary:Version}),
+ bacula-sd (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: bacula-sd-tools
Replaces: bacula-sd-tools
Provides: bacula-sd-tools
@@ -418,8 +462,12 @@ Description: network backup service - MySQL SD tools (debugging)
Package: bacula-sd-pgsql
Architecture: any
-Depends: bacula-sd (= ${binary:Version}), bacula-common-pgsql
- (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ bacula-common-pgsql
+ (>= ${binary:Version}),
+ bacula-sd (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: bacula-sd-tools
Replaces: bacula-sd-tools
Provides: bacula-sd-tools
@@ -450,8 +498,10 @@ Description: network backup service - PostgreSQL SD tools (debugging)
Package: bacula-console
Architecture: any
-Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ bacula-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: network backup service - text console
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
@@ -475,8 +525,10 @@ Description: network backup service - text console (debugging)
Package: bacula-console-qt
Section: utils
Architecture: any
-Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ bacula-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: network backup service - Bacula Administration Tool
Bacula is a set of programs to manage backup, recovery, and verification of
data across a network of computers of different kinds.
--
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