[SCM] FreeCAD packaging branch, master, updated. debian/0.10.3247.dfsg-2-10-g83e9150

[Adam C Powell IV]

The following commit has been merged in the master branch:
commit 83e91500132556c3b31f27a2ed3350f517502957
Author: Adam C Powell IV <hazelsct at debian.org>
Date:   Mon Apr 11 07:40:23 2011 -0400

    Clean target improvements

diff --git a/debian/changelog b/debian/changelog
index b888079..dfbd6c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,10 @@ freecad (0.11.3729.dfsg-1) UNRELEASED; urgency=low
   * Changed to source format 3.0 (quilt).
   * Set aside src/Build/Version.h to prevent build problems.
   * Does not install .la files (closes: #621298).
-  * Boost 1.46 compatibility patch (closes #621877).
+  * Boost 1.46 compatibility patch: (closes: #621877).
+  * Set aside files which autotools modifies so clean works.
 
- -- "Adam C. Powell, IV" <hazelsct at debian.org>  Mon, 11 Apr 2011 06:48:32 -0400
+ -- "Adam C. Powell, IV" <hazelsct at debian.org>  Mon, 11 Apr 2011 07:40:18 -0400
 
 freecad (0.10.3247.dfsg-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 0ba804f..31a93ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,11 @@ patch-stamp:
 
 configure: autogen.sh patch-stamp
 	dh_testdir
+	for autotools_mod_file in `find . -name Makefile.in` aclocal.m4 \
+	    configure m4/libtool.m4 m4/ltmain.sh m4/ltoptions.m4 \
+	    m4/ltversion.m4 m4/lt~obsolete.m4; do \
+	  cp -a $$autotools_mod_file $$autotools_mod_file.setaside; \
+	done
 	chmod u+x autogen.sh
 	./autogen.sh
 
@@ -58,10 +63,16 @@ clean:
 	find -name '*.lo' | xargs rm -f
 	find -name '*.deps' | xargs rm -rf
 	find -name '*.libs' | xargs rm -rf
-	rm -f stamp-h1 config.log libtool
+	rm -f stamp-h1 config.log libtool 71
+	for autotools_mod_file in `find . -name Makefile.in` aclocal.m4 \
+	    configure m4/libtool.m4 m4/ltmain.sh m4/ltoptions.m4 \
+	    m4/ltversion.m4 m4/lt~obsolete.m4; do \
+	  mv -f $$autotools_mod_file.setaside $$autotools_mod_file; \
+	done
 	if [ -d .pc ]; then \
 	  QUILT_PATCHES=debian/patches quilt pop -a && rm -rf .pc; \
 	fi
+	rm -f patch-stamp
 
 install: build install-stamp
 install-stamp:

-- 
FreeCAD packaging