[Pkg-gnutls-commits] r673 - in /packages/gnutls26/branches/branch2.5.x/debian: ./ patches/

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Feb 15 16:48:13 2009
New Revision: 673

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=673
Log:
Merge from trunk, part IIa

Removed:
    packages/gnutls26/branches/branch2.5.x/debian/patches/20_GNUTLS-SA-2008-3.patch
    packages/gnutls26/branches/branch2.5.x/debian/patches/21_GNUTLS-SA-2008-3.fix.patch
    packages/gnutls26/branches/branch2.5.x/debian/patches/22_deprecate_md2_md5_x509_validation.diff
    packages/gnutls26/branches/branch2.5.x/debian/patches/22_whitespace.patch
    packages/gnutls26/branches/branch2.5.x/debian/patches/23_permit_v1_CA.diff
    packages/gnutls26/branches/branch2.5.x/debian/patches/24_intermedcert.patch
    packages/gnutls26/branches/branch2.5.x/debian/patches/25_bufferoverrun.patch
Modified:
    packages/gnutls26/branches/branch2.5.x/debian/changelog

Modified: packages/gnutls26/branches/branch2.5.x/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.5.x/debian/changelog?rev=673&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.5.x/debian/changelog (original)
+++ packages/gnutls26/branches/branch2.5.x/debian/changelog Sun Feb 15 16:48:13 2009
@@ -1,6 +1,7 @@
 gnutls26 (2.6.4-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Merge from 2.4.x
 
  -- Andreas Metzler <ametzler at debian.org>  Sat, 07 Feb 2009 15:24:28 +0100