kubuntu-packaging

Merge lp:~yofel/kubuntu-packaging/kde-workspace_install-workspace-wallpapers-too into lp:~kubuntu-packagers/kubuntu-packaging/kde-workspace

  1. kde-workspace_install-workspace-wallpapers-too
  2. Merge into kde-workspace
Proposed by Philip Muškovac
Status: Merged
Merged at revision: 544
Proposed branch: lp:~yofel/kubuntu-packaging/kde-workspace_install-workspace-wallpapers-too
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kde-workspace
Diff against target: 85 lines (+19/-11)
2 files modified
debian/changelog (+7/-0)
debian/patches/kubuntu_03_kdewallpapers_install.diff (+12/-11)
To merge this branch: bzr merge lp:~yofel/kubuntu-packaging/kde-workspace_install-workspace-wallpapers-too
Reviewer Review Type Date Requested Status
Felix Geyer Needs Fixing
Review via email: mp+70924@code.launchpad.net

Description of the change

This makes the 'Install Default Wallpapers' install kde-wallpapers too, not only kdewallpapers.
(Requested by kdeartwork maintainer)

To post a comment you must log in.
Revision history for this message
Felix Geyer (debfx) wrote :

"kdewallpapers kde-wallpapers" should be "kdewallpapers" << "kde-wallpapers".

review: Needs Fixing
lp:~yofel/kubuntu-packaging/kde-workspace_install-workspace-wallpapers-too updated
544. By Philip Muškovac

Fix cout syntax

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 2011-08-09 04:18:34 +0000
3+++ debian/changelog 2011-08-09 17:42:37 +0000
4@@ -1,3 +1,10 @@
5+kde-workspace (4:4.7.0-0ubuntu5) oneiric; urgency=low
6+
7+ * Update kubuntu_03_kdewallpapers_install.diff to also install the
8+ default workspace wallpapers from kde-wallpapers.
9+
10+ -- Philip Muškovac <yofel@kubuntu.org> Tue, 09 Aug 2011 18:05:57 +0200
11+
12 kde-workspace (4:4.7.0-0ubuntu4) oneiric; urgency=low
13
14 * Switch to dh_python2:
15
16=== modified file 'debian/patches/kubuntu_03_kdewallpapers_install.diff'
17--- debian/patches/kubuntu_03_kdewallpapers_install.diff 2011-07-08 18:58:26 +0000
18+++ debian/patches/kubuntu_03_kdewallpapers_install.diff 2011-08-09 17:42:37 +0000
19@@ -1,7 +1,7 @@
20-Index: kde-workspace-4.6.90/plasma/generic/wallpapers/image/image.cpp
21+Index: kde-workspace-4.7.0/plasma/generic/wallpapers/image/image.cpp
22 ===================================================================
23---- kde-workspace-4.6.90.orig/plasma/generic/wallpapers/image/image.cpp 2011-07-08 19:35:51.003591744 +0200
24-+++ kde-workspace-4.6.90/plasma/generic/wallpapers/image/image.cpp 2011-07-08 19:35:57.633591746 +0200
25+--- kde-workspace-4.7.0.orig/plasma/generic/wallpapers/image/image.cpp 2011-07-31 00:12:15.420088807 +0200
26++++ kde-workspace-4.7.0/plasma/generic/wallpapers/image/image.cpp 2011-08-09 18:02:16.288643826 +0200
27 @@ -35,6 +35,9 @@
28 #include "removebuttonmanager.h"
29 #include "ksmserver_interface.h"
30@@ -22,11 +22,12 @@
31 {
32 connect(this, SIGNAL(renderCompleted(QImage)), this, SLOT(updateBackground(QImage)));
33 connect(&m_timer, SIGNAL(timeout()), this, SLOT(nextSlide()));
34-@@ -167,6 +171,16 @@
35+@@ -167,6 +171,17 @@
36 RemoveButtonManager *rmManager = new RemoveButtonManager(m_uiImage.m_view, &m_usersWallpapers);
37 connect(rmManager, SIGNAL(removeClicked(QString)), this, SLOT(removeWallpaper(QString)));
38
39-+ if (!QFile::exists("/var/lib/dpkg/info/kdewallpapers.list") &&
40++ if ((!QFile::exists("/var/lib/dpkg/info/kdewallpapers.list") ||
41++ !QFile::exists("/var/lib/dpkg/info/kde-wallpapers.list")) &&
42 + QFile::exists("/usr/bin/qapt-batch")) {
43 + m_installDefaultWallpaperButton = new KPushButton(m_configWidget);
44 + m_installDefaultWallpaperButton->setText(i18nc("@action:button", "Install Default Wallpapers..."));
45@@ -39,7 +40,7 @@
46 m_uiImage.m_pictureUrlButton->setIcon(KIcon("document-open"));
47 connect(m_uiImage.m_pictureUrlButton, SIGNAL(clicked()), this, SLOT(showFileDialog()));
48
49-@@ -854,4 +868,32 @@
50+@@ -854,4 +869,32 @@
51 }
52 }
53
54@@ -48,7 +49,7 @@
55 + KProcess *p = new KProcess(this);
56 + *p << "/usr/bin/qapt-batch";
57 + *p << "--attach" << QString::number(static_cast<int>(KWindowSystem::activeWindow()));
58-+ *p << "--install" << "kdewallpapers";
59++ *p << "--install" << "kdewallpapers" << "kde-wallpapers";
60 + connect(p, SIGNAL(finished(int,QProcess::ExitStatus)),
61 + this, SLOT(installDefaultWallpapersFinished(int)));
62 + p->start();
63@@ -63,7 +64,7 @@
64 + if (m_configWindow) {
65 + m_configWindow->setEnabled(true);
66 + }
67-+ if (exitCode == 0 && QFile::exists("/var/lib/dpkg/info/kdewallpapers.list")) {
68++ if (exitCode == 0 && QFile::exists("/var/lib/dpkg/info/kdewallpapers.list") && QFile::exists("/var/lib/dpkg/info/kde-wallpapers.list")) {
69 + if (m_model) {
70 + m_model->reload();
71 + }
72@@ -72,10 +73,10 @@
73 +}
74 +
75 #include "image.moc"
76-Index: kde-workspace-4.6.90/plasma/generic/wallpapers/image/image.h
77+Index: kde-workspace-4.7.0/plasma/generic/wallpapers/image/image.h
78 ===================================================================
79---- kde-workspace-4.6.90.orig/plasma/generic/wallpapers/image/image.h 2011-07-08 19:35:51.023591744 +0200
80-+++ kde-workspace-4.6.90/plasma/generic/wallpapers/image/image.h 2011-07-08 19:35:57.633591746 +0200
81+--- kde-workspace-4.7.0.orig/plasma/generic/wallpapers/image/image.h 2011-07-31 00:12:15.400088807 +0200
82++++ kde-workspace-4.7.0/plasma/generic/wallpapers/image/image.h 2011-07-31 00:13:47.850089435 +0200
83 @@ -132,6 +132,14 @@
84
85 QAction* m_nextWallpaperAction;

Subscribers

People subscribed via source and target branches

to all changes: