[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-7-13-g6311363

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Sun Jul 7 17:08:23 UTC 2013


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

The following commit has been merged in the master branch:
commit 7f0e94bb369760f63e7786c794fc63d0a4fc8d52
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Jul 7 14:00:41 2013 -0300

    Do not remove the include dir on cleaning.
    
    The headers are now not autogenerated. See the changelog changes
    for more info.
---
 debian/changelog |    4 ++++
 debian/rules     |    1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c071858..cbf503d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ qtbase-opensource-src (5.1.0+dfsg-1) UNRELEASED; urgency=low
     - build_examples.patch, adding the new -compile-examples switch.
   * Refresh patches: deppath_gnu.diff.
   * Bump Build-Depends-Indep qttools5-dev-tools dependency to << 5.1.0~.
+  * Do not remove the include dir on cleaning the sources. Prior to Qt 5.1 perl
+    would be run and re-create the includes. In 5.1, perl only runs if .git is
+    found and the build is done out-of-source. Thanks Pino and Thiago for the
+    hints.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 27 Jun 2013 14:04:21 -0300
 
diff --git a/debian/rules b/debian/rules
index eaca5e8..17df56d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -154,7 +154,6 @@ override_dh_auto_clean:
 	  doc/qch/ \
 	  examples/tools/plugandpaint/plugins/ \
 	  examples/tools/styleplugin/styles/ \
-	  include/ \
 	  lib/ \
 	  mkspecs/glibc-g++/ \
 	  plugins/ \

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list