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

Proposed by Jose Manuel Santamaria Lema
Status: Merged
Merged at revision: 34
Proposed branch: lp:~panfaust/kubuntu-packaging-next/kmediaplayer-work3
Merge into: lp:~kubuntu-packagers/kubuntu-packaging-next/kmediaplayer
Diff against target: 79 lines (+35/-12)
4 files modified
debian/changelog (+3/-0)
debian/control (+31/-11)
debian/libkf5mediaplayer-data.install (+1/-0)
debian/libkf5mediaplayer5.install (+0/-1)
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging-next/kmediaplayer-work3
Reviewer Review Type Date Requested Status
Scarlett Gately Moore Pending
Review via email: mp+226869@code.launchpad.net

This proposal supersedes a proposal from 2014-07-15.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Scarlett Gately Moore (scarlettmoore) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing
Revision history for this message
Jose Manuel Santamaria Lema (panfaust) wrote :

Aparently bazaar did something weird, fixed.

34. By Scarlett Gately Moore

Merge:
[ José Manuel Santamaría Lema ]
Create -data package to provide architecture independent files.

added:
  debian/libkf5mediaplayer-data.install
modified:
  debian/changelog
  debian/control
  debian/libkf5mediaplayer5.install
pending merges:
  José Manuel Santamarí... 2014-07-15 Create -data package to provide architecture independen...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-07-08 21:18:14 +0000
+++ debian/changelog 2014-07-15 15:38:22 +0000
@@ -8,6 +8,9 @@
8 * Update watch file to stable8 * Update watch file to stable
9 * Add Vcs9 * Add Vcs
1010
11 [ José Manuel Santamaría Lema ]
12 * Create -data package to provide architecture independent files.
13
11 -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 02 Jul 2014 00:39:03 +020014 -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 02 Jul 2014 00:39:03 +0200
1215
13kmediaplayer (4.100.0-0ubuntu1) utopic; urgency=medium16kmediaplayer (4.100.0-0ubuntu1) utopic; urgency=medium
1417
=== modified file 'debian/control'
--- debian/control 2014-07-08 21:18:14 +0000
+++ debian/control 2014-07-15 15:38:22 +0000
@@ -59,17 +59,37 @@
59Package: libkf5mediaplayer559Package: libkf5mediaplayer5
60Architecture: any60Architecture: any
61Multi-Arch: same61Multi-Arch: same
62Depends: ${misc:Depends}, ${shlibs:Depends}62Depends: libkf5mediaplayer-data (= ${source:Version}),
63Description: Plugin interface for media player features.63 ${misc:Depends},
64 It provides all of the necessary media player operations,64 ${shlibs:Depends}
65 and optionally provides the GUI to control them.65Description: Plugin interface for media player features.
66 .66 It provides all of the necessary media player operations,
67 There are two servicetypes for Player:67 and optionally provides the GUI to control them.
68 KMediaPlayer/Player and KMediaPlayer/Engine.68 .
69 KMediaPlayer/Player provides a widget (accessible69 There are two servicetypes for Player:
70 through view as well as XML GUI KActions.70 KMediaPlayer/Player and KMediaPlayer/Engine.
71 KMediaPlayer/Engine omits the user interface facets,71 KMediaPlayer/Player provides a widget (accessible
72 for those who wish to provide their own interface.72 through view as well as XML GUI KActions.
73 KMediaPlayer/Engine omits the user interface facets,
74 for those who wish to provide their own interface.
75
76Package: libkf5mediaplayer-data
77Architecture: all
78Depends: ${misc:Depends}
79Breaks: libkf5mediaplayer5 (<= 5.0.0-0ubuntu1~ubuntu14.10~ppa3)
80Replaces: libkf5mediaplayer5 (<= 5.0.0-0ubuntu1~ubuntu14.10~ppa3)
81Description: Plugin interface for media player features.
82 It provides all of the necessary media player operations,
83 and optionally provides the GUI to control them.
84 .
85 There are two servicetypes for Player:
86 KMediaPlayer/Player and KMediaPlayer/Engine.
87 KMediaPlayer/Player provides a widget (accessible
88 through view as well as XML GUI KActions.
89 KMediaPlayer/Engine omits the user interface facets,
90 for those who wish to provide their own interface.
91 .
92 This package contains the data files.
7393
74Package: libkf5mediaplayer5-dbg94Package: libkf5mediaplayer5-dbg
75Priority: extra95Priority: extra
7696
=== added file 'debian/libkf5mediaplayer-data.install'
--- debian/libkf5mediaplayer-data.install 1970-01-01 00:00:00 +0000
+++ debian/libkf5mediaplayer-data.install 2014-07-15 15:38:22 +0000
@@ -0,0 +1,1 @@
1usr/share/kservicetypes5
02
=== modified file 'debian/libkf5mediaplayer5.install'
--- debian/libkf5mediaplayer5.install 2014-07-02 05:22:15 +0000
+++ debian/libkf5mediaplayer5.install 2014-07-15 15:38:22 +0000
@@ -1,2 +1,1 @@
1usr/lib/*/libKF5MediaPlayer.so.5*1usr/lib/*/libKF5MediaPlayer.so.5*
2usr/share/kservicetypes5

Subscribers

People subscribed via source and target branches