[SCM] Qt 4 packaging branch, master, updated. debian/4.7.2-3-13-g5905549
Pino Toscano
pino-guest at alioth.debian.org
Sat Apr 30 12:58:52 UTC 2011
The following commit has been merged in the master branch:
commit 5905549d57b9c8b6e71a55dc0d4cc440e2b9393f
Author: Pino Toscano <pino at kde.org>
Date: Sat Apr 30 14:57:33 2011 +0200
qt4-qmake.links: stop forcing the "default" symlink of the mkspecs to linux-g++
just let Qt create it according to the platform
---
debian/changelog | 3 +++
debian/qt4-qmake.links | 1 -
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b5782bb..e8a29d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ qt4-x11 (4:4.7.2-4) UNRELEASED; urgency=low
* Update debian/control:
- qt4-dev-tools: suggest qt-assistant-compat instead of qt4-dev-tools,
as the former now contains the old assistant with uses HTML documentation.
+ * debian/qt4-qmake.links:
+ - stop forcing the "default" symlink of the mkspecs to linux-g++, just let
+ Qt create it according to the platform.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 15 Apr 2011 22:42:35 +0200
diff --git a/debian/qt4-qmake.links b/debian/qt4-qmake.links
index f5b4505..8a70be9 100644
--- a/debian/qt4-qmake.links
+++ b/debian/qt4-qmake.links
@@ -1,2 +1 @@
usr/bin/qmake-qt4 usr/share/qt4/bin/qmake
-usr/share/qt4/mkspecs/linux-g++ usr/share/qt4/mkspecs/default
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list