[SCM] ices2/master: Add patch 1003 to avoid automake'ing stripped Makefile in debian subdir.

js at users.alioth.debian.org js at users.alioth.debian.org
Sat Jan 1 21:26:21 UTC 2011


The following commit has been merged in the master branch:
commit 8def445fb18fcef6030b7467569d1321a6e51330
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jan 1 21:19:09 2011 +0100

    Add patch 1003 to avoid automake'ing stripped Makefile in debian subdir.

diff --git a/debian/patches/1003_no_Makefile_in_debian_subdir.patch b/debian/patches/1003_no_Makefile_in_debian_subdir.patch
new file mode 100644
index 0000000..8e09e72
--- /dev/null
+++ b/debian/patches/1003_no_Makefile_in_debian_subdir.patch
@@ -0,0 +1,22 @@
+Description: Avoid automake'ing stripped Makefile in debian subdir
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@
+ AUTOMAKE_OPTIONS = foreign 1.6 dist-bzip2
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = debian src conf doc
++SUBDIRS = src conf doc
+ 
+ EXTRA_DIST = README AUTHORS COPYING TODO m4/shout.m4 m4/vorbis.m4 m4/ogg.m4 m4/xiph_compiler.m4 m4/xiph_xml2.m4
+ 
+--- a/configure.in
++++ b/configure.in
+@@ -140,7 +140,6 @@
+   Makefile
+   conf/Makefile 
+   doc/Makefile 
+-  debian/Makefile
+   src/Makefile 
+    src/log/Makefile 
+    src/timing/Makefile
diff --git a/debian/patches/series b/debian/patches/series
index 5c16dfd..836ba75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001_sync_20090819.patch
 1001_allow_repeat.patch
 1002_fix_OSS-ALSA_confusion_in_comments.patch
+1003_no_Makefile_in_debian_subdir.patch

-- 
ices2 packaging



More information about the pkg-multimedia-commits mailing list