[SCM] QtWebKit packaging branch, master, updated. debian/2.0-week26-2-17-g818ef60

Fathi Boudra fabo at alioth.debian.org
Sat Jan 29 16:31:44 UTC 2011


The following commit has been merged in the master branch:
commit 27fbc7a0f4f2c868069fa311caa888a6f5ad0196
Author: Fathi Boudra <fabo at debian.org>
Date:   Sat Jan 29 18:30:28 2011 +0200

    Disable QML plugin to skip NEW processing
---
 debian/changelog |    5 ++---
 debian/control   |   16 ++++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e80e80f..f658892 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,10 @@
-qtwebkit (2.1~week35-1) UNRELEASED; urgency=low
+qtwebkit (2.1.0~2011week03-1) UNRELEASED; urgency=low
 
   * New upstream release: switch to Qt WebKit 2.1 branch.
 
   [ Fathi Boudra ]
   * Update debian/control:
     - build depends on Qt 4.7.0 beta 2.
-    - add libqtwebkit-qmlwebkitplugin package.
   * Update debian/rules:
     - pass DEFINES+=ENABLE_VIDEO to build with audio/video support.
   * Update libqtwebkit-dev.install file: add qwebkitplatformplugin.h.
@@ -16,7 +15,7 @@ qtwebkit (2.1~week35-1) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Add patch 09_hurd.diff to fix compilation on Hurd.
 
- -- Fathi Boudra <fabo at debian.org>  Sun, 05 Sep 2010 09:08:05 +0300
+ -- Fathi Boudra <fabo at debian.org>  Sat, 29 Jan 2011 18:23:41 +0200
 
 qtwebkit (2.0~week26-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 95c2060..67fa849 100644
--- a/debian/control
+++ b/debian/control
@@ -33,14 +33,14 @@ Description: Web content engine library for Qt
  QtWebKit provides a Web browser engine that makes it easy to embed content
  from the World Wide Web into your Qt application.
 
-Package: libqtwebkit-qmlwebkitplugin
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt WebKit QML plugin
- QtWebKit provides a Web browser engine that makes it easy to embed content
- from the World Wide Web into your Qt application.
- .
- This package contains the WebKit QML plugin for QtDeclarative.
+#Package: libqtwebkit-qmlwebkitplugin
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}
+#Description: Qt WebKit QML plugin
+# QtWebKit provides a Web browser engine that makes it easy to embed content
+# from the World Wide Web into your Qt application.
+# .
+# This package contains the WebKit QML plugin for QtDeclarative.
 
 Package: libqtwebkit4-dbg
 Priority: extra

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list