[Pkg-gnutls-commits] r63 - in /libgcrypt11/trunk/debian: README.source_and_patches changelog patches/ patches/11_gnutls_h_362636.patch rules

[jamesw-guest at users.alioth.debian.org]

Author: jamesw-guest
Date: Thu Jun  8 16:10:42 2006
New Revision: 63

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=63
Log:
Add patch from #362636

Added:
    libgcrypt11/trunk/debian/README.source_and_patches
    libgcrypt11/trunk/debian/patches/
    libgcrypt11/trunk/debian/patches/11_gnutls_h_362636.patch
Modified:
    libgcrypt11/trunk/debian/changelog
    libgcrypt11/trunk/debian/rules

Added: libgcrypt11/trunk/debian/README.source_and_patches
URL: http://svn.debian.org/wsvn/pkg-gnutls/libgcrypt11/trunk/debian/README.source_and_patches?rev=63&op=file
==============================================================================
--- libgcrypt11/trunk/debian/README.source_and_patches (added)
+++ libgcrypt11/trunk/debian/README.source_and_patches Thu Jun  8 16:10:42 2006
@@ -1,0 +1,10 @@
+Uses cdbs with simple-patchsys.mk.
+
+Patches in debian/patches (i.e. *diff *patch) are applied automatically in
+alphanumeric order.
+
+Use
+debian/rules apply-patches
+to see the patched source.
+
+See cdbs-edit-patch for a useful way to make modifications.

Modified: libgcrypt11/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/libgcrypt11/trunk/debian/changelog?rev=63&op=diff
==============================================================================
--- libgcrypt11/trunk/debian/changelog (original)
+++ libgcrypt11/trunk/debian/changelog Thu Jun  8 16:10:42 2006
@@ -11,7 +11,10 @@
   * Drop debian/*.dirs as dh_* will create the necessary directories.
   * Remove code from debian/rules to update config.sub and config.guess as it
     is handled by cdbs. Build-Depends on autotools-dev.
-  * Pass --enable-noexecstack to ./configure (closes: #321720) 
+  * Pass --enable-noexecstack to ./configure (closes: #321720)
+  * Use cdbs' simple-patchsys.mk.
+    - add debian/README.source_and_patches
+    - add debian/patches/11_gcrypt_h_362636 (closes: #362636)
 
  -- James Westby <jw+debian at jameswestby.net>  Thu,  8 Jun 2006 03:17:20 +0100
 

Added: libgcrypt11/trunk/debian/patches/11_gnutls_h_362636.patch
URL: http://svn.debian.org/wsvn/pkg-gnutls/libgcrypt11/trunk/debian/patches/11_gnutls_h_362636.patch?rev=63&op=file
==============================================================================
--- libgcrypt11/trunk/debian/patches/11_gnutls_h_362636.patch (added)
+++ libgcrypt11/trunk/debian/patches/11_gnutls_h_362636.patch Thu Jun  8 16:10:42 2006
@@ -1,0 +1,27 @@
+diff -Nur libgcrypt11-1.2.2/src/gcrypt.h libgcrypt11-1.2.2.new/src/gcrypt.h
+--- libgcrypt11-1.2.2/src/gcrypt.h	2005-10-05 09:44:00.000000000 +0100
++++ libgcrypt11-1.2.2.new/src/gcrypt.h	2006-06-08 16:55:37.000000000 +0100
+@@ -257,7 +257,7 @@
+ static int gcry_pthread_mutex_init (void **priv)			      \
+ {									      \
+   int err = 0;								      \
+-  pthread_mutex_t *lock = malloc (sizeof (pthread_mutex_t));		      \
++  pthread_mutex_t *lock = (pthread_mutex_t*) malloc (sizeof (pthread_mutex_t));		      \
+ 									      \
+   if (!lock)								      \
+     err = ENOMEM;							      \
+@@ -272,11 +272,11 @@
+   return err;								      \
+ }									      \
+ static int gcry_pthread_mutex_destroy (void **lock)			      \
+-  { int err = pthread_mutex_destroy (*lock);  free (*lock); return err; }     \
++  { int err = pthread_mutex_destroy ((pthread_mutex_t*) *lock);  free (*lock); return err; }     \
+ static int gcry_pthread_mutex_lock (void **lock)			      \
+-  { return pthread_mutex_lock (*lock); }				      \
++  { return pthread_mutex_lock ((pthread_mutex_t*) *lock); }				      \
+ static int gcry_pthread_mutex_unlock (void **lock)			      \
+-  { return pthread_mutex_unlock (*lock); }				      \
++  { return pthread_mutex_unlock ((pthread_mutex_t*) *lock); }				      \
+ 									      \
+ static struct gcry_thread_cbs gcry_threads_pthread =			      \
+ { GCRY_THREAD_OPTION_PTHREAD, NULL,					      \

Modified: libgcrypt11/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/libgcrypt11/trunk/debian/rules?rev=63&op=diff
==============================================================================
--- libgcrypt11/trunk/debian/rules (original)
+++ libgcrypt11/trunk/debian/rules Thu Jun  8 16:10:42 2006
@@ -3,6 +3,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-noexecstack
 DEB_DH_STRIP_ARGS = --dbg-package=libgcrypt11