[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 ee7a329b14aa0a4d4d6e8483b6b465d00d8f18b9
Author: Adam C Powell IV <hazelsct at debian.org>
Date:   Mon Apr 11 06:46:37 2011 -0400

    Fixes to build system and clean target

diff --git a/debian/changelog b/debian/changelog
index 42a46ed..93ec159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 freecad (0.11.3729.dfsg-1) UNRELEASED; urgency=low
 
-  * New upstream (closes: #622213).
+  [ Denis Barbier ]
   * Merge OpenCASCADE 6.5.0 compatibility patch (closes: #617545).
+
+  [ Adam C. Powell, IV ]
+  * New upstream (closes: #622213).
   * Changed to source format 3.0 (quilt).
+  * Set aside src/Build/Version.h to prevent build problems.
   * Does not install .la files (closes: #621298).
 
- -- "Adam C. Powell, IV" <hazelsct at debian.org>  Mon, 11 Apr 2011 00:01:23 -0400
+ -- "Adam C. Powell, IV" <hazelsct at debian.org>  Mon, 11 Apr 2011 06:46:23 -0400
 
 freecad (0.10.3247.dfsg-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 41e4d05..0ba804f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ patch-stamp:
 	if [ ! -d .pc ]; then \
 	  QUILT_PATCHES=debian/patches quilt push -a; \
 	fi
+	touch $@
 
 configure: autogen.sh patch-stamp
 	dh_testdir
@@ -38,6 +39,7 @@ config.status: configure
 --infodir=/usr/share/info --datadir=/usr/share/freecad \
 --includedir=/usr/include/freecad --docdir=/usr/share/doc/freecad \
 CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+	touch src/Build/Version.h
 
 build: build-stamp
 
@@ -47,7 +49,9 @@ build-stamp: config.status
 	touch $@
 
 clean:
+	mv src/Build/Version.h src/Build/Version.h.old
 	dh clean
+	mv src/Build/Version.h.old src/Build/Version.h
 	rm -f build-stamp
 	find -name '*.pyc' | xargs rm -f
 	find -name 'moc_*.cpp' | xargs rm -f

-- 
FreeCAD packaging