use GnuTLS instead of OpenSSL

bareos · Nov 7, 2014 · dea5e95 · dea5e95
1 parent 56cbfd5
commit dea5e95
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,13 @@
-bareos (14.2.1+20140930git1339225-1) UNRELEASED; urgency=medium
+bareos (14.2.1+20141017gitc6c5b56-1) unstable; urgency=medium
+
+  * Import newer upstream snapshot.
+  * Use GnuTLS instead of OpenSSL to avoid licensing problems.
+  * Don't generate debian/control during build.
+
+ -- Evgeni Golov <evgeni@debian.org>  Sat, 25 Oct 2014 21:32:39 +0200
+
+bareos (14.2.1+20140930git1339225-1) unstable; urgency=medium
 
   * Initial Debian release. (Closes: Bug#762459)
 
- -- Evgeni Golov <evgeni@debian.org>  Thu, 02 Oct 2014 08:47:17 +0200
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 08 Oct 2014 13:21:16 +0200
diff --git a/debian/control b/debian/control
@@ -12,7 +12,8 @@
 Source: bareos
 Section: admin
 Priority: optional
-Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
+Maintainer: Bareos Packaging Team <pkg-bareos-devel@lists.alioth.debian.org>
+Uploaders: Joerg Steffens <joerg.steffens@bareos.com>, Evgeni Golov <evgeni@debian.org>
 Build-Depends: acl-dev,
  autotools-dev,
  bc,
@@ -24,7 +25,7 @@ Build-Depends: acl-dev,
  liblzo2-dev,
  libqt4-dev,
  libreadline-dev,
- libssl-dev,
+ libgnutls28-dev,
  libwrap0-dev,
  libx11-dev,
  libsqlite3-dev, libmysqlclient-dev, libpq-dev,
@@ -45,8 +46,8 @@ Build-Depends: acl-dev,
 #   ucslint, univention-config-dev
 Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
 Standards-Version: 3.9.5
-Vcs-Git: git://github.com/bareos/bareos.git -b master
-Vcs-Browser: https://github.com/bareos/bareos/tree/master
+Vcs-Git: git://github.com/bareos/bareos.git -b bareos-14.2-debian
+Vcs-Browser: https://github.com/bareos/bareos/tree/bareos-14.2-debian
 Homepage: http://www.bareos.org/
 
 

diff --git a/debian/control.in b/debian/control.in
@@ -25,7 +25,7 @@ Build-Depends: acl-dev,
  liblzo2-dev,
  libqt4-dev,
  libreadline-dev,
- libssl-dev,
+ libgnutls28-dev,
  libwrap0-dev,
  libx11-dev,
  libsqlite3-dev, libmysqlclient-dev, libpq-dev,

diff --git a/debian/rules b/debian/rules
@@ -55,7 +55,8 @@ define CONFIGURE_COMMON
   --with-mysql \
   --with-sqlite3 \
   --with-tcp-wrappers \
-  --with-openssl \
+  --without-openssl \
+  --with-gnutls \
   --with-dir-user=$(DIRECTOR_DAEMON_USER) \
   --with-dir-group=$(DAEMON_GROUP) \
   --with-sd-user=$(STORAGE_DAEMON_USER) \

diff --git a/platforms/packaging/bareos.dsc b/platforms/packaging/bareos.dsc
@@ -6,7 +6,7 @@ Version: 14.2.1
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
 Homepage: http://www.bareos.org/
 Standards-Version: 3.9.4
-Build-Depends: acl-dev, autotools-dev, bc, chrpath, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), libacl1-dev, libcap-dev, libfastlz-dev, liblzo2-dev, libqt4-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, zlib1g-dev
+Build-Depends: acl-dev, autotools-dev, bc, chrpath, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), libacl1-dev, libcap-dev, libgnutls-dev, liblzo2-dev, libqt4-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, zlib1g-dev
 Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
 DEBTRANSFORM-RELEASE: 1
 Files: