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
=== modified file 'debian/changelog'
--- debian/changelog 2010-12-03 18:26:33 +0000
+++ debian/changelog 2010-12-07 16:30:56 +0000
@@ -1,3 +1,12 @@
1kdeartwork (4:4.5.85-0ubuntu1) natty; urgency=low
2
3 * New upstream beta release
4 * kdeartwork-theme-window replaces kde-window-manager (<< 4:4.5.80)
5 * Add libkexiv2-dev to build-depends
6 * update plasma-desktopthemes-artwork.install
7
8 -- Philip Muskovac <yofel@gmx.net> Sat, 04 Dec 2010 18:38:49 +0100
9
1kdeartwork (4:4.5.80-0ubuntu4) natty; urgency=low10kdeartwork (4:4.5.80-0ubuntu4) natty; urgency=low
211
3 * kdeartwork-theme-window replaces aurorae-themes-artwork12 * kdeartwork-theme-window replaces aurorae-themes-artwork
413
=== modified file 'debian/control'
--- debian/control 2010-12-01 21:00:16 +0000
+++ debian/control 2010-12-07 16:30:56 +0000
@@ -9,7 +9,7 @@
9 cdbs (>= 0.4.51), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.9),9 cdbs (>= 0.4.51), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.9),
10 kdebase-workspace-dev (>= 4:4.5), libxt-dev, libstreamanalyzer-dev (>= 0.6.3),10 kdebase-workspace-dev (>= 4:4.5), libxt-dev, libstreamanalyzer-dev (>= 0.6.3),
11 xscreensaver, xscreensaver-data, xscreensaver-gl,11 xscreensaver, xscreensaver-data, xscreensaver-gl,
12 libqt4-opengl-dev, libeigen2-dev12 libqt4-opengl-dev, libeigen2-dev, libkexiv2-dev
13Standards-Version: 3.8.413Standards-Version: 3.8.4
14Homepage: http://www.kde.org/14Homepage: http://www.kde.org/
15Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeartwork/ubuntu15Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeartwork/ubuntu
@@ -88,8 +88,8 @@
88Package: kdeartwork-theme-window88Package: kdeartwork-theme-window
89Architecture: any89Architecture: any
90Depends: ${misc:Depends}90Depends: ${misc:Depends}
91Replaces: aurorae-themes-artwork91Replaces: aurorae-themes-artwork, kde-window-manager (<< 4:4.5.80)
92Conflicts: aurorae-themes-artwork92Conflicts: aurorae-themes-artwork, kde-window-manager (<< 4:4.5.80)
93Section: kde93Section: kde
94Description: window decoration for the K Window manager (KWin)94Description: window decoration for the K Window manager (KWin)
95 This package contains additional window decorations for K Window Manager95 This package contains additional window decorations for K Window Manager
9696
=== modified file 'debian/plasma-desktopthemes-artwork.install'
--- debian/plasma-desktopthemes-artwork.install 2010-11-25 18:13:34 +0000
+++ debian/plasma-desktopthemes-artwork.install 2010-12-07 16:30:56 +0000
@@ -179,22 +179,20 @@
179usr/share/kde4/apps/desktoptheme/slim-glow/widgets/background.svgz179usr/share/kde4/apps/desktoptheme/slim-glow/widgets/background.svgz
180usr/share/kde4/apps/desktoptheme/slim-glow/widgets/bar_meter_horizontal.svgz180usr/share/kde4/apps/desktoptheme/slim-glow/widgets/bar_meter_horizontal.svgz
181usr/share/kde4/apps/desktoptheme/slim-glow/widgets/bar_meter_vertical.svgz181usr/share/kde4/apps/desktoptheme/slim-glow/widgets/bar_meter_vertical.svgz
182usr/share/kde4/apps/desktoptheme/slim-glow/widgets/calendar.svgz182usr/share/kde4/apps/desktoptheme/slim-glow/widgets/button.svgz
183usr/share/kde4/apps/desktoptheme/slim-glow/widgets/clock.svgz183usr/share/kde4/apps/desktoptheme/slim-glow/widgets/clock.svgz
184usr/share/kde4/apps/desktoptheme/slim-glow/widgets/configuration-icons.svgz184usr/share/kde4/apps/desktoptheme/slim-glow/widgets/configuration-icons.svgz
185usr/share/kde4/apps/desktoptheme/slim-glow/widgets/dragger.svgz185usr/share/kde4/apps/desktoptheme/slim-glow/widgets/dragger.svgz
186usr/share/kde4/apps/desktoptheme/slim-glow/widgets/extender-background.svgz186usr/share/kde4/apps/desktoptheme/slim-glow/widgets/extender-background.svgz
187usr/share/kde4/apps/desktoptheme/slim-glow/widgets/extender-dragger.svgz 187usr/share/kde4/apps/desktoptheme/slim-glow/widgets/extender-dragger.svgz
188usr/share/kde4/apps/desktoptheme/slim-glow/widgets/glowbar.svgz188usr/share/kde4/apps/desktoptheme/slim-glow/widgets/glowbar.svgz
189usr/share/kde4/apps/desktoptheme/slim-glow/widgets/iconbutton.svgz189usr/share/kde4/apps/desktoptheme/slim-glow/widgets/lineedit.svgz
190usr/share/kde4/apps/desktoptheme/slim-glow/widgets/notes.svgz190usr/share/kde4/apps/desktoptheme/slim-glow/widgets/notes.svgz
191usr/share/kde4/apps/desktoptheme/slim-glow/widgets/panel-background.svgz191usr/share/kde4/apps/desktoptheme/slim-glow/widgets/panel-background.svgz
192usr/share/kde4/apps/desktoptheme/slim-glow/widgets/picture-frame-default.svgz192usr/share/kde4/apps/desktoptheme/slim-glow/widgets/picture-frame-default.svgz
193usr/share/kde4/apps/desktoptheme/slim-glow/widgets/plot-background.svgz
194usr/share/kde4/apps/desktoptheme/slim-glow/widgets/scrollbar.svgz193usr/share/kde4/apps/desktoptheme/slim-glow/widgets/scrollbar.svgz
195usr/share/kde4/apps/desktoptheme/slim-glow/widgets/systemtray.svgz194usr/share/kde4/apps/desktoptheme/slim-glow/widgets/systemtray.svgz
196usr/share/kde4/apps/desktoptheme/slim-glow/widgets/tasks.svgz195usr/share/kde4/apps/desktoptheme/slim-glow/widgets/tasks.svgz
197usr/share/kde4/apps/desktoptheme/slim-glow/widgets/toolbox-button.svgz
198usr/share/kde4/apps/desktoptheme/slim-glow/widgets/tooltip.svgz196usr/share/kde4/apps/desktoptheme/slim-glow/widgets/tooltip.svgz
199usr/share/kde4/apps/desktoptheme/slim-glow/widgets/translucentbackground.svgz197usr/share/kde4/apps/desktoptheme/slim-glow/widgets/translucentbackground.svgz
200usr/share/kde4/apps/desktoptheme/slim-glow/widgets/viewitem.svgz198usr/share/kde4/apps/desktoptheme/slim-glow/widgets/viewitem.svgz

Subscribers

People subscribed via source and target branches

to all changes: