Merge lp:~panfaust/kubuntu-packaging-next/kparts-work into lp:~kubuntu-packagers/kubuntu-packaging-next/kparts

Proposed by Jose Manuel Santamaria Lema
Status: Superseded
Proposed branch: lp:~panfaust/kubuntu-packaging-next/kparts-work
Merge into: lp:~kubuntu-packagers/kubuntu-packaging-next/kparts
Diff against target: 72 lines (+29/-3)
5 files modified
debian/changelog (+2/-0)
debian/control (+25/-1)
debian/libkf5parts-bin.install (+1/-0)
debian/libkf5parts-data.install (+1/-0)
debian/libkf5parts5.install (+0/-2)
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging-next/kparts-work
Reviewer Review Type Date Requested Status
Scarlett Gately Moore Needs Fixing
Review via email: mp+224005@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-21.

Description of the change

Create libkf5parts-bin and libkf5parts-data to provide runtime and architecture independent files.

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

please change -data 32 +Architecture: any to +Architecture: all

review: Needs Fixing
30. By Scarlett Gately Moore

Merge:
Create libkf5parts-bin and libkf5parts-data to provide runtime and
architecture independent files.

added:
  debian/libkf5parts-bin.install
  debian/libkf5parts-data.install
modified:
  debian/changelog
  debian/control
  debian/libkf5parts5.install
pending merges:
  José Manuel Santamaría Lema 2014-06-21 Set correct architecture and multi-arch field for -data.
    José Manuel Santamaría Lema 2014-06-21 Create libkf5parts-bin and libkf5parts-data.

31. By Jonathan Riddell

released

32. By Jonathan Riddell

Initial stable upstream release

33. By Scarlett Gately Moore

Fix install file

34. By Scarlett Gately Moore

fix watch, add VCS

35. By Rohan Garg

Cleanup, rename libkf5parts-bin to libkf5parts-plugins, fix regex

36. By Rohan Garg

releasing package kparts version 5.0.0-0ubuntu1

37. By Scarlett Gately Moore

Update copyright to match licensing to source

modified:
  debian/changelog
  debian/copyright

38. By Jonathan Riddell

add e.v. licence to copyright

39. By Jose Manuel Santamaria Lema

Update libraries *.install paths so a soname bump doesn't go unnoticed.

Unmerged revisions

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-06-06 14:26:38 +0000
3+++ debian/changelog 2014-06-21 14:14:07 +0000
4@@ -17,6 +17,8 @@
5
6 [ José Manuel Santamaría Lema ]
7 * Build depend on kio-dev instead of kf5-kio-dev.
8+ * Create libkf5parts-bin and libkf5parts-data to provide runtime and
9+ architecture independent files.
10
11 -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 02 Jun 2014 13:42:57 +0100
12
13
14=== modified file 'debian/control'
15--- debian/control 2014-06-07 07:13:00 +0000
16+++ debian/control 2014-06-21 14:14:07 +0000
17@@ -52,9 +52,33 @@
18 .
19 Contains development files for kparts.
20
21+Package: libkf5parts-bin
22+Architecture: any
23+Depends: ${misc:Depends}, ${shlibs:Depends}
24+Breaks: libkf5parts5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa4)
25+Replaces: libkf5parts5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa4)
26+Description: Document centric plugin system.
27+ Framework providing elaborate user-interface components.
28+ .
29+ This package contains the runtime files.
30+
31+Package: libkf5parts-data
32+Architecture: all
33+Depends: ${misc:Depends}
34+Multi-arch: foreign
35+Breaks: libkf5parts5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa4)
36+Replaces: libkf5parts5 (<= 4.100.0-0ubuntu1~ubuntu14.10~ppa4)
37+Description: Document centric plugin system.
38+ Framework providing elaborate user-interface components.
39+ .
40+ This package contains the data files.
41+
42 Package: libkf5parts5
43 Architecture: any
44-Depends: ${misc:Depends}, ${shlibs:Depends}
45+Depends: libkf5parts-data (= ${source:Version}),
46+ ${misc:Depends},
47+ ${shlibs:Depends}
48+Recommends: libkf5parts-bin (= ${binary:Version})
49 Description: Document centric plugin system.
50 Framework providing elaborate user-interface components.
51 Multi-Arch: same
52
53=== added file 'debian/libkf5parts-bin.install'
54--- debian/libkf5parts-bin.install 1970-01-01 00:00:00 +0000
55+++ debian/libkf5parts-bin.install 2014-06-21 14:14:07 +0000
56@@ -0,0 +1,1 @@
57+usr/lib/*/qt5/*
58
59=== added file 'debian/libkf5parts-data.install'
60--- debian/libkf5parts-data.install 1970-01-01 00:00:00 +0000
61+++ debian/libkf5parts-data.install 2014-06-21 14:14:07 +0000
62@@ -0,0 +1,1 @@
63+usr/share/*
64
65=== modified file 'debian/libkf5parts5.install'
66--- debian/libkf5parts5.install 2014-05-21 15:28:32 +0000
67+++ debian/libkf5parts5.install 2014-06-21 14:14:07 +0000
68@@ -1,4 +1,2 @@
69 usr/lib/*/libKF5Parts.so.4*
70 usr/lib/*/libKF5Parts.so.5
71-usr/lib/*/qt5/*
72-usr/share/*

Subscribers

People subscribed via source and target branches