[SCM] rtmpdump packaging branch, master, updated. debian/2.3-1-3-g057f6d1

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

The following commit has been merged in the master branch:
commit 494442000cb90196d3977a776bef515b7c570eec
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Thu Jul 8 12:58:15 2010 +0200

    Revert "Link the frontends against the shared library."
    
    This reverts commit dc4494b88db0f1b82f981dfdc7b12f1cc1616d7f.
    
    Upstream has provided a more reasonable patch in their SVN.

diff --git a/debian/patches/03_dynamic-frontend.patch b/debian/patches/03_dynamic-frontend.patch
deleted file mode 100644
index a929022..0000000
--- a/debian/patches/03_dynamic-frontend.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- rtmpdump.orig/Makefile
-+++ rtmpdump/Makefile
-@@ -71,17 +71,21 @@ $(LIBRTMP): FORCE
- # note: $^ is GNU Make's equivalent to BSD $>
- # we use both since either make will ignore the one it doesn't recognize
- 
--rtmpdump: rtmpdump.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS)
-+rtmpdump: $(LIBRTMP)
-+rtmpdump: rtmpdump.o
-+	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS) -L librtmp -lrtmp
- 
--rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
-+rtmpsrv: $(LIBRTMP)
-+rtmpsrv: rtmpsrv.o thread.o
-+	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) -L librtmp -lrtmp
- 
--rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
-+rtmpsuck: $(LIBRTMP)
-+rtmpsuck: rtmpsuck.o thread.o
-+	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) -L librtmp -lrtmp
- 
--rtmpgw: rtmpgw.o thread.o $(LIBRTMP)
--	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
-+rtmpgw: $(LIBRTMP)
-+rtmpgw: rtmpgw.o thread.o
-+	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) -L librtmp -lrtmp
- 
- rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile
- rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile
diff --git a/debian/patches/series b/debian/patches/series
index a07fefb..984f470 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_unbreak_makefile.diff
 02_strtime-visibility.patch
-03_dynamic-frontend.patch

-- 
rtmpdump packaging