[SCM] QtWebKit packaging branch, master, updated. 70d1058abbe0df30830e7525ac940479566e54b3

Fathi Boudra fabo at alioth.debian.org
Tue Jun 29 21:29:36 UTC 2010


The following commit has been merged in the master branch:
commit 70d1058abbe0df30830e7525ac940479566e54b3
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Jun 30 00:27:09 2010 +0300

    Add missing file
    Add Breaks/Replaces for Qt WebKit from Qt source code
---
 debian/control                 |    9 ++++++++-
 debian/libqtwebkit-dev.install |    1 +
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index 6007e59..c097f78 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/qtwebkit.git;a=summary
 Package: libqtwebkit-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libqtwebkit4 (= ${binary:Version})
+Depends: ${misc:Depends}, libqtwebkit4 (= ${binary:Version}),
+ libqt4-dev (>= 4:4.6.0)
+Breaks: libqt4-dev (<< 4:4.7.0~beta1+git3529+59c5857)
+Replaces: libqt4-dev (<< 4:4.7.0~beta1+git3529+59c5857)
 Description: Web content engine library for Qt - development files
  QtWebKit provides a Web browser engine that makes it easy to embed content
  from the World Wide Web into your Qt application.
@@ -26,6 +29,8 @@ Description: Web content engine library for Qt - development files
 Package: libqtwebkit4
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libqt4-webkit (<< 4:4.7.0~beta1+git3529+59c5857)
+Replaces: libqt4-webkit (<< 4:4.7.0~beta1+git3529+59c5857)
 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.
@@ -35,6 +40,8 @@ Priority: extra
 Architecture: any
 Section: debug
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqtwebkit4 (= ${binary:Version})
+Breaks: libqt4-webkit-dbg (<< 4:4.7.0~beta1+git3529+59c5857)
+Replaces: libqt4-webkit-dbg (<< 4:4.7.0~beta1+git3529+59c5857)
 Description: Web content engine library for Qt - debugging symbols
  QtWebKit provides a Web browser engine that makes it easy to embed content
  from the World Wide Web into your Qt application.
diff --git a/debian/libqtwebkit-dev.install b/debian/libqtwebkit-dev.install
index 51accc2..0ee5c8e 100644
--- a/debian/libqtwebkit-dev.install
+++ b/debian/libqtwebkit-dev.install
@@ -31,3 +31,4 @@ usr/include/qt4/QtWebKit/qwebview.h
 usr/lib/libQtWebKit.prl
 usr/lib/libQtWebKit.so
 usr/lib/pkgconfig/QtWebKit.pc
+usr/share/qt4/mkspecs/modules/qt_webkit_version.pri

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list