rev 17595 - in trunk/packages/phonon/debian: . patches source

[Modestas Vainius]

Author: modax
Date: 2010-04-06 23:01:53 +0000 (Tue, 06 Apr 2010)
New Revision: 17595

Added:
   trunk/packages/phonon/debian/phonon-backend-null.lintian-overrides
   trunk/packages/phonon/debian/source/
   trunk/packages/phonon/debian/source/format
Modified:
   trunk/packages/phonon/debian/changelog
   trunk/packages/phonon/debian/libphonon-dev.install
   trunk/packages/phonon/debian/libphonon4.symbols
   trunk/packages/phonon/debian/patches/01_phonon-inc.patch
   trunk/packages/phonon/debian/patches/04_skip_pa_detection_if_no_glib_loop.diff
Log:
* New upstream release (4.4.0).
* Refresh patches.
* Update libphonon4 symbol file.
* Update libphonon-dev.install: add pulsesupport.h.
* Override lintian "phonon-backend-null: empty-binary-package".
* Add explicit debian/source/format as lintian suggests.

Modified: trunk/packages/phonon/debian/changelog
===================================================================
--- trunk/packages/phonon/debian/changelog	2010-04-06 22:01:00 UTC (rev 17594)
+++ trunk/packages/phonon/debian/changelog	2010-04-06 23:01:53 UTC (rev 17595)
@@ -1,9 +1,17 @@
-phonon (4:4.6.0really4.3.80-2) UNRELEASED; urgency=low
+phonon (4:4.6.0really4.4.0-1) experimental; urgency=low
 
+  * New upstream release (4.4.0).
+
+  [ Modestas Vainius ]
   * Add 04_skip_pa_detection_if_no_glib_loop.diff patch which fixes phonon
     hang if GLib loop is disabled in Qt.
+  * Refresh patches.
+  * Update libphonon4 symbol file.
+  * Update libphonon-dev.install: add pulsesupport.h.
+  * Override lintian "phonon-backend-null: empty-binary-package".
+  * Add explicit debian/source/format as lintian suggests.
 
- -- Modestas Vainius <modax at debian.org>  Sat, 06 Mar 2010 23:25:56 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 07 Apr 2010 01:42:07 +0300
 
 phonon (4:4.6.0really4.3.80-1) experimental; urgency=low
 

Modified: trunk/packages/phonon/debian/libphonon-dev.install
===================================================================
--- trunk/packages/phonon/debian/libphonon-dev.install	2010-04-06 22:01:00 UTC (rev 17594)
+++ trunk/packages/phonon/debian/libphonon-dev.install	2010-04-06 23:01:53 UTC (rev 17595)
@@ -62,6 +62,7 @@
 usr/include/phonon/phonondefs.h
 usr/include/phonon/phononnamespace.h
 usr/include/phonon/platformplugin.h
+usr/include/phonon/pulsesupport.h
 usr/include/phonon/seekslider.h
 usr/include/phonon/streaminterface.h
 usr/include/phonon/videoplayer.h

Modified: trunk/packages/phonon/debian/libphonon4.symbols
===================================================================
--- trunk/packages/phonon/debian/libphonon4.symbols	2010-04-06 22:01:00 UTC (rev 17594)
+++ trunk/packages/phonon/debian/libphonon4.symbols	2010-04-06 23:01:53 UTC (rev 17595)
@@ -153,7 +153,7 @@
  _ZN6Phonon12PulseSupport28emitObjectDescriptionChangedENS_21ObjectDescriptionTypeE at Base 4:4.6.0really4.3.80
  _ZN6Phonon12PulseSupport34setOutputDevicePriorityForCategoryENS_8CategoryE5QListIiE at Base 4:4.6.0really4.3.80
  _ZN6Phonon12PulseSupport35setCaptureDevicePriorityForCategoryENS_8CategoryE5QListIiE at Base 4:4.6.0really4.3.80
- _ZN6Phonon12PulseSupport7disableEv at Base 4:4.6.0really4.3.80
+ _ZN6Phonon12PulseSupport6enableEb at Base 4:4.6.0really4.4.0
  _ZN6Phonon12PulseSupport8isActiveEv at Base 4:4.6.0really4.3.80
  _ZN6Phonon12PulseSupport8shutdownEv at Base 4:4.6.0really4.3.80
  _ZN6Phonon12PulseSupportC1Ev at Base 4:4.6.0really4.3.80

Modified: trunk/packages/phonon/debian/patches/01_phonon-inc.patch
===================================================================
--- trunk/packages/phonon/debian/patches/01_phonon-inc.patch	2010-04-06 22:01:00 UTC (rev 17594)
+++ trunk/packages/phonon/debian/patches/01_phonon-inc.patch	2010-04-06 23:01:53 UTC (rev 17595)
@@ -5,7 +5,7 @@
 
 --- a/phonon/CMakeLists.txt
 +++ b/phonon/CMakeLists.txt
-@@ -128,3 +128,7 @@ install(FILES
+@@ -137,3 +137,7 @@ install(FILES
     DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
  
  install(FILES org.kde.Phonon.AudioOutput.xml  DESTINATION  ${DBUS_INTERFACES_INSTALL_DIR})

Modified: trunk/packages/phonon/debian/patches/04_skip_pa_detection_if_no_glib_loop.diff
===================================================================
--- trunk/packages/phonon/debian/patches/04_skip_pa_detection_if_no_glib_loop.diff	2010-04-06 22:01:00 UTC (rev 17594)
+++ trunk/packages/phonon/debian/patches/04_skip_pa_detection_if_no_glib_loop.diff	2010-04-06 23:01:53 UTC (rev 17595)
@@ -9,7 +9,15 @@
 
 --- a/phonon/pulsesupport.cpp
 +++ b/phonon/pulsesupport.cpp
-@@ -650,6 +650,13 @@
+@@ -30,6 +30,7 @@
+ #include <pulse/pulseaudio.h>
+ #include <pulse/xmalloc.h>
+ #include <pulse/glib-mainloop.h>
++#include <QtCore/QAbstractEventDispatcher>
+ #ifdef HAVE_PULSEAUDIO_DEVICE_MANAGER
+ #  include <pulse/ext-device-manager.h>
+ #endif
+@@ -692,6 +693,13 @@ PulseSupport::PulseSupport()
      if (pulseenv.toInt())
          return;
  

Added: trunk/packages/phonon/debian/phonon-backend-null.lintian-overrides
===================================================================
--- trunk/packages/phonon/debian/phonon-backend-null.lintian-overrides	                        (rev 0)
+++ trunk/packages/phonon/debian/phonon-backend-null.lintian-overrides	2010-04-06 23:01:53 UTC (rev 17595)
@@ -0,0 +1 @@
+phonon-backend-null: empty-binary-package

Added: trunk/packages/phonon/debian/source/format
===================================================================
--- trunk/packages/phonon/debian/source/format	                        (rev 0)
+++ trunk/packages/phonon/debian/source/format	2010-04-06 23:01:53 UTC (rev 17595)
@@ -0,0 +1 @@
+1.0