rev 9538 - in branches/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-03-03 09:52:06 +0000 (Mon, 03 Mar 2008)
New Revision: 9538

Removed:
   branches/qt4-x11/debian/patches/09_install_phonon_gstreamer.diff
Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/control
   branches/qt4-x11/debian/patches/series
Log:
Clean up remaining bits from gstreamer/phonon


Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2008-03-03 09:20:18 UTC (rev 9537)
+++ branches/qt4-x11/debian/changelog	2008-03-03 09:52:06 UTC (rev 9538)
@@ -2,12 +2,12 @@
 
   * New upstream release.
 
-  * Add build dependencies: libgstreamer-plugins-base0.10-dev, firebird2.0-dev,
-    libiodbc2-dev, libtiff4-dev, libpam0g-dev, libreadline5-dev, libxslt1-dev.
+  * Add build dependencies: firebird2.0-dev, libiodbc2-dev, libtiff4-dev,
+    libpam0g-dev, libreadline5-dev, libxslt1-dev.
   * Update rules:
     * Disable DEB_INSTALL_CHANGELOGS_ALL.
-    * Add DEB_DH_SHLIBDEPS_ARGS_ALL workaround.
-    * Enable XmlPatterns.
+    * Add DEB_DH_SHLIBDEPS_ARGS workaround for WebKit.
+    * Enable WebKit and XmlPatterns.
     * Enable exceptions. It is a dependency to XmlPatterns module.
   * Refresh Debian patches.
   * Refresh qt-copy patches: 0167, 0172, 0178, 0180, 0191, 0192, 0195, 0203,
@@ -23,7 +23,7 @@
       This patch doesn't apply as it is.
     * 91_qmake_lflags_no-undefined. Merged upstream.
   * Update .install files: libqt4-core, libqt4-gui and qt4-dev-tools.
-  * Add packages: libqt4-dbus and libqt4-xmlpatterns.
+  * Add packages: libqt4-dbus, libqt4-webkit and libqt4-xmlpatterns.
   * Move QtDBus module from libqt4-core in libqt4-dbus package.
 
   * Experimental test to re-introduce link_prl.

Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control	2008-03-03 09:20:18 UTC (rev 9537)
+++ branches/qt4-x11/debian/control	2008-03-03 09:52:06 UTC (rev 9538)
@@ -7,12 +7,12 @@
  firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc],
  libaudio-dev, libcupsys2-dev, libdbus-1-dev, libfreetype6-dev,
  libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
- libgstreamer-plugins-base0.10-dev, libice-dev, libiodbc2-dev, libjpeg62-dev,
- libmng-dev, libmysqlclient15-dev, libpam0g-dev, libpng12-dev, libpq-dev,
- libreadline5-dev, libsm-dev, libsqlite0-dev, libsqlite3-dev, libtiff4-dev,
- libx11-dev, libxcursor-dev, libxext-dev, libxft-dev, libxi-dev,
- libxinerama-dev, libxmu-dev, libxrandr-dev, libxrender-dev, libxslt1-dev,
- libxt-dev, x11proto-core-dev, zlib1g-dev
+ libice-dev, libiodbc2-dev, libjpeg62-dev, libmng-dev, libmysqlclient15-dev,
+ libpam0g-dev, libpng12-dev, libpq-dev, libreadline5-dev, libsm-dev,
+ libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev, libxcursor-dev,
+ libxext-dev, libxft-dev, libxi-dev, libxinerama-dev, libxmu-dev,
+ libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev, x11proto-core-dev,
+ zlib1g-dev
 Standards-Version: 3.7.3
 Homepage: http://www.trolltech.com
 Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/qt4-x11

Deleted: branches/qt4-x11/debian/patches/09_install_phonon_gstreamer.diff

Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series	2008-03-03 09:20:18 UTC (rev 9537)
+++ branches/qt4-x11/debian/patches/series	2008-03-03 09:52:06 UTC (rev 9538)
@@ -22,7 +22,6 @@
 06_qtdemo_destdir.diff
 07_trust_dpkg-arch_over_uname-m.diff
 08_load_ssl.diff
-# no phonon 09_install_phonon_gstreamer.diff
 10_config_tests_fixes.diff
 20_mips_atomic_ops.diff
 40_alpha_ice.diff