Source: gnutls28
Severity: normal
Tags: patch

Dear Maintainer,

Following recent gnutls28 transition thread on debian-devel, here is a
patch to implement transition from gnutls26 to gnutls28 source and
binary packages, whilst at the same time enforcing strict GPLv2+
compatibility of the resultant binary packages.

Please consider applying below patch or tweaking it, as you see more
appropriate.

>From d7cc17948d259512a58c6c0804940beec556e306 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <[email protected]>
Date: Mon, 5 May 2014 19:35:39 +0100
Subject: [PATCH] Build main GnuTLS library from gnutls28 source package,
 takeover libgnutls-dev package from gnutls26 source package and make
 libgnutls28-dev a transitional package for libgnutls-dev. Set build conflicts
 and dependencies in relation to GMP to strictly enforce GPLv2 compatible
 binaries licensing.

---
 debian/changelog |  8 ++++++++
 debian/control   | 18 ++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8091577..2cf0f5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
 gnutls28 (3.2.13-3) UNRELEASED; urgency=medium
 
+  [ Andreas Metzler ]
   * Do not build-depend on guile-2.0 on m68k. Closes: #745461
 
+  [ Dimitri John Ledkov ]
+  * Build main GnuTLS library from gnutls28 source package, takeover
+    libgnutls-dev package from gnutls26 source package and make
+    libgnutls28-dev a transitional package for libgnutls-dev. Set build
+    conflicts and dependencies in relation to GMP to strictly enforce
+    GPLv2 compatible binaries licensing.
+
  -- Andreas Metzler <[email protected]>  Tue, 22 Apr 2014 19:01:01 +0200
 
 gnutls28 (3.2.13-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 8476cb0..4338db7 100644
--- a/debian/control
+++ b/debian/control
@@ -11,13 +11,13 @@ Build-Depends: debhelper (>= 9), nettle-dev (>= 2.7), zlib1g-dev,
  libp11-kit-dev (>= 0.20), pkg-config, chrpath, libidn11-dev,
  autogen (>= 1:5.16-0), bison, dh-autoreconf
 Build-Depends-Indep: gtk-doc-tools, texinfo (>= 4.8)
-Build-Conflicts: libgnutls-dev
+Build-Conflicts: libgnutls-dev (<< 3.2), libgmp-dev (<< 2:6)
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-gnutls/gnutls.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-gnutls/gnutls.git
 Homepage: http://www.gnutls.org/
 
-Package: libgnutls28-dev
+Package: libgnutls-dev
 Section: libdevel
 Architecture: any
 Provides: gnutls-dev, libgnutls-openssl-dev
@@ -28,7 +28,8 @@ Depends: libgnutls28 (= ${binary:Version}),
  libgnutls-openssl27 (= ${binary:Version}),
 Suggests: gnutls-doc, gnutls-bin, guile-gnutls
 Conflicts: gnutls-dev
-Replaces: gnutls-dev
+Replaces: gnutls-dev, libgnutls28-dev (<< 3.2.13-3~)
+Breaks: libnutls28-dev (<< 3.2.13-3~)
 Multi-Arch: same
 Description: GNU TLS library - development files
  GnuTLS is a portable library which implements the Transport Layer
@@ -49,10 +50,19 @@ Description: GNU TLS library - development files
  .
  This package contains the GnuTLS development files.
 
+Package: libgnutls28-dev
+Priority: standard
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgnutls-dev (>> 3.2.13-3~)
+Description: transitional dummy package for libgnutls-dev
+ This is a transitional dummy package from libgnutls28-dev to
+ libgnutls-dev. It can safely be removed.
+
 Package: libgnutls28
 Priority: standard
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgmp10 (>> 2:6)
 Replaces: gnutls0, gnutls3, gnutls0.4
 Conflicts: gnutls0, gnutls0.4
 Pre-Depends: ${misc:Pre-Depends}
-- 
2.0.0.rc0

Regards,

Dimitri.

Reply via email to