[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

Fathi Boudra fabo at alioth.debian.org
Sat Jun 11 11:42:44 UTC 2011


The following commit has been merged in the experimental-snapshots branch:
commit fdc59ae240c241bdfadc87ec626e6a49773735fb
Author: Pino Toscano <pino at kde.org>
Date:   Mon Dec 6 01:16:58 2010 +0100

    libqt4-network.install: specify the single directory with bearer plugins
---
 debian/changelog              |    4 ++++
 debian/libqt4-network.install |    4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d5d76a..6159be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qt4-x11 (4:4.7.1-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * libqt4-network.install: specify the single directory with bearer plugins,
+    instead of the single plugins; this avoids build failures due to few
+    bearers being compiled for Linux only.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 Dec 2010 01:13:50 +0100
 
diff --git a/debian/libqt4-network.install b/debian/libqt4-network.install
index cab867d..13e4a4d 100644
--- a/debian/libqt4-network.install
+++ b/debian/libqt4-network.install
@@ -1,4 +1,2 @@
 usr/lib/libQtNetwork.so.*
-usr/lib/qt4/plugins/bearer/libqconnmanbearer.so
-usr/lib/qt4/plugins/bearer/libqgenericbearer.so
-usr/lib/qt4/plugins/bearer/libqnmbearer.so
+usr/lib/qt4/plugins/bearer

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list