[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.7.0-beta1-1-7-g9cfa0cf

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 9cfa0cf4a4607e61bfb3da3fe9ea0ee873c61fb3
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Jun 8 15:23:01 2010 +0300

    Build Qt without webkit
---
 debian/changelog |    3 +-
 debian/control   |   58 +++++++++++++++++++++++++++---------------------------
 debian/rules     |    2 +-
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27d4056..166cb2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 qt4-x11 (4:4.7.0~beta1-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET.
-  * Remove Qt Multimedia amd Qt MediaServices packages.
+  * Remove Qt Multimedia, Qt MediaServices and Qt WebKit packages.
   * Update debian/rules:
     - replace -multimedia by -no-multimedia configure option.
     - add -no-mediaservices configure option.
+    - replace -webkit by -no-webkit configure option.
 
  -- Fathi Boudra <fabo at debian.org>  Thu, 03 Jun 2010 18:04:03 +0300
 
diff --git a/debian/control b/debian/control
index 372b05c..cf14227 100644
--- a/debian/control
+++ b/debian/control
@@ -216,15 +216,15 @@ Description: Qt 4 SVG module
  Scalable Vector Graphics (SVG) is a language for describing two-dimensional
  graphics and graphical applications in XML.
 
-Package: libqt4-webkit
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 WebKit module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- QtWebKit provides a Web browser engine that makes it easy to embed content
- from the World Wide Web into your Qt application.
+#Package: libqt4-webkit
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}
+#Description: Qt 4 WebKit module
+# Qt is a cross-platform C++ application framework. Qt's primary feature
+# is its rich set of widgets that provide standard GUI functionality.
+# .
+# QtWebKit provides a Web browser engine that makes it easy to embed content
+# from the World Wide Web into your Qt application.
 
 Package: libqt4-xml
 Architecture: any
@@ -353,14 +353,14 @@ Description: Qt 4 widgets QML plugin
  .
  This package contains the widgets QML plugin for QtDeclarative.
 
-Package: libqt4-declarative-webkitqmlplugin
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 WebKit QML plugin
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the WebKit QML plugin for QtDeclarative.
+#Package: libqt4-declarative-webkitqmlplugin
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}
+#Description: Qt 4 WebKit QML plugin
+# Qt is a cross-platform C++ application framework. Qt's primary feature
+# is its rich set of widgets that provide standard GUI functionality.
+# .
+# This package contains the WebKit QML plugin for QtDeclarative.
 
 Package: libqt4-dev
 Architecture: any
@@ -368,7 +368,7 @@ Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}),
  libqt4-network (= ${binary:Version}), libqt4-dbus (= ${binary:Version}),
  libqtgui4 (= ${binary:Version}), libqt4-svg (= ${binary:Version}),
- libqt4-webkit (= ${binary:Version}), libqt4-xml (= ${binary:Version}),
+ libqt4-xml (= ${binary:Version}),
  libqt4-sql (= ${binary:Version}), libqt4-script (= ${binary:Version}),
  libqt4-scripttools (= ${binary:Version}), libqt4-xmlpatterns (= ${binary:Version}),
  libqt4-qt3support (= ${binary:Version}), libqt4-designer (= ${binary:Version}),
@@ -413,17 +413,17 @@ Description: Qt 4 library debugging symbols
  .
  This package contains the debugging symbols for the Qt 4 libraries.
 
-Package: libqt4-webkit-dbg
-Priority: extra
-Architecture: any
-Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libqt4-webkit (= ${binary:Version})
-Description: Qt 4 WebKit library debugging symbols
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the debugging symbols for the Qt 4 WebKit library.
+#Package: libqt4-webkit-dbg
+#Priority: extra
+#Architecture: any
+#Section: debug
+#Depends: ${shlibs:Depends}, ${misc:Depends},
+# libqt4-webkit (= ${binary:Version})
+#Description: Qt 4 WebKit library debugging symbols
+# Qt is a cross-platform C++ application framework. Qt's primary feature
+# is its rich set of widgets that provide standard GUI functionality.
+# .
+# This package contains the debugging symbols for the Qt 4 WebKit library.
 
 Package: libqt4-xmlpatterns-dbg
 Priority: extra
diff --git a/debian/rules b/debian/rules
index ed6ab20..f6badf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,7 @@ endif
 	            -phonon \
 	            -no-phonon-backend \
 	            -svg \
-	            -webkit \
+	            -no-webkit \
 	            -script \
 	            -scripttools \
 	            -platform $(platform_arg) \

-- 
Qt 4 Debian packaging