Skip to content

Commit

Permalink
get rid of circular dependencies
Browse files Browse the repository at this point in the history 
Remove circular dependency between bareos-database-common, bareos-database-mysql, bareos-database-postgresql and bareos-database-sqlite3.

Closes: #769536 (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769536)
Thanks: Bill Allombert
  • Loading branch information
@joergsteffens
joergsteffens authored and Marco van Wieringen committed Feb 17, 2015
1 parent f727d0e commit a7d4af5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions debian/control
View file
Expand Up @@ -98,7 +98,7 @@ Package: bareos-common
Architecture: any
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser
Depends: openssl, ${shlibs:Depends}, ${misc:Depends}
Conflicts: bacula-director-common, bacula-common
Conflicts: bacula-director-common, bacula-common
Description: Backup Archiving Recovery Open Sourced - common files
Bareos is a set of programs to manage backup, recovery and verification of
data across a network of computers of different kinds.
Expand All @@ -109,7 +109,7 @@ Description: Backup Archiving Recovery Open Sourced - common files
Package: bareos-database-common
Architecture: any
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0
Depends: bareos-database-postgresql (= ${binary:Version}) | bareos-database-mysql (= ${binary:Version}) | bareos-database-sqlite3 (= ${binary:Version}), bareos-common (= ${binary:Version}), dbconfig-common, lsb-base (>= 3.2-13), ${shlibs:Depends}, ${misc:Depends}
Depends: bareos-common (= ${binary:Version}), dbconfig-common, lsb-base (>= 3.2-13), ${shlibs:Depends}, ${misc:Depends}
Description: Backup Archiving Recovery Open Sourced - common catalog files
Bareos is a set of programs to manage backup, recovery and verification of
data across a network of computers of different kinds.
Expand Down Expand Up @@ -159,7 +159,7 @@ Description: Backup Archiving Recovery Open Sourced - SQLite backend
Package: bareos-database-tools
Architecture: any
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0
Depends: bareos-common (= ${binary:Version}), bareos-database-common (= ${binary:Version}), lsb-base (>= 3.2-13), ${shlibs:Depends}, ${misc:Depends}
Depends: bareos-common (= ${binary:Version}), bareos-database-postgresql (= ${binary:Version}) | bareos-database-mysql (= ${binary:Version}) | bareos-database-sqlite3 (= ${binary:Version}), lsb-base (>= 3.2-13), ${shlibs:Depends}, ${misc:Depends}
Conflicts: bacula-sd-mysql, bacula-sd-pgsql, bacula-sd-sqlite3
Description: Backup Archiving Recovery Open Sourced - database tools
Bareos is a set of programs to manage backup, recovery and verification of
Expand Down Expand Up @@ -197,7 +197,7 @@ Description: Backup Archiving Recovery Open Sourced - development files
Package: bareos-director
Architecture: any
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser
Depends: bareos-common (= ${binary:Version}), bareos-database-common (= ${binary:Version}), bareos-database-tools, lsb-base (>= 3.2-13), lsof, bsd-mailx | mailx, ${shlibs:Depends}, ${misc:Depends}
Depends: bareos-common (= ${binary:Version}), bareos-database-postgresql (= ${binary:Version}) | bareos-database-mysql (= ${binary:Version}) | bareos-database-sqlite3 (= ${binary:Version}), bareos-database-tools, lsb-base (>= 3.2-13), lsof, bsd-mailx | mailx, ${shlibs:Depends}, ${misc:Depends}
Recommends: logrotate
Conflicts: bacula-director
Replaces: bacula-director
Expand Down
8 changes: 4 additions & 4 deletions debian/control.in
View file
Expand Up @@ -98,7 +98,7 @@ Package: bareos-common
Architecture: any
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser
Depends: openssl, ${shlibs:Depends}, ${misc:Depends}
Conflicts: bacula-director-common, bacula-common
Conflicts: bacula-director-common, bacula-common
Description: Backup Archiving Recovery Open Sourced - common files
Bareos is a set of programs to manage backup, recovery and verification of
data across a network of computers of different kinds.
Expand All @@ -109,7 +109,7 @@ Description: Backup Archiving Recovery Open Sourced - common files
Package: bareos-database-common
Architecture: any
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0
Depends: bareos-database-postgresql (= ${binary:Version}) | bareos-database-mysql (= ${binary:Version}) | bareos-database-sqlite3 (= ${binary:Version}), bareos-common (= ${binary:Version}), dbconfig-common, lsb-base (>= 3.2-13), ${shlibs:Depends}, ${misc:Depends}
Depends: bareos-common (= ${binary:Version}), dbconfig-common, lsb-base (>= 3.2-13), ${shlibs:Depends}, ${misc:Depends}
Description: Backup Archiving Recovery Open Sourced - common catalog files
Bareos is a set of programs to manage backup, recovery and verification of
data across a network of computers of different kinds.
Expand Down Expand Up @@ -159,7 +159,7 @@ Description: Backup Archiving Recovery Open Sourced - SQLite backend
Package: bareos-database-tools
Architecture: any
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0
Depends: bareos-common (= ${binary:Version}), bareos-database-common (= ${binary:Version}), lsb-base (>= 3.2-13), ${shlibs:Depends}, ${misc:Depends}
Depends: bareos-common (= ${binary:Version}), bareos-database-postgresql (= ${binary:Version}) | bareos-database-mysql (= ${binary:Version}) | bareos-database-sqlite3 (= ${binary:Version}), lsb-base (>= 3.2-13), ${shlibs:Depends}, ${misc:Depends}
Conflicts: bacula-sd-mysql, bacula-sd-pgsql, bacula-sd-sqlite3
Description: Backup Archiving Recovery Open Sourced - database tools
Bareos is a set of programs to manage backup, recovery and verification of
Expand Down Expand Up @@ -197,7 +197,7 @@ Description: Backup Archiving Recovery Open Sourced - development files
Package: bareos-director
Architecture: any
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser
Depends: bareos-common (= ${binary:Version}), bareos-database-common (= ${binary:Version}), bareos-database-tools, lsb-base (>= 3.2-13), lsof, bsd-mailx | mailx, ${shlibs:Depends}, ${misc:Depends}
Depends: bareos-common (= ${binary:Version}), bareos-database-postgresql (= ${binary:Version}) | bareos-database-mysql (= ${binary:Version}) | bareos-database-sqlite3 (= ${binary:Version}), bareos-database-tools, lsb-base (>= 3.2-13), lsof, bsd-mailx | mailx, ${shlibs:Depends}, ${misc:Depends}
Recommends: logrotate
Conflicts: bacula-director
Replaces: bacula-director
Expand Down

0 comments on commit a7d4af5

Please sign in to comment.