[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 4b9fa862918b4366f2644e4df0c0b9a2c46e04fe
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon Jul 5 19:53:04 2010 +0200

      + debian/patches/01_unbreak_makefile.diff: - Refreshed and fixed the clean rule too.
    
      + debian/patches/01_unbreak_makefile.diff:
        - Refreshed and fixed the clean rule too.

diff --git a/debian/changelog b/debian/changelog
index 299455f..52783e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ rtmpdump (2.3-1) unstable; urgency=low
       debian/librtmp-dev.install,
       debian/rules:
       - Add shared library package.
+    + debian/patches/01_unbreak_makefile.diff:
+      - Refreshed and fixed the clean rule too.
 
- -- Sebastian Dröge <slomo at debian.org>  Mon, 05 Jul 2010 19:48:19 +0200
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 05 Jul 2010 19:52:40 +0200
 
 rtmpdump (2.2e-4) unstable; urgency=low
 
diff --git a/debian/patches/01_unbreak_makefile.diff b/debian/patches/01_unbreak_makefile.diff
index 2ae0fcb..9426970 100644
--- a/debian/patches/01_unbreak_makefile.diff
+++ b/debian/patches/01_unbreak_makefile.diff
@@ -19,14 +19,21 @@ Upstream objects to this:
                  5.7.3
 
 
-diff --git a/Makefile b/Makefile
-index 3618dcc..9984ced 100644
---- a/Makefile
-+++ b/Makefile
-@@ -57,7 +57,7 @@ install:	progs
+Index: rtmpdump-2.3/Makefile
+===================================================================
+--- rtmpdump-2.3.orig/Makefile	2010-06-30 21:58:35.000000000 +0200
++++ rtmpdump-2.3/Makefile	2010-07-05 19:52:07.272780868 +0200
+@@ -57,11 +57,11 @@
  	cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
  	cp rtmpdump.1 $(MANDIR)/man1
  	cp rtmpgw.8 $(MANDIR)/man8
--	@cd librtmp; $(MAKE) install $(MAKEFLAGS)
+-	@cd librtmp; $(MAKE) install
 +	$(MAKE) -C librtmp install
  
+ clean:
+ 	rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
+-	@cd librtmp; $(MAKE) clean
++	$(MAKE) -C librtmp clean
+ 
+ FORCE:
+ 

-- 
rtmpdump packaging