[Pkg-gnutls-commits] r1695 - in /packages/libgcrypt11/branches/branch1.5: ./ debian/changelog debian/control

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Feb 24 08:05:34 2013
New Revision: 1695

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1695
Log:
merge trunk to branch1.5

Modified:
    packages/libgcrypt11/branches/branch1.5/   (props changed)
    packages/libgcrypt11/branches/branch1.5/debian/changelog
    packages/libgcrypt11/branches/branch1.5/debian/control

Propchange: packages/libgcrypt11/branches/branch1.5/
------------------------------------------------------------------------------
    svn:mergeinfo = /packages/libgcrypt11/trunk:1235-1245

Modified: packages/libgcrypt11/branches/branch1.5/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.5/debian/changelog?rev=1695&op=diff
==============================================================================
--- packages/libgcrypt11/branches/branch1.5/debian/changelog (original)
+++ packages/libgcrypt11/branches/branch1.5/debian/changelog Sun Feb 24 08:05:34 2013
@@ -1,8 +1,19 @@
-libgcrypt11 (1.5.0-3) UNRELEASED; urgency=low
+libgcrypt11 (1.5.0-4) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
- -- Andreas Metzler <ametzler at debian.org>  Fri, 19 Aug 2011 13:29:41 +0200
+ -- Andreas Metzler <ametzler at debian.org>  Thu, 01 Sep 2011 19:19:49 +0200
+
+libgcrypt11 (1.5.0-3) unstable; urgency=low
+
+  * Upload to unstable.
+  * Drop 20_workaroundarmgcc.diff (1.4.6/unstable). It seems to be unnecessary
+    with 1.5.0.
+  * libgcrypt11 Breaks gnupg2|gpgsm (<< 2.0.17-2ubuntu2) and libgnutls26 (<<
+    2.12.7-3). See https://bugs.launchpad.net/bugs/815190 and
+    https://lists.gnu.org/archive/html/gnutls-devel/2011-07/msg00001.html
+
+ -- Andreas Metzler <ametzler at debian.org>  Thu, 01 Sep 2011 18:53:49 +0200
 
 libgcrypt11 (1.5.0-2) experimental; urgency=low
 
@@ -30,6 +41,20 @@
     seem to set it by default.
 
  -- Andreas Metzler <ametzler at debian.org>  Sat, 26 Feb 2011 19:34:14 +0100
+
+libgcrypt11 (1.4.6-9) unstable; urgency=low
+
+  * Also enable the gcc bug 633458 workaround on sparc.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 07 Aug 2011 16:56:56 +0200
+
+libgcrypt11 (1.4.6-8) unstable; urgency=medium
+
+  * [20_workaroundarmgcc.diff] Set __attribute__((noinline)) on
+    do_decrypt_aligned() if DEB_BUILD_ARCH=arm. This works around gcc bug
+    633458.
+
+ -- Andreas Metzler <ametzler at debian.org>  Wed, 27 Jul 2011 19:09:35 +0200
 
 libgcrypt11 (1.4.6-7) unstable; urgency=low
 

Modified: packages/libgcrypt11/branches/branch1.5/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.5/debian/control?rev=1695&op=diff
==============================================================================
--- packages/libgcrypt11/branches/branch1.5/debian/control (original)
+++ packages/libgcrypt11/branches/branch1.5/debian/control Sun Feb 24 08:05:34 2013
@@ -68,6 +68,8 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: rng-tools
 Pre-Depends: ${misc:Pre-Depends}
+Breaks: gnupg2 (<< 2.0.17-2ubuntu2), gpgsm (<< 2.0.17-2ubuntu2),
+ libgnutls26 (<< 2.12.7-3)
 Multi-Arch: same
 Description: LGPL Crypto library - runtime library
  libgcrypt contains cryptographic functions.  Many important free
@@ -78,7 +80,6 @@
  Whirlpool, DSA, DSA2, ElGamal, RSA, ECC.
 
 Package: libgcrypt11-udeb
-Priority: optional
 Section: debian-installer
 Package-Type: udeb
 Architecture: any