rev 15129 - trunk/packages/qt4-x11/debian

[Fathi Boudra]

Author: fabo
Date: 2009-07-05 17:07:23 +0000 (Sun, 05 Jul 2009)
New Revision: 15129

Added:
   trunk/packages/qt4-x11/debian/libphonon4.lintian
Modified:
   trunk/packages/qt4-x11/debian/TODO.Debian
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/rules
Log:
Cleanup rules: add epoch to whole Qt to avoid headache with Phonon handling.
Cleanup TODO.
ADD libphonon4 lintian file.


Modified: trunk/packages/qt4-x11/debian/TODO.Debian
===================================================================
--- trunk/packages/qt4-x11/debian/TODO.Debian	2009-07-05 15:40:19 UTC (rev 15128)
+++ trunk/packages/qt4-x11/debian/TODO.Debian	2009-07-05 17:07:23 UTC (rev 15129)
@@ -1,33 +1,6 @@
   +++ TODO:
 
   * Review bug reports.
-  * Use pkgkde-symbolshelper. Add pkg-kde-tools (>= 0.3.1) b-d.
-  * what to do with phonon and webkit ?
-    - webkit links against phonon.
-
-< Riddell> fabo: so it seems to be easy enough to move phonon to build from qt
-           and have the phonon package just compile the backends
-< Riddell> they get installed to /usr/lib/kde4/plugins though so I don't know
-           if that should be /usr/lib/qt4/plugins
-< Riddell> but the main problem is package versioning, phonon has an epoch, qt
-           doesn't
-< Riddell> we could just add phonon to libqtcore4
-< Riddell> otherwise come up with a new package name like libphonon-qt4
-           libphonon-qt-dev
-< Riddell> (or add an epoch to qt but that's not pretty)
-< Riddell> oh and qt seems to install the headers into both
-           /usr/include/qt4/phonon and /usr/include/qt4/Qt which is a bit strange
-< Riddell> can't add to libqtcore4, it depends on lots of core things
-< Riddell> lots of non-core things rather
-< Riddell> maybe call it libqt4-phonon
-< ScottK> Riddell: I'm not sure what we want to do, but I'm sure add an epoch
-          where Debian hasn't isn't it.
-< Riddell> ScottK: yep, I just mention it for completeness
-< Riddell> fabo: for phonon I just commented out #add_subdirectory(phonon) in
-           CMakeLists.txt and it comiles fine against the phonon installed from qt
-< Riddell> and for qt I just copied over the libphonon4 libphonon-dev entries
-           in debian/control and adjusted the .install files
-
   * TT changed the build key generation and added backwards compatibility.
     We need to re-add 07_trust_dpkg-arch_over_uname-m.diff patch for our
     backward compatibility *and* figure out what to do with the new build key

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2009-07-05 15:40:19 UTC (rev 15128)
+++ trunk/packages/qt4-x11/debian/changelog	2009-07-05 17:07:23 UTC (rev 15129)
@@ -37,9 +37,8 @@
     - 0287-attempt-to-fix-header-installation-for-phonon.diff
       This is the long-standing issue of whether Phonon headers should be
       written with a capital P or a lowercase one.
+  * Add epoch 4 to avoid headache for Phonon handling.
   * Build Phonon from Qt sources:
-    - Add epoch to Phonon packages and set it to 4
-      (to upgrade phonon provided previously by KDE).
     - Remove libphonon-dev build dependency.
     - Do not remove phonon files anymore.
     - Keep libphonon4 symbols file and add pkg-kde-tools build dependency.

Added: trunk/packages/qt4-x11/debian/libphonon4.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libphonon4.lintian	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/libphonon4.lintian	2009-07-05 17:07:23 UTC (rev 15129)
@@ -0,0 +1 @@
+libphonon4: symbols-declares-dependency-on-other-package phonon #MINVER#

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2009-07-05 15:40:19 UTC (rev 15128)
+++ trunk/packages/qt4-x11/debian/rules	2009-07-05 17:07:23 UTC (rev 15129)
@@ -27,12 +27,6 @@
 
 DEB_MAKE_CLEAN_TARGET := confclean distclean
 
-# Add epoch to Phonon packages only
-#DEB_DH_GENCONTROL_ARGS_libphonon4 := -- -v4:$(CURRENTVERSION)
-#DEB_DH_GENCONTROL_ARGS_libphonon-dev := -- -v4:$(CURRENTVERSION)
-#DEB_DH_GENCONTROL_ARGS_phonon-dbg := -- -v4:$(CURRENTVERSION)
-#DEB_DH_GENCONTROL_ARGS_phonon := -- -v4:$(CURRENTVERSION)
-
 # Shlibs of the current upstream version
 #DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 # Specific shlibs version (e.g.: 4:4.5.2)
@@ -46,7 +40,6 @@
 DEB_DH_STRIP_ARGS_qt4-demos-dbg := --exclude=.debug
 
 DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
-#DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xphonon
 
 # Disable for rc
 DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)