KDE Artwork

Merge lp:~yofel/kdeartwork/lp-682467 into lp:~kubuntu-packagers/kubuntu-packaging/kdeartwork

  1. lp-682467
  2. Merge into kdeartwork
Proposed by Philip Muškovac
Status: Merged
Merged at revision: 89
Proposed branch: lp:~yofel/kdeartwork/lp-682467
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kdeartwork
Diff against target: 30 lines (+7/-3)
2 files modified
debian/changelog (+7/-0)
debian/kscreensaver-xsavers-extra.install (+0/-3)
To merge this branch: bzr merge lp:~yofel/kdeartwork/lp-682467
Reviewer Review Type Date Requested Status
Jonathan Riddell Pending
Review via email: mp+42121@code.launchpad.net

Description of the change

Remove the files that were added to kscreensaver-xsavers for 4.5.80 from kscreensaver-xsavers-extra

To post a comment you must log in.

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 2010-11-28 16:00:12 +0000
3+++ debian/changelog 2010-11-29 15:18:34 +0000
4@@ -1,3 +1,10 @@
5+kdeartwork (4:4.5.80-0ubuntu3) natty; urgency=low
6+
7+ * remove fiberlamp, glcells and glschool from kscreensaver-xsavers-extra
8+ since they moved to kscreensaver-xsavers (LP: #682467)
9+
10+ -- Philip Muskovac <yofel@gmx.net> Mon, 29 Nov 2010 15:53:25 +0100
11+
12 kdeartwork (4:4.5.80-0ubuntu2) natty; urgency=low
13
14 * kdeartwork-dbg conflicts/replaces kdebase-workspace-dbg (<< 4:4.5.80)
15
16=== modified file 'debian/kscreensaver-xsavers-extra.install'
17--- debian/kscreensaver-xsavers-extra.install 2010-01-20 23:32:07 +0000
18+++ debian/kscreensaver-xsavers-extra.install 2010-11-29 15:18:34 +0000
19@@ -190,11 +190,8 @@
20 ../../kscreensaver/kxsconfig/ScreenSavers/cube21.desktop usr/share/kde4/services/ScreenSavers/
21 ../../kscreensaver/kxsconfig/ScreenSavers/cubicgrid.desktop usr/share/kde4/services/ScreenSavers/
22 ../../kscreensaver/kxsconfig/ScreenSavers/cwaves.desktop usr/share/kde4/services/ScreenSavers/
23-../../kscreensaver/kxsconfig/ScreenSavers/fiberlamp.desktop usr/share/kde4/services/ScreenSavers/
24 ../../kscreensaver/kxsconfig/ScreenSavers/fliptext.desktop usr/share/kde4/services/ScreenSavers/
25-../../kscreensaver/kxsconfig/ScreenSavers/glcells.desktop usr/share/kde4/services/ScreenSavers/
26 ../../kscreensaver/kxsconfig/ScreenSavers/glhanoi.desktop usr/share/kde4/services/ScreenSavers/
27-../../kscreensaver/kxsconfig/ScreenSavers/glschool.desktop usr/share/kde4/services/ScreenSavers/
28 ../../kscreensaver/kxsconfig/ScreenSavers/hypnowheel.desktop usr/share/kde4/services/ScreenSavers/
29 ../../kscreensaver/kxsconfig/ScreenSavers/interaggregate.desktop usr/share/kde4/services/ScreenSavers/
30 ../../kscreensaver/kxsconfig/ScreenSavers/juggler3d.desktop usr/share/kde4/services/ScreenSavers/

Subscribers

People subscribed via source and target branches

to all changes: