kubuntu-packaging

Merge lp:~panfaust/kubuntu-packaging/meta-kde-work into lp:~kubuntu-packagers/kubuntu-packaging/meta-kde

  1. meta-kde-work
  2. Merge into meta-kde
Proposed by Jose Manuel Santamaria Lema
Status: Needs review
Proposed branch: lp:~panfaust/kubuntu-packaging/meta-kde-work
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/meta-kde
Diff against target: 38 lines (+11/-2)
2 files modified
debian/changelog (+8/-0)
debian/control (+3/-2)
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging/meta-kde-work
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+228393@code.launchpad.net

Description of the change

Add alternative dependencies to prepare the upgrade to plasma 5. This change shouldn't be harmful for KDE SC 4.

NOTE: This proposal has to be merged first:
https://code.launchpad.net/~panfaust/kubuntu-packaging-next/khelpcenter-work/+merge/228392

To post a comment you must log in.

Unmerged revisions

70. By Jose Manuel Santamaria Lema

Add alternative dependencies needed for Plasma 5.

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-10 13:29:01 +0000
3+++ debian/changelog 2014-07-26 12:37:09 +0000
4@@ -1,3 +1,11 @@
5+meta-kde (5:84ubuntu5) UNRELEASED; urgency=medium
6+
7+ * Add alternative dependencies to kde-standard:
8+ - plasma-desktop (>= 4:5.0.0)
9+ - khelpcenter5 (>= 4:5.0.0)
10+
11+ -- José Manuel Santamaría Lema <panfaust@gmail.com> Fri, 25 Jul 2014 18:55:12 +0200
12+
13 meta-kde (5:84ubuntu4) utopic; urgency=medium
14
15 * ktron is called ksnakeduel now
16
17=== modified file 'debian/control'
18--- debian/control 2014-07-10 13:28:22 +0000
19+++ debian/control 2014-07-26 12:37:09 +0000
20@@ -53,7 +53,8 @@
21
22 Package: kde-standard
23 Architecture: all
24-Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}) | kde-plasma-netbook (>= ${source:Version}),
25+Depends: ${misc:Depends},
26+ kde-plasma-desktop (>= ${source:Version}) | kde-plasma-netbook (>= ${source:Version}) | plasma-desktop (>= 4:5.0.0),
27 polkit-kde-1 (>= 0.99), ark (>= ${kde:Version}), dragonplayer (>= ${kde:Version}), gwenview (>= ${kde:Version}),
28 juk (>= ${kde:Version}), kate (>= ${kde:Version}), kcalc (>= ${kde:Version}),
29 kmail (>= ${kdepim:Version}), akregator (>= ${kdepim:Version}), kaddressbook (>= ${kdepim:Version}),
30@@ -61,7 +62,7 @@
31 kwalletmanager (>= ${kde:Version}), korganizer (>= ${kdepim:Version}), kopete (>= ${kde:Version}),
32 kmix (>= ${kde:Version}), ksnapshot (>= ${kde:Version}), kscreensaver (>= ${kde:Version}),
33 okular (>= ${kde:Version}), plasma-desktopthemes-artwork (>= ${kde:Version}), sweeper (>= ${kde:Version}),
34- khelpcenter4 (>= ${kde:Version})
35+ khelpcenter4 (>= ${kde:Version}) | khelpcenter5 (>= 4:5.0.0)
36 Recommends: konq-plugins (>= ${kde:Version}), plasma-widget-networkmanagement,
37 freespacenotifier (>= ${kde:Version}),
38 update-notifier-kde

Subscribers

People subscribed via source and target branches