[SCM] icecast2/master: Unfuzz patch 1001, and add DEP3 header.

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Jun 13 00:24:41 UTC 2012


The following commit has been merged in the master branch:
commit f1240093dc4beec549608112535bdd5b3ed36950
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jun 13 01:11:15 2012 +0200

    Unfuzz patch 1001, and add DEP3 header.

diff --git a/debian/patches/1001_autotools_avoid_debian-subdir.patch b/debian/patches/1001_autotools_avoid_debian-subdir.patch
index 5419869..29a3625 100644
--- a/debian/patches/1001_autotools_avoid_debian-subdir.patch
+++ b/debian/patches/1001_autotools_avoid_debian-subdir.patch
@@ -1,7 +1,9 @@
-Index: icecast2-2.3.2/Makefile.am
-===================================================================
---- icecast2-2.3.2.orig/Makefile.am	2007-11-20 03:38:17.000000000 +0100
-+++ icecast2-2.3.2/Makefile.am	2009-07-31 03:01:27.000000000 +0200
+Description: Avoid autotools messing with debian subdir
+Author: Jonas Smedegaard <dr at jones.dk>
+Last-Update: 2006-08-19
+
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -3,7 +3,7 @@
  AUTOMAKE_OPTIONS = foreign dist-zip
  ACLOCAL_AMFLAGS = -I m4
@@ -11,10 +13,8 @@ Index: icecast2-2.3.2/Makefile.am
  
  EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \
      m4/theora.m4 m4/vorbis.m4 m4/speex.m4 \
-Index: icecast2-2.3.2/configure.in
-===================================================================
---- icecast2-2.3.2.orig/configure.in	2008-05-27 02:21:38.000000000 +0200
-+++ icecast2-2.3.2/configure.in	2009-07-31 03:01:27.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -150,7 +150,7 @@
  AC_SUBST(HAVE_KATE)
  AC_SUBST(KATE_LIBS)

-- 
icecast2 packaging



More information about the pkg-multimedia-commits mailing list