[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.0-2-9-g0cde7de

Fathi Boudra fabo at alioth.debian.org
Thu Dec 29 15:29:25 UTC 2011


The following commit has been merged in the experimental branch:
commit adc1d24ed259502cffafffe2e5793f72bc4705f7
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Dec 29 17:25:09 2011 +0200

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

diff --git a/debian/changelog b/debian/changelog
index ff64a39..d6f1e86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtwebkit (2.2.1-0multiarch1) UNRELEASED; urgency=low
   * Drop adjust_symbols_visibility_for_webcore.diff - stolen upstream.
   * Update debian/control:
     - bump Qt build dependency to 4:4.8.0~. This version introduce multiarch.
+  * Update debian/*.install files for multiarch.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 28 Dec 2011 10:10:59 +0200
 
diff --git a/debian/libqtwebkit-dev.install b/debian/libqtwebkit-dev.install
index 73816bc..cb4dbaa 100644
--- a/debian/libqtwebkit-dev.install
+++ b/debian/libqtwebkit-dev.install
@@ -30,8 +30,8 @@ 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/qt4/plugins/designer/libqwebview.so
+usr/lib/*/libQtWebKit.prl
+usr/lib/*/libQtWebKit.so
+usr/lib/*/pkgconfig/QtWebKit.pc
+usr/lib/*/qt4/plugins/designer/libqwebview.so
 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