[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-149-g8c0d80d

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 030fa04c033bcab60664ca230a780de6eaf18c56
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jan 2 15:58:44 2011 +0100

    Removing quilt from debian/*, closing #608639

diff --git a/debian/changelog b/debian/changelog
index 073ffe4..e606a62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (6.12.8+dfsg-4) experimental; urgency=low
+
+  * Completely removing quilt from debian/*
+    (Closes: #608639).
+
+ -- Steffen Moeller <moeller at debian.org>  Sun, 02 Jan 2011 15:58:19 +0100
+
 boinc (6.12.8+dfsg-3) experimental; urgency=low
 
   * Reworked the boinc-server.links
diff --git a/debian/control b/debian/control
index 8c7259f..fcd63a1 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~), po-debconf, dh-buildinfo,
  autoconf (>= 2.59), libxml2-utils, gettext, zlib1g-dev, libssl-dev,
  libcurl4-openssl-dev (>= 7.17.1), freeglut3-dev, libsm-dev, libice-dev,
  libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.8-dev,
- libsqlite3-dev, quilt, libgtk2.0-dev, libxcb-atom1-dev, pkg-config (>= 0.15),
+ libsqlite3-dev, libgtk2.0-dev, libxcb-atom1-dev, pkg-config (>= 0.15),
  libtool
 Homepage: http://boinc.berkeley.edu/
 Vcs-Git: git://git.debian.org/git/pkg-boinc/boinc.git
diff --git a/debian/rules b/debian/rules
index 66fd0c5..d2151c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,7 +105,7 @@ CFGFLAGS_boinc-client = \
 
 # Default rule
 %:
-	dh $@ --with-quilt
+	dh $@
 
 clean:
 	dh clean
@@ -188,10 +188,11 @@ BINARIES += samples/worker/worker samples/wrapper/wrapper samples/sleeper/sleepe
 
 override_dh_auto_clean: 
 	dh_auto_clean
-	if [ -d .pc ]; then  \
-		quilt pop -a ; \
-		$(RM) -r .pc ; \
-	fi
+	# don't interfere with dpkg-source
+	#if [ -d .pc ]; then  \
+	#	quilt pop -a ; \
+	#	$(RM) -r .pc ; \
+	#fi
 	#if [ -d debian/patches ]; then \
 	#	cat debian/patches/*| patch -p1 -R --batch --quiet || true ; \
 	#fi

-- 
BOINC packaging