Cleanup

Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>

debian/control

@@ -2,26 +2,31 @@ Source: bareos
 Section: admin
 Priority: optional
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~),
- po-debconf (>= 0.8.2),
- zlib1g-dev, libreadline-dev,
- libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4),
- libwrap0-dev, python-dev,
- libacl1-dev, libkrb5-dev,
- libx11-dev, mtx, dpkg-dev (>= 1.13.19), libqt4-dev,
- acl-dev,
+Build-Depends: acl-dev,
+ autotools-dev,
  bc,
+ debhelper (>= 7.0.50~),
+ dpkg-dev (>= 1.13.19),
  hostname,
+ libacl1-dev,
  libcap-dev,
- libssl-dev,
  liblzo2-dev,
+ libqt4-dev,
+ libreadline-dev,
+ libssl-dev,
+ libwrap0-dev,
+ libx11-dev,
+ libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4),
  lsb-release,
+ mtx,
+ ncurses-dev,
  pkg-config,
- ncurses-dev
+ po-debconf (>= 0.8.2),
+ python-dev,
+ zlib1g-dev
 # removed to be compliant with Ubuntu:
 # libsqlite0-dev,
 # libjconv-dev,
-# postgresql-server-dev-8.4,
 Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
 Standards-Version: 3.8.4
 #Vcs-Git: git://git.debian.org/collab-maint/bareos.git
@@ -163,6 +168,16 @@ Description: Backup Archiving Recovery Open Sourced - tools that require access
  This package provides tools that requires access to the Bareos database.
 
 
+Package: bareos-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends:
+    bareos (= ${binary:Version}),
+    ${misc:Depends}
+Description: Backup Archiving Recovery Open Sourced - debugging symbols
+
+
 Package:        bareos-devel
 Architecture:   any
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
@@ -265,12 +280,3 @@ Description: Backup Archiving Recovery Open Sourced - tray monitor
  GNOME.
  .
  The monitor constantly displays Bareos's status.
-
-Package: bareos-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends:
-    bareos (= ${binary:Version}),
-    ${misc:Depends}
-Description: Backup Archiving Recovery Open Sourced - debugging symbols

platforms/deb/bareos-Debian_6.0.dsc

@@ -1,11 +1,11 @@
 Format: 3.0 (native)
 Source: bareos
-Binary: bareos, bareos-bat, bareos-bconsole, bareos-client, bareos-common, bareos-database-common, bareos-database-postgresql, bareos-database-mysql, bareos-database-sqlite3, bareos-database-tools, bareos-devel, bareos-director, bareos-doc, bareos-filedaemon, bareos-storage, bareos-tools, bareos-traymonitor, bareos-debug
+Binary: bareos, bareos-bat, bareos-bconsole, bareos-client, bareos-common, bareos-database-common, bareos-database-postgresql, bareos-database-mysql, bareos-database-sqlite3, bareos-database-tools, bareos-devel, bareos-director, bareos-doc, bareos-filedaemon, bareos-storage, bareos-tools, bareos-traymonitor
 Architecture: any
 Version: 13.1.0
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
 Homepage: http://www.bareos.org/
 Standards-Version: 3.8.4
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf (>= 0.8.2), hostname, zlib1g-dev, libreadline-dev, libjconv-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), libwrap0-dev, python-dev, libacl1-dev, libx11-dev, mtx, bc, dpkg-dev (>= 1.13.19), libqt4-dev, acl-dev, libcap-dev, libssl-dev, liblzo2-dev, lsb-release, ncurses-dev, pkg-config
+Build-Depends: acl-dev, autotools-dev, bc, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), hostname, libacl1-dev, libcap-dev, liblzo2-dev, libqt4-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), lsb-release, mtx, ncurses-dev, pkg-config, po-debconf (>= 0.8.2), python-dev, zlib1g-dev
 Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
 Files:

platforms/deb/bareos-xUbuntu_12.04.dsc

@@ -1,12 +1,11 @@
 Format: 3.0 (native)
 Source: bareos
-Binary: bareos, bareos-bat, bareos-bconsole, bareos-client, bareos-common, bareos-database-common, bareos-database-postgresql, bareos-database-mysql, bareos-database-sqlite3, bareos-database-tools, bareos-devel, bareos-director, bareos-doc, bareos-filedaemon, bareos-storage, bareos-tools, bareos-traymonitor, bareos-debug
+Binary: bareos, bareos-bat, bareos-bconsole, bareos-client, bareos-common, bareos-database-common, bareos-database-postgresql, bareos-database-mysql, bareos-database-sqlite3, bareos-database-tools, bareos-devel, bareos-director, bareos-doc, bareos-filedaemon, bareos-storage, bareos-tools, bareos-traymonitor
 Architecture: any
 Version: 13.1.0
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
 Homepage: http://www.bareos.org/
 Standards-Version: 3.8.4
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf (>= 0.8.2), hostname, zlib1g-dev, libreadline-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), libwrap0-dev, python-dev, libacl1-dev, libkrb5-dev, libx11-dev, mtx, bc, dpkg-dev (>= 1.13.19), libqt4-dev, acl-dev, libcap-dev, libssl-dev, liblzo2-dev, lsb-release, ncurses-dev, pkg-config
-# libjconv-dev,
+Build-Depends: acl-dev, autotools-dev, bc, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), hostname, libacl1-dev, libcap-dev, liblzo2-dev, libqt4-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), lsb-release, mtx, ncurses-dev, pkg-config, po-debconf (>= 0.8.2), python-dev, zlib1g-dev
 Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
 Files: