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

Adam C Powell IV hazelsct at debian.org
Mon Apr 11 11:50:25 UTC 2011


The following commit has been merged in the master branch:
commit 17a668d38465dd9203fa1554f8877f2e2f59a0ca
Author: Adam C Powell IV <hazelsct at debian.org>
Date:   Mon Apr 11 07:49:56 2011 -0400

    One more build system fix

diff --git a/debian/changelog b/debian/changelog
index dfbd6c0..17cd21b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ freecad (0.11.3729.dfsg-1) UNRELEASED; urgency=low
   * 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 07:40:18 -0400
+ -- "Adam C. Powell, IV" <hazelsct at debian.org>  Mon, 11 Apr 2011 07:49:49 -0400
 
 freecad (0.10.3247.dfsg-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 31a93ab..92b5d98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,11 +64,12 @@ clean:
 	find -name '*.deps' | xargs rm -rf
 	find -name '*.libs' | xargs rm -rf
 	rm -f stamp-h1 config.log libtool 71
+	if [ -e Makefile.in.setaside ]; then \
 	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
+	done; fi
 	if [ -d .pc ]; then \
 	  QUILT_PATCHES=debian/patches quilt pop -a && rm -rf .pc; \
 	fi

-- 
FreeCAD packaging



More information about the debian-science-commits mailing list