From 9be4aed340ba910c6b9ed1fa637f038ad9f0cffd Mon Sep 17 00:00:00 2001 From: Joerg Steffens Date: Sat, 4 May 2013 11:51:51 +0200 Subject: [PATCH] adapted for ubuntu removed build dependency to libsqlite0-dev, because it is not available on Ubuntu (and not used anyway?) Signed-off-by: Marco van Wieringen --- debian/control | 9 ++++++--- platforms/deb/{bareos.dsc => bareos-Debian_6.0.dsc} | 2 +- platforms/deb/bareos-xUbuntu_12.04.dsc | 12 ++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) rename platforms/deb/{bareos.dsc => bareos-Debian_6.0.dsc} (67%) create mode 100644 platforms/deb/bareos-xUbuntu_12.04.dsc diff --git a/debian/control b/debian/control index 0d6e7f1d247..af8627c776a 100644 --- a/debian/control +++ b/debian/control @@ -4,9 +4,8 @@ Priority: optional Maintainer: Joerg Steffens Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf (>= 0.8.2), - zlib1g-dev, libreadline-dev, libjconv-dev, - libsqlite0-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), - postgresql-server-dev-8.4, + zlib1g-dev, libreadline-dev, + libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10), libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, libxt-dev, dpkg-dev (>= 1.13.19), libqt4-dev, @@ -17,6 +16,10 @@ Build-Depends: autotools-dev, debhelper (>= 7.0.50~), libssl-dev, liblzo2-dev, ncurses-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 diff --git a/platforms/deb/bareos.dsc b/platforms/deb/bareos-Debian_6.0.dsc similarity index 67% rename from platforms/deb/bareos.dsc rename to platforms/deb/bareos-Debian_6.0.dsc index 688d9cc9ecc..5b991ba7da0 100644 --- a/platforms/deb/bareos.dsc +++ b/platforms/deb/bareos-Debian_6.0.dsc @@ -6,6 +6,6 @@ Version: 12.4.0 Maintainer: Joerg Steffens 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, libsqlite0-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), postgresql-server-dev-8.4, libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10), libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc, libxt-dev, dpkg-dev (>= 1.13.19), libqt4-dev, acl-dev, libcap-dev, libssl-dev, liblzo2-dev, ncurses-dev +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), postgresql-server-dev-8.4, libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10), libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc, libxt-dev, dpkg-dev (>= 1.13.19), libqt4-dev, acl-dev, libcap-dev, libssl-dev, liblzo2-dev, ncurses-dev Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools Files: diff --git a/platforms/deb/bareos-xUbuntu_12.04.dsc b/platforms/deb/bareos-xUbuntu_12.04.dsc new file mode 100644 index 00000000000..328428510cb --- /dev/null +++ b/platforms/deb/bareos-xUbuntu_12.04.dsc @@ -0,0 +1,12 @@ +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 +Architecture: any +Version: 12.4.0 +Maintainer: Joerg Steffens +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), postgresql-server-dev-9.1, libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10), libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc, libxt-dev, dpkg-dev (>= 1.13.19), libqt4-dev, acl-dev, libcap-dev, libssl-dev, liblzo2-dev, ncurses-dev +# libjconv-dev, +Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools +Files: