[SCM] Qt 4 packaging branch, master, updated. debian/4.7.0-rc1-1-70-g1027d3b

Modestas Vainius modax at alioth.debian.org
Sun Dec 5 12:38:38 UTC 2010


The following commit has been merged in the master branch:
commit b3bdbd3a94a85f1af29acf9bf4d0a6c44c7164bb
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Dec 5 00:30:46 2010 +0200

    Do not pass --sourcedir=debian/tmp to dh_install anymore.
    
    Not needed for compat level 7 or higher.
---
 debian/changelog |    2 ++
 debian/rules     |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d42186..20060c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ qt4-x11 (4:4.7.1-0r1) UNRELEASED; urgency=low
     - 09_qmake_lflags_as-needed.diff - configure script supports LDFLAGS
       nowadays. Drop the patch and export appropriate LDFLAGS in debian/rules
       instead.
+  * Do not pass --sourcedir=debian/tmp to dh_install anymore. Not needed for
+    compat level 7 or higher.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Oct 2010 14:55:15 +0200
 
diff --git a/debian/rules b/debian/rules
index 284f67c..8338fad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -261,7 +261,7 @@ override_dh_auto_install:
 	\) -print0 | xargs -0 rm -rf
 
 override_dh_install:
-	dh_install --list-missing --sourcedir=debian/tmp
+	dh_install --list-missing
 
 override_dh_installdocs:
 	dh_installdocs --all LGPL_EXCEPTION.txt

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list