[Pkg-gnutls-commits] r1294 - in /packages/gnutls26/trunk/debian: changelog control

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Oct 23 16:27:08 2011
New Revision: 1294

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1294
Log:
Simplify dependencies:
+ libgnutls-dev Provides/Conflicts/Replaces gnutls-dev (which is
  also provided by gnutls26' libgnutls-dev).
+ Drop *ancient* Conflicts/Replaces against libgnutls5-dev, gnutls0.4-dev,
  gnutls-dev (<< 0.4.0-0), libgnutls11-dev.

Modified:
    packages/gnutls26/trunk/debian/changelog
    packages/gnutls26/trunk/debian/control

Modified: packages/gnutls26/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/changelog?rev=1294&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/changelog (original)
+++ packages/gnutls26/trunk/debian/changelog Sun Oct 23 16:27:08 2011
@@ -1,6 +1,11 @@
 gnutls26 (2.12.12-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Simplify dependencies:
+    + libgnutls-dev Provides/Conflicts/Replaces gnutls-dev (which is
+      also provided by gnutls26' libgnutls-dev).
+    + Drop *ancient* Conflicts/Replaces against libgnutls5-dev, gnutls0.4-dev,
+      gnutls-dev (<< 0.4.0-0), libgnutls11-dev.
 
  -- Andreas Metzler <ametzler at debian.org>  Sun, 23 Oct 2011 18:24:01 +0200
 

Modified: packages/gnutls26/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/control?rev=1294&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/control (original)
+++ packages/gnutls26/trunk/debian/control Sun Oct 23 16:27:08 2011
@@ -25,8 +25,8 @@
  libgcrypt11-dev (>= 1.4.0), libc6-dev | libc-dev, zlib1g-dev,
  libtasn1-3-dev (>= 0.3.4), libp11-kit-dev (>= 0.4), ${misc:Depends}
 Suggests: gnutls-doc, gnutls-bin, guile-gnutls
-Conflicts: libgnutls11-dev, gnutls-dev (<< 0.4.0-0), gnutls0.4-dev
-Replaces: libgnutls11-dev, gnutls-dev (<< 0.4.0-0), gnutls0.4-dev
+Conflicts: gnutls-dev
+Replaces: gnutls-dev
 Description: GNU TLS library - development files
  GnuTLS is a portable library which implements the Transport Layer
  Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
@@ -98,8 +98,6 @@
 Architecture: any
 Section: net
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libgnutls5-dev, gnutls0.4-dev, gnutls-dev (<< 0.4.0-0)
-Replaces: libgnutls5-dev, gnutls0.4-dev, gnutls-dev (<< 0.4.0-0)
 Multi-Arch: foreign
 Description: GNU TLS library - commandline utilities
  GnuTLS is a portable library which implements the Transport Layer