[Pkg-gnutls-commits] r1549 - in /packages/p11-kit/trunk/debian: changelog patches/01_no_duplicate_symbols.patch

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Thu Sep  6 17:27:38 2012
New Revision: 1549

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1549
Log:
0.13-1 uploaded to experimental in july.

Added:
    packages/p11-kit/trunk/debian/patches/01_no_duplicate_symbols.patch
Modified:
    packages/p11-kit/trunk/debian/changelog

Modified: packages/p11-kit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/changelog?rev=1549&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/changelog (original)
+++ packages/p11-kit/trunk/debian/changelog Thu Sep  6 17:27:38 2012
@@ -1,6 +1,5 @@
-p11-kit (0.13-1) UNRELEASED; urgency=low
+p11-kit (0.13-1) experimental; urgency=low
 
-  * NOT RELEASED YET
   * New upstream version.
     + Drop patches previously pulled from upstream (10_broken-hashmap-behavior
       11_crash-when-duplicate).
@@ -9,7 +8,7 @@
   * Pulled from upstream: 01_no_duplicate_symbols.patch, fixing a build error
     with clang.
 
- -- Andreas Metzler <ametzler at debian.org>  Tue, 17 Apr 2012 19:31:57 +0200
+ -- Andreas Metzler <ametzler at debian.org>  Tue, 17 Jul 2012 14:15:39 +0200
 
 p11-kit (0.12-3) unstable; urgency=low
 

Added: packages/p11-kit/trunk/debian/patches/01_no_duplicate_symbols.patch
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/patches/01_no_duplicate_symbols.patch?rev=1549&op=file
==============================================================================
--- packages/p11-kit/trunk/debian/patches/01_no_duplicate_symbols.patch (added)
+++ packages/p11-kit/trunk/debian/patches/01_no_duplicate_symbols.patch Thu Sep  6 17:27:38 2012
@@ -1,0 +1,26 @@
+From 4a6a685c03bd92566c1656f1af3662ca7deecefa Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw at gnome.org>
+Date: Mon, 16 Jul 2012 18:58:34 +0200
+Subject: [PATCH 1/3] Don't define duplicate symbols
+
+ * clang was giving a build failure here.
+---
+ tests/mock-module.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/mock-module.h b/tests/mock-module.h
+index 21fa17a..9557f70 100644
+--- a/tests/mock-module.h
++++ b/tests/mock-module.h
+@@ -26,7 +26,7 @@
+ 
+ #include "pkcs11.h"
+ 
+-CK_FUNCTION_LIST    mock_module_no_slots;
++extern CK_FUNCTION_LIST    mock_module_no_slots;
+ 
+ void        mock_module_init                              (void);
+ 
+-- 
+1.7.10.4
+