Merge lp:~panfaust/kubuntu-packaging-next/kmediaplayer-work2 into lp:~kubuntu-packagers/kubuntu-packaging-next/kmediaplayer

[Jose Manuel Santamaria Lema]

Add -data package. This merge request is the right version of this wrong one
https://code.launchpad.net/~panfaust/kubuntu-packaging-next/kmediaplayer-work/+merge/224018

[Scarlett Gately Moore (scarlettmoore)]

Something funky going on with the changelog. Looks like you want to merge a bzr conflict?

review: Needs Fixing

Unmerged revisions

33. By Jose Manuel Santamaria Lema on 2014-07-14

Create -data package to provide architecture independent files.

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-08 21:18:14 +0000
+++ debian/changelog	2014-07-15 13:40:40 +0000
@@ -5,8 +5,16 @@
 
   [ Scarlett Clark ]
   * Fix install file 
-  * Update watch file to stable
-  * Add Vcs
+<<<<<<< TREE
+  * Update watch file to stable
+  * Add Vcs
+=======
+  * Update watch file to stable
+  * Add Vcs
+
+  [ José Manuel Santamaría Lema ]
+  * Create -data package to provide architecture independent files.
+>>>>>>> MERGE-SOURCE
 
  -- Jonathan Riddell <[e-mail]>  Wed, 02 Jul 2014 00:39:03 +0200
 
 
=== modified file 'debian/control'
--- debian/control	2014-07-08 21:18:14 +0000
+++ debian/control	2014-07-15 13:40:40 +0000
@@ -59,17 +59,37 @@
 Package: libkf5mediaplayer5
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Plugin interface for media player features.
- It provides all of the necessary media player operations,
- and optionally provides the GUI to control them.
- .
- There are two servicetypes for Player:
- KMediaPlayer/Player and KMediaPlayer/Engine.
- KMediaPlayer/Player provides a widget (accessible
- through view as well as XML GUI KActions.
- KMediaPlayer/Engine omits the user interface facets,
- for those who wish to provide their own interface.
+Depends: libkf5mediaplayer-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Plugin interface for media player features.
+ It provides all of the necessary media player operations,
+ and optionally provides the GUI to control them.
+ .
+ There are two servicetypes for Player:
+ KMediaPlayer/Player and KMediaPlayer/Engine.
+ KMediaPlayer/Player provides a widget (accessible
+ through view as well as XML GUI KActions.
+ KMediaPlayer/Engine omits the user interface facets,
+ for those who wish to provide their own interface.
+
+Package: libkf5mediaplayer-data
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: libkf5mediaplayer5 (<= 5.0.0-0ubuntu1~ubuntu14.10~ppa3)
+Replaces: libkf5mediaplayer5 (<= 5.0.0-0ubuntu1~ubuntu14.10~ppa3)
+Description: Plugin interface for media player features.
+ It provides all of the necessary media player operations,
+ and optionally provides the GUI to control them.
+ .
+ There are two servicetypes for Player:
+ KMediaPlayer/Player and KMediaPlayer/Engine.
+ KMediaPlayer/Player provides a widget (accessible
+ through view as well as XML GUI KActions.
+ KMediaPlayer/Engine omits the user interface facets,
+ for those who wish to provide their own interface.
+ .
+ This package contains the data files.
 
 Package: libkf5mediaplayer5-dbg
 Priority: extra
 
=== added file 'debian/libkf5mediaplayer-data.install'
--- debian/libkf5mediaplayer-data.install	1970-01-01 00:00:00 +0000
+++ debian/libkf5mediaplayer-data.install	2014-07-15 13:40:40 +0000
@@ -0,0 +1,1 @@
+usr/share/kservicetypes5
 
=== modified file 'debian/libkf5mediaplayer5.install'
--- debian/libkf5mediaplayer5.install	2014-07-02 05:22:15 +0000
+++ debian/libkf5mediaplayer5.install	2014-07-15 13:40:40 +0000
@@ -1,2 +1,1 @@
 usr/lib/*/libKF5MediaPlayer.so.5*
-usr/share/kservicetypes5