[SCM] scenic/master: Regenerate autoconf files. Adapt patch 2001 to apply to real source (not automade file).

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fb9f6c0b0bdba9a54f5686b15e6a40156fe44c0c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 4 11:25:58 2012 +0100

    Regenerate autoconf files. Adapt patch 2001 to apply to real source (not automade file).

diff --git a/debian/control.in b/debian/control.in
index f005ee6..78aa314 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,7 +7,6 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Alexandre Quessy <alexandre at quessy.net>,
  Jonas Smedegaard <dr at jones.dk>
 Build-Depends: @cdbs@,
- automake,
  bison,
  doxygen,
  ffmpeg,
diff --git a/debian/patches/2001_disable_python-dependent_manpages.patch b/debian/patches/2001_disable_python-dependent_manpages.patch
index 687a26b..2eb992f 100644
--- a/debian/patches/2001_disable_python-dependent_manpages.patch
+++ b/debian/patches/2001_disable_python-dependent_manpages.patch
@@ -5,9 +5,9 @@ Author: Jonas Smedegaard <dr at jones.dk>
 Forwarded: not-needed
 Last-Update: 2010-07-23
 
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -549,11 +549,11 @@
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -12,11 +12,11 @@
  milhouse.1: $(top_srcdir)/src/main/milhouse.cpp $(top_srcdir)/src/util/programOptions.cpp $(common_mandeps) $(top_srcdir)/man/milhouse-man.txt
  	$(HELP2MAN) --include=$(top_srcdir)/man/milhouse-man.txt --name="Streams audio and video with GStreamer over RTP" --no-info $(top_builddir)/src/main/milhouse -o $@
  
diff --git a/debian/rules b/debian/rules
index 8af9d9c..a39c2cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,15 @@
 #!/usr/bin/make -f
 
+DEB_AUTO_UPDATE_LIBTOOL = pre
+DEB_AUTO_UPDATE_ACLOCAL = 1.11
+DEB_AUTO_UPDATE_AUTOCONF = 2.68
+DEB_AUTO_UPDATE_AUTOHEADER = 2.68
+DEB_AUTO_UPDATE_AUTOMAKE = 1.11
 DEB_BUILDDIR = build
 DEB_PYTHON_SYSTEM = pysupport
 DEB_PYTHON_MODULE_PACKAGES = scenic midistream
 -include /usr/share/cdbs/1/rules/upstream-tarball.mk
+include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/python-autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
@@ -13,6 +19,27 @@ CDBS_BUILD_DEPENDS_rules_upstream-tarball =
 DEB_UPSTREAM_URL = http://scenic.sat.qc.ca/download
 DEB_UPSTREAM_TARBALL_MD5 = cdf958fb98375846bb742433b23fbd3b
 
+# Put aside autogenerated files during build, and regenerate (most of it)
+CDBS_BUILD_DEPENDS += , autoconf-archive
+DEB_UPSTREAM_CRUFT_MOVE = Makefile.in $(patsubst %,%/Makefile.in,data doc man py src utils)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,data/%/Makefile.in,glade pixmaps themes/Darklooks themes)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,doc/%/Makefile.in,docbook docbook/en docbook/fr)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,doc/docbook/en/%/Makefile.in,fig installation user)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,doc/docbook/fr/%/Makefile.in,fig installation user)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,py/%/Makefile.in,doc rtpmidi scenic scenic/devices scenic/test scripts)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,py/rtpmidi/%/Makefile.in,engines engines/midi protocols protocols/rtp)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,src/%/Makefile.in,caps firereset gst gtk_utils include)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,src/%/Makefile.in,main main/test shared_video util)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,src/%/Makefile.in,vumeter vumeter/test)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,utils/%/Makefile.in,dc-ctl jack-info)
+DEB_UPSTREAM_CRUFT_MOVE += aclocal.m4 build-aux/ltmain.sh configure src/config.h.in
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,m4/%.m4,ax_pthread libtool ltoptions ltversion lt~obsolete)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,m4/ax_boost_%.m4,asio base date_time filesystem program_options system thread)
+DEB_ACLOCAL_ARGS = -Im4 --install
+# remove generated stuff not included upstream
+clean::
+	rm -f m4/gnome-doc-utils.m4 m4/gtk-2.0.m4 m4/pkg.m4
+
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-mt
 
 DEB_MAKE_CHECK_TARGET = check 

-- 
scenic packaging