[SCM] rtmpdump packaging branch, master, updated. debian/2.2e-4-7-g2a7d7c5

[slomo at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 11a951afebce5e6449d1620fad197e6a90be9c6a
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon Jul 5 19:55:47 2010 +0200

      + debian/patches/02_strtime-visibility.patch: - Hide the private strtime symbol by making it static to prevent any symbol conflicts.
    
      + debian/patches/02_strtime-visibility.patch:
        - Hide the private strtime symbol by making it static
          to prevent any symbol conflicts.

diff --git a/debian/changelog b/debian/changelog
index 52783e2..d0b00ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,11 @@ rtmpdump (2.3-1) unstable; urgency=low
       - Add shared library package.
     + debian/patches/01_unbreak_makefile.diff:
       - Refreshed and fixed the clean rule too.
+    + debian/patches/02_strtime-visibility.patch:
+      - Hide the private strtime symbol by making it static
+        to prevent any symbol conflicts.
 
- -- Sebastian Dröge <slomo at debian.org>  Mon, 05 Jul 2010 19:52:40 +0200
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 05 Jul 2010 19:55:10 +0200
 
 rtmpdump (2.2e-4) unstable; urgency=low
 
diff --git a/debian/patches/02_strtime-visibility.patch b/debian/patches/02_strtime-visibility.patch
new file mode 100644
index 0000000..e54ab06
--- /dev/null
+++ b/debian/patches/02_strtime-visibility.patch
@@ -0,0 +1,13 @@
+Index: rtmpdump-2.3/librtmp/hashswf.c
+===================================================================
+--- rtmpdump-2.3.orig/librtmp/hashswf.c	2010-07-05 19:54:38.120781678 +0200
++++ rtmpdump-2.3/librtmp/hashswf.c	2010-07-05 19:54:48.908791094 +0200
+@@ -435,7 +435,7 @@
+ /* Convert a Unix time to a network time string
+  * Weekday, DD-MMM-YYYY HH:MM:SS GMT
+  */
+-void
++static void
+ strtime(time_t * t, char *s)
+ {
+   struct tm *tm;
diff --git a/debian/patches/series b/debian/patches/series
index cd7024e..984f470 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_unbreak_makefile.diff
+02_strtime-visibility.patch

-- 
rtmpdump packaging