[SCM] icecast2/master: Put aside autogenerated files during build, and regenerate most possible of them.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1773ecccea4a265dd4960478e8d67be505f072be
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jun 13 12:12:32 2012 +0200

    Put aside autogenerated files during build, and regenerate most possible of them.

diff --git a/debian/rules b/debian/rules
index 5d8104f..894e5e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,3 +58,47 @@ CDBS_BUILD_DEPENDS += , libxslt1-dev | libxslt-dev, libxml2-dev
 CDBS_BUILD_DEPENDS += , libcurl4-gnutls-dev
 CDBS_BUILD_DEPENDS += , libtheora-dev (>= 0.0.0.alpha7), libspeex-dev
 CDBS_BUILD_DEPENDS += , po-debconf
+
+# Needed for our regenerating autotools
+CDBS_BUILD_DEPENDS += , autoconf-archive
+
+# put aside autogenerated files during build
+# TODO: use DEB_UPSTREAM_CRUFT_MOVE when cdbs 0.4.106 is in stable
+autodirs = . admin conf doc examples src src/avl src/httpp src/log
+autodirs += src/net src/thread src/timing web win32 win32/res
+upstreamtmpstuff = $(patsubst %,%/Makefile.in,$(autodirs))
+upstreamtmpstuff += configure aclocal.m4 depcomp install-sh missing
+upstreamtmpstuff += ltmain.sh
+m4files = libtool ltoptions ltsugar ltversion lt~obsolete
+#upstreamtmpstuff += $(patsubst %,m4/%.m4,$(m4files))
+pre-build:: debian/upstream-stuff
+debian/upstream-stuff: debian/stamp-copyright-check
+	mkdir -p debian/upstream-stuff
+	@for orig in $(upstreamtmpstuff); do \
+		backup="debian/upstream-stuff/$$orig"; \
+		[ ! -e "$$orig" ] || [ -e "$$backup" ] || { \
+			mkdir -p "$$(dirname "$$backup")"; \
+			echo mv "$$orig" "$$backup"; \
+			mv "$$orig" "$$backup"; \
+		}; \
+	done
+clean::
+	@for orig in $(upstreamtmpstuff); do \
+		backup="debian/upstream-stuff/$$orig"; \
+		if [ -e "$$backup" ]; then \
+			if [ -e "$$orig" ]; then \
+				echo "rm -rf" "$$orig"; \
+				rm -rf "$$orig"; \
+			fi; \
+			echo mv "$$backup" "$$orig"; \
+			mv "$$backup" "$$orig"; \
+		fi; \
+	done
+	rm -rf debian/upstream-stuff
+
+# (re)generate most possible autotools files
+DEB_ACLOCAL_ARGS = -Im4 --install --force
+DEB_AUTOMAKE_ARGS = --add-missing --copy --foreign --force
+DEB_MAKE_CLEAN_TARGET = distclean
+clean::
+	rm -f $(patsubst %,m4/%.m4,$(m4files))

-- 
icecast2 packaging