[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 0f12092dbdd953da80d883f3489e9c111b899986
Author: Adam C Powell IV <hazelsct at debian.org>
Date:   Sun Apr 10 23:59:44 2011 -0400

    More changes to support the OpenCASCADE 6.5.0 patch.

diff --git a/debian/changelog b/debian/changelog
index 653319b..b5f3714 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ freecad (0.11.3729.dfsg-1) UNRELEASED; urgency=low
   * Merge OpenCASCADE 6.5.0 compatibility patch (closes: #617545).
   * Does not install .la files (closes: #621298).
 
- -- "Adam C. Powell, IV" <hazelsct at debian.org>  Sun, 10 Apr 2011 23:35:53 -0400
+ -- "Adam C. Powell, IV" <hazelsct at debian.org>  Sun, 10 Apr 2011 23:56:50 -0400
 
 freecad (0.10.3247.dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 046110e..aee775d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Teemu Ikonen <tpikonen at gmail.com>, "Adam C. Powell, IV" <hazelsct at deb
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freecad.git
 Vcs-Git: git://git.debian.org/git/debian-science/packages/freecad.git
 Homepage: http://juergen-riegel.net/FreeCAD/Docu/index.php?title=Main_Page
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev,
+Build-Depends: debhelper (>= 7.0.50~), quilt, autotools-dev,
  libboost-dev, libboost-date-time-dev, libboost-filesystem-dev,
  libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev,
  libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev,
diff --git a/debian/rules b/debian/rules
index 86aa0fe..41e4d05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,12 @@ else
 	CFLAGS += -O2
 endif
 
-configure: autogen.sh
+patch-stamp:
+	if [ ! -d .pc ]; then \
+	  QUILT_PATCHES=debian/patches quilt push -a; \
+	fi
+
+configure: autogen.sh patch-stamp
 	dh_testdir
 	chmod u+x autogen.sh
 	./autogen.sh
@@ -50,6 +55,9 @@ clean:
 	find -name '*.deps' | xargs rm -rf
 	find -name '*.libs' | xargs rm -rf
 	rm -f stamp-h1 config.log libtool
+	if [ -d .pc ]; then \
+	  QUILT_PATCHES=debian/patches quilt pop -a && rm -rf .pc; \
+	fi
 
 install: build install-stamp
 install-stamp:

-- 
FreeCAD packaging