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

Proposed by Jose Manuel Santamaria Lema
Status: Superseded
Proposed branch: lp:~panfaust/kubuntu-packaging-next/kmediaplayer-work2
Merge into: lp:~kubuntu-packagers/kubuntu-packaging-next/kmediaplayer
Diff against target: 88 lines (+42/-14) (has conflicts)
4 files modified
debian/changelog (+10/-2)
debian/control (+31/-11)
debian/libkf5mediaplayer-data.install (+1/-0)
debian/libkf5mediaplayer5.install (+0/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging-next/kmediaplayer-work2
Reviewer Review Type Date Requested Status
Scarlett Gately Moore Needs Fixing
Review via email: mp+226827@code.launchpad.net

This proposal has been superseded by 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 :

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

Create -data package to provide architecture independent files.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-07-08 21:18:14 +0000
3+++ debian/changelog 2014-07-15 13:40:40 +0000
4@@ -5,8 +5,16 @@
5
6 [ Scarlett Clark ]
7 * Fix install file
8- * Update watch file to stable
9- * Add Vcs
10+<<<<<<< TREE
11+ * Update watch file to stable
12+ * Add Vcs
13+=======
14+ * Update watch file to stable
15+ * Add Vcs
16+
17+ [ José Manuel Santamaría Lema ]
18+ * Create -data package to provide architecture independent files.
19+>>>>>>> MERGE-SOURCE
20
21 -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 02 Jul 2014 00:39:03 +0200
22
23
24=== modified file 'debian/control'
25--- debian/control 2014-07-08 21:18:14 +0000
26+++ debian/control 2014-07-15 13:40:40 +0000
27@@ -59,17 +59,37 @@
28 Package: libkf5mediaplayer5
29 Architecture: any
30 Multi-Arch: same
31-Depends: ${misc:Depends}, ${shlibs:Depends}
32-Description: Plugin interface for media player features.
33- It provides all of the necessary media player operations,
34- and optionally provides the GUI to control them.
35- .
36- There are two servicetypes for Player:
37- KMediaPlayer/Player and KMediaPlayer/Engine.
38- KMediaPlayer/Player provides a widget (accessible
39- through view as well as XML GUI KActions.
40- KMediaPlayer/Engine omits the user interface facets,
41- for those who wish to provide their own interface.
42+Depends: libkf5mediaplayer-data (= ${source:Version}),
43+ ${misc:Depends},
44+ ${shlibs:Depends}
45+Description: Plugin interface for media player features.
46+ It provides all of the necessary media player operations,
47+ and optionally provides the GUI to control them.
48+ .
49+ There are two servicetypes for Player:
50+ KMediaPlayer/Player and KMediaPlayer/Engine.
51+ KMediaPlayer/Player provides a widget (accessible
52+ through view as well as XML GUI KActions.
53+ KMediaPlayer/Engine omits the user interface facets,
54+ for those who wish to provide their own interface.
55+
56+Package: libkf5mediaplayer-data
57+Architecture: all
58+Depends: ${misc:Depends}
59+Breaks: libkf5mediaplayer5 (<= 5.0.0-0ubuntu1~ubuntu14.10~ppa3)
60+Replaces: libkf5mediaplayer5 (<= 5.0.0-0ubuntu1~ubuntu14.10~ppa3)
61+Description: Plugin interface for media player features.
62+ It provides all of the necessary media player operations,
63+ and optionally provides the GUI to control them.
64+ .
65+ There are two servicetypes for Player:
66+ KMediaPlayer/Player and KMediaPlayer/Engine.
67+ KMediaPlayer/Player provides a widget (accessible
68+ through view as well as XML GUI KActions.
69+ KMediaPlayer/Engine omits the user interface facets,
70+ for those who wish to provide their own interface.
71+ .
72+ This package contains the data files.
73
74 Package: libkf5mediaplayer5-dbg
75 Priority: extra
76
77=== added file 'debian/libkf5mediaplayer-data.install'
78--- debian/libkf5mediaplayer-data.install 1970-01-01 00:00:00 +0000
79+++ debian/libkf5mediaplayer-data.install 2014-07-15 13:40:40 +0000
80@@ -0,0 +1,1 @@
81+usr/share/kservicetypes5
82
83=== modified file 'debian/libkf5mediaplayer5.install'
84--- debian/libkf5mediaplayer5.install 2014-07-02 05:22:15 +0000
85+++ debian/libkf5mediaplayer5.install 2014-07-15 13:40:40 +0000
86@@ -1,2 +1,1 @@
87 usr/lib/*/libKF5MediaPlayer.so.5*
88-usr/share/kservicetypes5

Subscribers

People subscribed via source and target branches