diff --git a/.travis.yml b/.travis.yml index 27a0bb6713d..d216f7a2abf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: before_install: - sudo apt-get update -qq - - sudo apt-get install -qq zlib1g-dev libreadline-dev libsqlite3-dev libmysqlclient-dev libpq-dev postgresql-server-dev-9.1 libwrap0-dev python-dev libgtk2.0-dev libgnome2-dev libacl1-dev libgnomeui-dev libx11-dev mtx bc libxt-dev libqt4-dev acl-dev libcap-dev libssl-dev liblzo2-dev ncurses-dev + - sudo apt-get install -qq acl-dev autotools-dev bc debhelper dpkg-dev hostname libacl1-dev libcap-dev liblzo2-dev libqt4-dev libreadline-dev libssl-dev libwrap0-dev libx11-dev libsqlite3-dev libmysqlclient-dev libpq-dev lsb-release mtx ncurses-dev pkg-config po-debconf python-dev zlib1g-dev before_script: - for script in $PWD/debian/*.preinst; do echo "$script"; sudo /bin/sh $script install; done diff --git a/debian/control b/debian/control index 65175bc0b55..a5bcf9a0879 100644 --- a/debian/control +++ b/debian/control @@ -6,9 +6,9 @@ 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, 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, + libwrap0-dev, python-dev, + libacl1-dev, libkrb5-dev, + libx11-dev, mtx, dpkg-dev (>= 1.13.19), libqt4-dev, acl-dev, bc, hostname, @@ -16,6 +16,7 @@ Build-Depends: autotools-dev, debhelper (>= 7.0.50~), libssl-dev, liblzo2-dev, lsb-release, + pkg-config, ncurses-dev # removed to be compliant with Ubuntu: # libsqlite0-dev, diff --git a/platforms/deb/bareos-Debian_6.0.dsc b/platforms/deb/bareos-Debian_6.0.dsc index fe7a51863dd..93b00e1e4b7 100644 --- a/platforms/deb/bareos-Debian_6.0.dsc +++ b/platforms/deb/bareos-Debian_6.0.dsc @@ -6,6 +6,6 @@ Version: 12.4.1 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, 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, lsb-release, 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), 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-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 index 8d0412abae6..14409a609c6 100644 --- a/platforms/deb/bareos-xUbuntu_12.04.dsc +++ b/platforms/deb/bareos-xUbuntu_12.04.dsc @@ -6,7 +6,7 @@ Version: 12.4.1 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, lsb-release, ncurses-dev +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-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools Files: