[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-14-g5f83b8b

Fathi Boudra fabo at alioth.debian.org
Tue Sep 20 07:51:22 UTC 2011


The following commit has been merged in the master branch:
commit d8411ceb691dde0e39182537145088a4fbc8f7c9
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Sep 20 10:38:15 2011 +0300

    Update debian/*.install files for multiarch.
---
 debian/changelog               |    2 +-
 debian/libqtwebkit-dev.install |    6 +++---
 debian/libqtwebkit4.install    |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c0fe8f..47b2c70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,7 @@ qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
       libgstreamer0.10-dev build dependencies.
     - drop libphonon-dev build and qt-mobility build dependencies. GStreamer
       will be used as the multimedia backend as recommended by upstream.
-
+  * Update debian/*.install files for multiarch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 19 Sep 2011 16:32:18 +0300
 
diff --git a/debian/libqtwebkit-dev.install b/debian/libqtwebkit-dev.install
index 86878eb..b618158 100644
--- a/debian/libqtwebkit-dev.install
+++ b/debian/libqtwebkit-dev.install
@@ -30,7 +30,7 @@ usr/include/qt4/QtWebKit/qwebpluginfactory.h
 usr/include/qt4/QtWebKit/qwebsecurityorigin.h
 usr/include/qt4/QtWebKit/qwebsettings.h
 usr/include/qt4/QtWebKit/qwebview.h
-usr/lib/libQtWebKit.prl
-usr/lib/libQtWebKit.so
-usr/lib/pkgconfig/QtWebKit.pc
+usr/lib/*/libQtWebKit.prl
+usr/lib/*/libQtWebKit.so
+usr/lib/*/pkgconfig/QtWebKit.pc
 usr/share/qt4/mkspecs/modules/qt_webkit_version.pri
diff --git a/debian/libqtwebkit4.install b/debian/libqtwebkit4.install
index 3872f0f..917f930 100644
--- a/debian/libqtwebkit4.install
+++ b/debian/libqtwebkit4.install
@@ -1 +1 @@
-usr/lib/libQtWebKit.so.*
+usr/lib/*/libQtWebKit.so.*

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list