rev 17897 - in trunk/packages/phonon/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-05-08 21:04:42 +0000 (Sat, 08 May 2010)
New Revision: 17897

Added:
   trunk/packages/phonon/debian/watch
Removed:
   trunk/packages/phonon/debian/patches/04_skip_pa_detection_if_no_glib_loop.diff
Modified:
   trunk/packages/phonon/debian/changelog
   trunk/packages/phonon/debian/patches/01_phonon-inc.patch
   trunk/packages/phonon/debian/patches/02_no_rpath.patch
   trunk/packages/phonon/debian/patches/03_phonon_is_not_forced_in_KDE.diff
   trunk/packages/phonon/debian/patches/series
Log:
* New upstream release:
 - fixes crash when opening PDF document (Closes: #580802);
* Add debian/watch.
* Update patches:
  - refresh 01 and 02;
  - adapt 03 to upstream changes;
  - remove 04, was stolen from upstream.

Modified: trunk/packages/phonon/debian/changelog
===================================================================
--- trunk/packages/phonon/debian/changelog	2010-05-08 20:46:28 UTC (rev 17896)
+++ trunk/packages/phonon/debian/changelog	2010-05-08 21:04:42 UTC (rev 17897)
@@ -1,3 +1,15 @@
+phonon (4:4.6.0really4.4.1-0r1) UNRELEASED; urgency=low
+
+  * New upstream release:
+   - fixes crash when opening PDF document (Closes: #580802);
+  * Add debian/watch.
+  * Update patches:
+    - refresh 01 and 02;
+    - adapt 03 to upstream changes;
+    - remove 04, was stolen from upstream.
+
+ -- Modestas Vainius <modax at debian.org>  Sat, 08 May 2010 23:51:56 +0300
+
 phonon (4:4.6.0really4.4.0-4) unstable; urgency=high
 
   [ Modestas Vainius ]

Modified: trunk/packages/phonon/debian/patches/01_phonon-inc.patch
===================================================================
--- trunk/packages/phonon/debian/patches/01_phonon-inc.patch	2010-05-08 20:46:28 UTC (rev 17896)
+++ trunk/packages/phonon/debian/patches/01_phonon-inc.patch	2010-05-08 21:04:42 UTC (rev 17897)
@@ -5,7 +5,7 @@
 
 --- a/phonon/CMakeLists.txt
 +++ b/phonon/CMakeLists.txt
-@@ -137,3 +137,7 @@ install(FILES
+@@ -139,3 +139,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/02_no_rpath.patch
===================================================================
--- trunk/packages/phonon/debian/patches/02_no_rpath.patch	2010-05-08 20:46:28 UTC (rev 17896)
+++ trunk/packages/phonon/debian/patches/02_no_rpath.patch	2010-05-08 21:04:42 UTC (rev 17897)
@@ -5,7 +5,7 @@
 Forwarded: not-needed
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -241,15 +241,6 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_
+@@ -244,15 +244,6 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_
     set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
  endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc")
  

Modified: trunk/packages/phonon/debian/patches/03_phonon_is_not_forced_in_KDE.diff
===================================================================
--- trunk/packages/phonon/debian/patches/03_phonon_is_not_forced_in_KDE.diff	2010-05-08 20:46:28 UTC (rev 17896)
+++ trunk/packages/phonon/debian/patches/03_phonon_is_not_forced_in_KDE.diff	2010-05-08 21:04:42 UTC (rev 17897)
@@ -4,12 +4,12 @@
 
 --- a/includes/CMakeLists.txt
 +++ b/includes/CMakeLists.txt
-@@ -35,7 +35,7 @@ install( FILES
-   Phonon/VolumeFaderEffect
-   Phonon/VolumeFaderInterface
-   Phonon/VolumeSlider
+@@ -85,7 +85,7 @@ install( FILES
+   old/Phonon/VolumeFaderEffect
+   old/Phonon/VolumeFaderInterface
+   old/Phonon/VolumeSlider
 -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel)
 +DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/Phonon COMPONENT Devel)
  
  install(FILES
-   Phonon/Experimental/AbstractVideoDataOutput
+   old/Phonon/Experimental/AbstractVideoDataOutput

Modified: trunk/packages/phonon/debian/patches/series
===================================================================
--- trunk/packages/phonon/debian/patches/series	2010-05-08 20:46:28 UTC (rev 17896)
+++ trunk/packages/phonon/debian/patches/series	2010-05-08 21:04:42 UTC (rev 17897)
@@ -1,4 +1,3 @@
 01_phonon-inc.patch
 02_no_rpath.patch
 03_phonon_is_not_forced_in_KDE.diff
-04_skip_pa_detection_if_no_glib_loop.diff

Added: trunk/packages/phonon/debian/watch
===================================================================
--- trunk/packages/phonon/debian/watch	                        (rev 0)
+++ trunk/packages/phonon/debian/watch	2010-05-08 21:04:42 UTC (rev 17897)
@@ -0,0 +1,4 @@
+version=3
+
+opts=uversionmangle=s/^/4.6.0really/ \
+ftp://ftp.kde.org/pub/kde/stable/phonon/([\d.]+)/ phonon-([\d.]+).tar.bz2