[SCM] liblrdf packaging branch, master, updated. debian/0.4.0-1.2-36-g835fab0

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit affdacd3da260fb9d4b9da54ed2ef686292c3079
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Mar 12 06:37:04 2010 +0100

    Isolate patch 1002 renaming clashing md5 symbols.

diff --git a/debian/patches/1002_rename_clashing_md5_symbols.patch b/debian/patches/1002_rename_clashing_md5_symbols.patch
new file mode 100644
index 0000000..be9bbe3
--- /dev/null
+++ b/debian/patches/1002_rename_clashing_md5_symbols.patch
@@ -0,0 +1,20 @@
+diff --git a/src/lrdf_md5.h b/src/lrdf_md5.h
+index b4cb8d7..750b44e 100644
+--- a/src/lrdf_md5.h
++++ b/src/lrdf_md5.h
+@@ -32,6 +32,15 @@
+ #ifndef __MD5_H__
+ #define __MD5_H__
+ 
++/* Change function names to prevent symbol conflicts */
++#define md5_init _lrdf_md5_init
++#define md5_buffer _lrdf_md5_buffer
++#define md5_sig_from_string _lrdf_md5_sig_from_string
++#define md5_finish _lrdf_md5_finish
++#define md5_process _lrdf_md5_process
++#define md5_sig_to_string _lrdf_md5_sig_to_string
++#define md5_get_result _lrdf_md5_get_result
++
+ /*
+  * Size of a standard MD5 signature in bytes.  This definition is for
+  * external programs only.  The MD5 routines themselves reference the
diff --git a/debian/patches/series b/debian/patches/series
index bf7ea65..60f8a72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 1001_disable_libtool_-version-info.patch
+1002_rename_clashing_md5_symbols.patch

-- 
liblrdf packaging