[SCM] rtmpdump/master: Drop 02_strtime-visibility.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Aug 17 09:51:17 UTC 2011


The following commit has been merged in the master branch:
commit a54b61ab9cd9cecbbb21bcad1cd34cd7748036ec
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Aug 17 11:47:38 2011 +0200

    Drop 02_strtime-visibility.patch, applied upstream.

diff --git a/debian/patches/02_strtime-visibility.patch b/debian/patches/02_strtime-visibility.patch
deleted file mode 100644
index e54ab06..0000000
--- a/debian/patches/02_strtime-visibility.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 2fe0d7a..d166153 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_unbreak_makefile.diff
-02_strtime-visibility.patch
 03-Dont-link-explicitly-against-static-library.patch

-- 
rtmpdump packaging



More information about the pkg-multimedia-commits mailing list