[SCM] libshout/master: Change patch 1001 to apply to master autotools files (not autogenerated ones).

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dc46a09b6ae13df444d0c247ca93632b7d405539
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 25 17:26:03 2012 +0200

    Change patch 1001 to apply to master autotools files (not autogenerated ones).

diff --git a/debian/patches/1001_upstream_is_not_debian.patch b/debian/patches/1001_upstream_is_not_debian.patch
index 7cb6207..dcbd9f1 100644
--- a/debian/patches/1001_upstream_is_not_debian.patch
+++ b/debian/patches/1001_upstream_is_not_debian.patch
@@ -1,32 +1,22 @@
-diff -ruN libshout/configure.orig libshout/configure
---- libshout/configure.orig	2006-01-03 20:19:11.000000000 +0100
-+++ libshout/configure	2006-05-04 22:28:59.000000000 +0200
-@@ -25819,7 +25819,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -210,7 +210,7 @@
+ AC_SUBST(XIPH_CFLAGS)
+ AC_SUBST(XIPH_CPPFLAGS)
  
- 
- 
--                                                                                                                                                                ac_config_files="$ac_config_files Makefile debian/Makefile include/Makefile include/shout/Makefile include/shout/shout.h src/Makefile src/net/Makefile src/timing/Makefile src/thread/Makefile src/avl/Makefile src/httpp/Makefile doc/Makefile examples/Makefile win32/Makefile shout-config shout.pc"
-+                                                                                                                                                                ac_config_files="$ac_config_files Makefile include/Makefile include/shout/Makefile include/shout/shout.h src/Makefile src/net/Makefile src/timing/Makefile src/thread/Makefile src/avl/Makefile src/httpp/Makefile doc/Makefile examples/Makefile win32/Makefile shout-config shout.pc"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -26412,7 +26412,6 @@
-   case "$ac_config_target" in
-   # Handling of arguments.
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--  "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
-   "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-   "include/shout/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/shout/Makefile" ;;
-   "include/shout/shout.h" ) CONFIG_FILES="$CONFIG_FILES include/shout/shout.h" ;;
-diff -ruN libshout/Makefile.in.orig libshout/Makefile.in
---- libshout/Makefile.in.orig	2006-01-03 20:19:09.000000000 +0100
-+++ libshout/Makefile.in	2006-05-04 22:28:31.000000000 +0200
-@@ -246,7 +246,7 @@
- target_alias = @target_alias@
+-AC_OUTPUT([Makefile debian/Makefile include/Makefile include/shout/Makefile
++AC_OUTPUT([Makefile include/Makefile include/shout/Makefile
+   include/shout/shout.h src/Makefile src/net/Makefile src/timing/Makefile
+   src/thread/Makefile src/avl/Makefile src/httpp/Makefile doc/Makefile
+   examples/Makefile win32/Makefile shout.pc])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@
  AUTOMAKE_OPTIONS = 1.6 foreign
  ACLOCAL_AMFLAGS = -I m4
+ 
 -SUBDIRS = include src examples debian doc win32
 +SUBDIRS = include src examples doc win32
- EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \
+ 
+ EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \
  	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
- 	m4/xiph_types.m4

-- 
libshout packaging