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

Proposed by Philip Muškovac
Status: Merged
Merged at revision: 94
Proposed branch: lp:~yofel/kdeartwork/4.5.85
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kdeartwork
Diff against target: 69 lines (+14/-7)
3 files modified
debian/changelog (+9/-0)
debian/control (+3/-3)
debian/plasma-desktopthemes-artwork.install (+2/-4)
To merge this branch: bzr merge lp:~yofel/kdeartwork/4.5.85
Reviewer Review Type Date Requested Status
Kubuntu Members Pending
Review via email: mp+42970@code.launchpad.net

Description of the change

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-12-03 18:26:33 +0000
3+++ debian/changelog 2010-12-07 16:30:56 +0000
4@@ -1,3 +1,12 @@
5+kdeartwork (4:4.5.85-0ubuntu1) natty; urgency=low
6+
7+ * New upstream beta release
8+ * kdeartwork-theme-window replaces kde-window-manager (<< 4:4.5.80)
9+ * Add libkexiv2-dev to build-depends
10+ * update plasma-desktopthemes-artwork.install
11+
12+ -- Philip Muskovac <yofel@gmx.net> Sat, 04 Dec 2010 18:38:49 +0100
13+
14 kdeartwork (4:4.5.80-0ubuntu4) natty; urgency=low
15
16 * kdeartwork-theme-window replaces aurorae-themes-artwork
17
18=== modified file 'debian/control'
19--- debian/control 2010-12-01 21:00:16 +0000
20+++ debian/control 2010-12-07 16:30:56 +0000
21@@ -9,7 +9,7 @@
22 cdbs (>= 0.4.51), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.9),
23 kdebase-workspace-dev (>= 4:4.5), libxt-dev, libstreamanalyzer-dev (>= 0.6.3),
24 xscreensaver, xscreensaver-data, xscreensaver-gl,
25- libqt4-opengl-dev, libeigen2-dev
26+ libqt4-opengl-dev, libeigen2-dev, libkexiv2-dev
27 Standards-Version: 3.8.4
28 Homepage: http://www.kde.org/
29 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeartwork/ubuntu
30@@ -88,8 +88,8 @@
31 Package: kdeartwork-theme-window
32 Architecture: any
33 Depends: ${misc:Depends}
34-Replaces: aurorae-themes-artwork
35-Conflicts: aurorae-themes-artwork
36+Replaces: aurorae-themes-artwork, kde-window-manager (<< 4:4.5.80)
37+Conflicts: aurorae-themes-artwork, kde-window-manager (<< 4:4.5.80)
38 Section: kde
39 Description: window decoration for the K Window manager (KWin)
40 This package contains additional window decorations for K Window Manager
41
42=== modified file 'debian/plasma-desktopthemes-artwork.install'
43--- debian/plasma-desktopthemes-artwork.install 2010-11-25 18:13:34 +0000
44+++ debian/plasma-desktopthemes-artwork.install 2010-12-07 16:30:56 +0000
45@@ -179,22 +179,20 @@
46 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/background.svgz
47 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/bar_meter_horizontal.svgz
48 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/bar_meter_vertical.svgz
49-usr/share/kde4/apps/desktoptheme/slim-glow/widgets/calendar.svgz
50+usr/share/kde4/apps/desktoptheme/slim-glow/widgets/button.svgz
51 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/clock.svgz
52 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/configuration-icons.svgz
53 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/dragger.svgz
54 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/extender-background.svgz
55 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/extender-dragger.svgz
56 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/glowbar.svgz
57-usr/share/kde4/apps/desktoptheme/slim-glow/widgets/iconbutton.svgz
58+usr/share/kde4/apps/desktoptheme/slim-glow/widgets/lineedit.svgz
59 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/notes.svgz
60 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/panel-background.svgz
61 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/picture-frame-default.svgz
62-usr/share/kde4/apps/desktoptheme/slim-glow/widgets/plot-background.svgz
63 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/scrollbar.svgz
64 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/systemtray.svgz
65 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/tasks.svgz
66-usr/share/kde4/apps/desktoptheme/slim-glow/widgets/toolbox-button.svgz
67 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/tooltip.svgz
68 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/translucentbackground.svgz
69 usr/share/kde4/apps/desktoptheme/slim-glow/widgets/viewitem.svgz

Subscribers

People subscribed via source and target branches

to all changes: