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

Mon Jul 6 08:34:53 UTC 2009

Author: fabo
Date: 2009-07-06 08:34:51 +0000 (Mon, 06 Jul 2009)
New Revision: 15146

Added:
   trunk/packages/phonon/debian/patches/02_disable_phonon_build.diff
Removed:
   trunk/packages/phonon/debian/libphonon-dev.install
   trunk/packages/phonon/debian/libphonon-dev.links
   trunk/packages/phonon/debian/libphonon4.install
   trunk/packages/phonon/debian/libphonon4.symbols.in
Modified:
   trunk/packages/phonon/debian/README.source
   trunk/packages/phonon/debian/changelog
   trunk/packages/phonon/debian/control
   trunk/packages/phonon/debian/copyright
   trunk/packages/phonon/debian/installgen
   trunk/packages/phonon/debian/patches/01_phonon-inc.patch
   trunk/packages/phonon/debian/patches/series
   trunk/packages/phonon/debian/rules
Log:
* Build Phonon from Qt sources:
  - Add mysel to Uploaders field.
  - Add 02_disable_phonon_build.diff to avoid Phonon build.
  - Add versioned libphonon-dev build dependency.
  - Bump Standards-Version from 3.8.1 to 3.8.2 (no changes needed).
  - Remove phonon, phonon-dbg, libphonon4 and libphonon-dev packages.
  - Cleanup unnecessary files.


Modified: trunk/packages/phonon/debian/README.source
===================================================================

--- trunk/packages/phonon/debian/README.source	2009-07-06 01:38:34 UTC (rev 15145)
+++ trunk/packages/phonon/debian/README.source	2009-07-06 08:34:51 UTC (rev 15146)
@@ -1,6 +1,6 @@
-This package uses quilt for upstream source code patch management. Please read
-/usr/share/doc/quilt/README.source for more information how to apply, unapply,
-add, modify or remove patches.
+This package uses quilt for upstream source code patch management.
+Please read /usr/share/doc/quilt/README.source for more information how to
+apply, unapply, add, modify or remove patches.
 
 Please note that /usr/share/doc/quilt/README.source is only available in quilt
 version 0.46-4.1 or later.

Modified: trunk/packages/phonon/debian/changelog
===================================================================
--- trunk/packages/phonon/debian/changelog	2009-07-06 01:38:34 UTC (rev 15145)
+++ trunk/packages/phonon/debian/changelog	2009-07-06 08:34:51 UTC (rev 15146)
@@ -1,7 +1,19 @@
+phonon (4:4.3.1-2) unstable; urgency=low
+
+  * Build Phonon from Qt sources:
+    - Add mysel to Uploaders field.
+    - Add 02_disable_phonon_build.diff to avoid Phonon build.
+    - Add versioned libphonon-dev build dependency.
+    - Bump Standards-Version from 3.8.1 to 3.8.2 (no changes needed).
+    - Remove phonon, phonon-dbg, libphonon4 and libphonon-dev packages.
+    - Cleanup unnecessary files.
+
+ -- Fathi Boudra <fabo at debian.org>  Mon, 06 Jul 2009 10:26:39 +0200
+
 phonon (4:4.3.1-1) unstable; urgency=low
 
   * New upstream release.
-  
+
   +++ Changes by Modestas Vainius:
 
   * Point Debian Vcs URLs to pkg-kde/trunk (new location).

Modified: trunk/packages/phonon/debian/control
===================================================================
--- trunk/packages/phonon/debian/control	2009-07-06 01:38:34 UTC (rev 15145)
+++ trunk/packages/phonon/debian/control	2009-07-06 08:34:51 UTC (rev 15146)
@@ -2,50 +2,18 @@
 Section: sound
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, cmake (>= 2.6.2), pkg-kde-tools (>= 0.4),
- libqt4-dev, automoc, libglu1-mesa-dev, libqt4-opengl-dev, libxml2-dev, libglib2.0-dev,
- libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libxine-dev,
- libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Modestas Vainius <modestas at vainius.eu>, Fathi Boudra <fabo at debian.org>
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, cmake (>= 2.6.2), pkg-kde-tools (>= 0.4.2), automoc,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libglib2.0-dev, libglu1-mesa-dev, libgstreamer-plugins-base0.10-dev, libgstreamer0.10-dev,
+ libphonon-dev (>= 4:4.5.2), libqt4-dev (>= 4:4.5.2), libqt4-opengl-dev (>= 4:4.5.2),
+ libxine-dev, libxml2-dev
 Build-Conflicts: libxine2
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/phonon
 Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/phonon
 
-Package: phonon
-Architecture: all
-Depends: phonon-backend-xine | phonon-backend, libphonon4 (>= ${source:Version})
-Suggests: phonon-backend-gstreamer, phonon-backend-vlc, phonon-backend-mplayer
-Description: metapackage for Phonon multimedia framework
- Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
- layer for capturing, mixing, processing, and playing audio and video content.
- .
- This metapackage ensures a working Phonon (libphonon4 and a backend).
-
-Package: libphonon-dev
-Section: libdevel
-Architecture: any
-Depends: libphonon4 (= ${binary:Version})
-Replaces: kdelibs5-dev (<< 4:4.0.81)
-Description: development files for the Phonon multimedia framework
- Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
- layer for capturing, mixing, processing, and playing audio and video content.
- .
- This package contains development files for building software that uses the
- Phonon libraries.
-
-Package: libphonon4
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdelibs5 (<= 4:4.0.80)
-Description: Phonon multimedia framework for Qt 4
- Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
- layer for capturing, mixing, processing, and playing audio and video content.
- .
- This package contains the files necessary to run applications that use Phonon.
-
 Package: phonon-backend-xine
 Section: sound
 Architecture: any
@@ -87,15 +55,3 @@
  This package does not provide any real Phonon backend. It can be used to
  disable Phonon audio/video capabilities. Please note that Phonon behaviour 
  with this package installed has not been well tested.
-
-Package: phonon-dbg
-Architecture: any
-Priority: extra
-Depends: libphonon4 (= ${binary:Version})
-Description: Phonon debugging symbols
- Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
- layer for capturing, mixing, processing, and playing audio and video content.
- .
- This package provides Phonon debugging symbols. You should install this
- package when you are about to report a crash or want to debug a problem with
- Phonon.

Modified: trunk/packages/phonon/debian/copyright
===================================================================
--- trunk/packages/phonon/debian/copyright	2009-07-06 01:38:34 UTC (rev 15145)
+++ trunk/packages/phonon/debian/copyright	2009-07-06 08:34:51 UTC (rev 15146)
@@ -3,10 +3,10 @@
 
 It was downloaded from http://websvn.kde.org/branches/phonon/4.3/
 
+Upstream Author:
 
-Upstream Author:  Matthias Kretz <kretz at kde.org> and others.
+    Matthias Kretz <kretz at kde.org> and others.
 
-
 Copyright and licenses:
 
 When nothing is mentioned, the code files in this package are under
@@ -27,7 +27,7 @@
     | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
  
-Detailed copyright and license information for each file can be found below:                          --
+Detailed copyright and license information for each file can be found below:
 
 Files: CMakeLists.txt
 Copyright-And-License: unspecified
@@ -1087,9 +1087,7 @@
 Files: xine/xinethread.*
 Copyright: © 2007, Matthias Kretz <kretz at kde.org>
 License: LGPL-2+
-
  
- 
 -------------------------------------------------------------------------------
 Legend:
  - "LGPL-2":     The GNU Library General Public License, version 2.
@@ -1105,8 +1103,5 @@
 
 -------------------------------------------------------------------------------
 
-
-
 The Debian packaging is (C) 2008-2009, Debian Qt/KDE Maintainers and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-

Modified: trunk/packages/phonon/debian/installgen
===================================================================
--- trunk/packages/phonon/debian/installgen	2009-07-06 01:38:34 UTC (rev 15145)
+++ trunk/packages/phonon/debian/installgen	2009-07-06 08:34:51 UTC (rev 15146)
@@ -3,12 +3,3 @@
 
 [phonon-backend-xine]
 dst:xine
-
-[libphonon4]
-dst:usr/lib/libphonon.*\.so\.4($|\.)
-
-[libphonon-dev]
-dst:usr/include/.*(?i:phonon)/.*
-dst:usr/lib/libphonon.*\.so$
-dst:usr/share/dbus-\d+/
-dst:\.pc$

Modified: trunk/packages/phonon/debian/patches/01_phonon-inc.patch
===================================================================
--- trunk/packages/phonon/debian/patches/01_phonon-inc.patch	2009-07-06 01:38:34 UTC (rev 15145)
+++ trunk/packages/phonon/debian/patches/01_phonon-inc.patch	2009-07-06 08:34:51 UTC (rev 15146)
@@ -1,6 +1,6 @@
 --- a/phonon/CMakeLists.txt
 +++ b/phonon/CMakeLists.txt
-@@ -102,3 +102,7 @@
+@@ -102,3 +102,7 @@ install(FILES
     DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
  
  install(FILES org.kde.Phonon.AudioOutput.xml  DESTINATION  ${DBUS_INTERFACES_INSTALL_DIR})

Added: trunk/packages/phonon/debian/patches/02_disable_phonon_build.diff
===================================================================
--- trunk/packages/phonon/debian/patches/02_disable_phonon_build.diff	                        (rev 0)
+++ trunk/packages/phonon/debian/patches/02_disable_phonon_build.diff	2009-07-06 08:34:51 UTC (rev 15146)
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -250,7 +250,6 @@ endif(APPLE)
+ 
+ 
+ add_subdirectory(cmake)
+-add_subdirectory(phonon)
+ add_subdirectory(includes)
+ if (Q_WS_MAC AND BUILD_PHONON_QT7)
+   add_subdirectory(qt7)

Modified: trunk/packages/phonon/debian/patches/series
===================================================================
--- trunk/packages/phonon/debian/patches/series	2009-07-06 01:38:34 UTC (rev 15145)
+++ trunk/packages/phonon/debian/patches/series	2009-07-06 08:34:51 UTC (rev 15146)
@@ -1 +1,2 @@
 01_phonon-inc.patch
+02_disable_phonon_build.diff

Modified: trunk/packages/phonon/debian/rules
===================================================================
--- trunk/packages/phonon/debian/rules	2009-07-06 01:38:34 UTC (rev 15145)
+++ trunk/packages/phonon/debian/rules	2009-07-06 08:34:51 UTC (rev 15146)
@@ -2,7 +2,4 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
-#PHONON_MINIMUM_VERSION := 4:4.2.0
-#DEB_DH_MAKESHLIBS_ARGS_libphonon4 = -V'libphonon4 (>> $(PHONON_MINIMUM_VERSION)), phonon(>> $(PHONON_MINIMUM_VERSION))'
-
 DEB_DH_SHLIBDEPS_ARGS_ALL = -- -xphonon


