← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/phonon/oneiric-201108111512

« back to all changes in this revision

Viewing changes to debian/patches/03_phonon_is_not_forced_in_KDE.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2011-01-24 10:12:11 UTC
  • mfrom: (0.5.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110124101211-w9rew7q0dmwbwhqx
Tags: 4:4.7.0really4.4.4-0ubuntu1
* New upstream release
* Xine and GStreamer backends now split out source, remove build-deps and
  binary packages from debian/control
* Remove 02_no_rpath.patch, now upstream
* Disable kubuntu04_no_va_mangle.patch, no longer applies
* Remove kubuntu_05_gst_codec_installer_window_id.diff, kubuntu_06_forward_events.diff,
  kubuntu_07_include_fix.diff, gstreamer now separate

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_phonon_is_not_forced_in_KDE.diff
2
2
Subject: Install headers where they were earlier
3
3
Forwarded: no
4
4
 
5
 
--- a/includes/CMakeLists.txt
6
 
+++ b/includes/CMakeLists.txt
7
 
@@ -85,7 +85,7 @@ install( FILES
 
5
Index: phonon-4.4.4/includes/CMakeLists.txt
 
6
===================================================================
 
7
--- phonon-4.4.4.orig/includes/CMakeLists.txt   2011-01-19 19:20:00.000000000 +0000
 
8
+++ phonon-4.4.4/includes/CMakeLists.txt        2011-01-24 10:23:12.121121002 +0000
 
9
@@ -87,7 +87,7 @@
8
10
   old/Phonon/VolumeFaderEffect
9
11
   old/Phonon/VolumeFaderInterface
10
12
   old/Phonon/VolumeSlider