[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-beta2-3-13-g24aec18

Sun Sep 5 06:03:42 UTC 2010

The following commit has been merged in the experimental-snapshots branch:
commit 3bdc8f3e500b9870414a99b04ec67afa2f8f60a8
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Sep 5 09:01:42 2010 +0300

    Disable QtOpenVG module
---
 debian/changelog          |    4 +---
 debian/control            |   30 ++++++++++++++++--------------
 debian/libqt4-dev.install |   14 +++++++-------
 debian/rules              |    2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9efbfa..823b606 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,9 @@ qt4-x11 (4:4.7.0~rc1-1) experimental; urgency=low
     0001_webkit_self_injection_into_qt_configuration.patch.
   * Update debian/control:
     - bump Standards-Version to 3.9.1 (no changes needed).
-    - add libopenvg1-mesa-dev build dependency.
-    - add libqt4-openvg package.
     - add libqt4-assistant and libqt4-webkit-dbg dummy transitional packages.
   * Update debian/rules:
-    - add -openvg configure option.
+    - add -no-openvg configure option.
   * Refresh patches.
   * Update installed files.
   * Update symbols files.
diff --git a/debian/control b/debian/control
index f7711bf..9957270 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 7.4.13), quilt, pkg-kde-tools (>= 0.6.4), flex, sha
  libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev,
  libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
  libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgtk2.0-dev,
- libice-dev, unixodbc-dev, libjpeg-dev, libmng-dev, libmysqlclient-dev, libopenvg1-mesa-dev,
+ libice-dev, unixodbc-dev, libjpeg-dev, libmng-dev, libmysqlclient-dev,
+# libopenvg1-mesa-dev,
  libpam0g-dev, libpng12-dev, libpq-dev, libreadline-dev, libsm-dev,
  libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev, libxcursor-dev,
  libxext-dev, libxft-dev, libxi-dev, libxinerama-dev, libxmu-dev,
@@ -343,17 +344,17 @@ Description: Qt 4 Phonon module
  is built from the phonon source package. Therefore it's only useful when
  bootstraping new architectures or rebuilding the whole archive from scratch.
 
-Package: libqt4-openvg
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 OpenVG module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- The QtOpenVG module is a plugin that provides support for OpenVG painting.
- .
- OpenVG is a standard API from the Khronos Group for accelerated 2D vector
- graphics that is appearing in an increasing number of embedded devices.
+#Package: libqt4-openvg
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}
+#Description: Qt 4 OpenVG module
+# Qt is a cross-platform C++ application framework. Qt's primary feature
+# is its rich set of widgets that provide standard GUI functionality.
+# .
+# The QtOpenVG module is a plugin that provides support for OpenVG painting.
+# .
+# OpenVG is a standard API from the Khronos Group for accelerated 2D vector
+# graphics that is appearing in an increasing number of embedded devices.
 
 Package: libqt4-declarative
 Architecture: any
@@ -397,8 +398,9 @@ Architecture: any
 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-xml (= ${binary:Version}),
+ libqtgui4 (= ${binary:Version}),
+# libqt4-openvg (= ${binary:Version}),
+ libqt4-svg (= ${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}),
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index d5270b5..5f1b663 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -14,7 +14,7 @@ usr/include/qt4/Qt/QtDeclarative
 usr/include/qt4/Qt/QtGui
 usr/include/qt4/Qt/QtHelp
 usr/include/qt4/Qt/QtNetwork
-usr/include/qt4/Qt/QtOpenVG
+#usr/include/qt4/Qt/QtOpenVG
 usr/include/qt4/Qt/QtScript
 usr/include/qt4/Qt/QtScriptTools
 usr/include/qt4/Qt/QtSql
@@ -701,7 +701,7 @@ usr/include/qt4/Qt/qvector2d.h
 usr/include/qt4/Qt/qvector3d.h
 usr/include/qt4/Qt/qvector4d.h
 usr/include/qt4/Qt/qvfbhdr.h
-usr/include/qt4/Qt/qvg.h
+#usr/include/qt4/Qt/qvg.h
 usr/include/qt4/Qt/qwaitcondition.h
 usr/include/qt4/Qt/qwhatsthis.h
 usr/include/qt4/Qt/qwidget.h
@@ -2522,8 +2522,8 @@ usr/include/qt4/QtNetwork/qtcpserver.h
 usr/include/qt4/QtNetwork/qtcpsocket.h
 usr/include/qt4/QtNetwork/qudpsocket.h
 usr/include/qt4/QtNetwork/qurlinfo.h
-usr/include/qt4/QtOpenVG/QtOpenVG
-usr/include/qt4/QtOpenVG/qvg.h
+#usr/include/qt4/QtOpenVG/QtOpenVG
+#usr/include/qt4/QtOpenVG/qvg.h
 usr/include/qt4/QtScript/QScriptClass
 usr/include/qt4/QtScript/QScriptClassPropertyIterator
 usr/include/qt4/QtScript/QScriptContext
@@ -2777,8 +2777,8 @@ usr/lib/libQtHelp.prl
 usr/lib/libQtHelp.so
 usr/lib/libQtNetwork.prl
 usr/lib/libQtNetwork.so
-usr/lib/libQtOpenVG.prl
-usr/lib/libQtOpenVG.so
+#usr/lib/libQtOpenVG.prl
+#usr/lib/libQtOpenVG.so
 usr/lib/libQtScript.prl
 usr/lib/libQtScript.so
 usr/lib/libQtScriptTools.prl
@@ -2805,7 +2805,7 @@ usr/lib/pkgconfig/QtDesignerComponents.pc
 usr/lib/pkgconfig/QtGui.pc
 usr/lib/pkgconfig/QtHelp.pc
 usr/lib/pkgconfig/QtNetwork.pc
-usr/lib/pkgconfig/QtOpenVG.pc
+#usr/lib/pkgconfig/QtOpenVG.pc
 usr/lib/pkgconfig/QtScript.pc
 usr/lib/pkgconfig/QtScriptTools.pc
 usr/lib/pkgconfig/QtSql.pc
diff --git a/debian/rules b/debian/rules
index ef50954..2601e2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,7 +119,7 @@ endif
 	            -verbose \
 	            -gtkstyle \
 	            -system-nas-sound \
-	            -openvg \
+	            -no-openvg \
 	            -lfontconfig \
 	            -I/usr/include/freetype2 \
 	            -qvfb \

-- 
Qt 4 packaging

