[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-5-7-gae0d7d3

Maximiliano Curia maxy at alioth.debian.org
Thu Jun 27 12:44:38 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=c30284a

The following commit has been merged in the master branch:
commit c30284a466599c0af717f293582bc9d9677e885a
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jun 20 16:17:13 2013 +0200

    Avoid auto_clean error when building with --git-overlay.
---
 debian/changelog |    2 +-
 debian/rules     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81f1cca..a1e3494 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 qtwebkit (2.2.1-6) UNRELEASED; urgency=low
 
-  * 
+  * Avoid auto_clean error when building with --git-overlay.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 20 Jun 2013 16:17:23 +0200
 
diff --git a/debian/rules b/debian/rules
index 41214b2..19791a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,8 +34,8 @@ override_dh_auto_install:
 	dh_auto_install --sourcedirectory=$(QWEBVIEW_DIR)
 
 override_dh_auto_clean:
-	rm -f Source/Makefile
-	dh_auto_clean
+	if [ -d Source ]; then rm -f Source/Makefile; fi
+	if [ -d Source ]; then dh_auto_clean; else dh_auto_clean --sourcedirectory=.; fi
 	dh_auto_clean --sourcedirectory=$(QWEBVIEW_DIR)
 
 override_dh_builddeb:

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list