Unity Settings Panels

Merge lp:~jbicha/gnome-control-center-unity/rename-desktop-for-38 into lp:gnome-control-center-unity

  1. rename-desktop-for-38
  2. Merge into trunk
Proposed by Jeremy Bícha
Status: Merged
Approved by: Michael Terry
Approved revision: 29
Merged at revision: 29
Proposed branch: lp:~jbicha/gnome-control-center-unity/rename-desktop-for-38
Merge into: lp:gnome-control-center-unity
Diff against target: 46 lines (+9/-3)
4 files modified
appearance/Makefile.am (+1/-1)
debian/changelog (+6/-0)
debian/lintian-overrides (+1/-1)
po/POTFILES.in (+1/-1)
To merge this branch: bzr merge lp:~jbicha/gnome-control-center-unity/rename-desktop-for-38
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Terry Approve
Review via email: mp+167608@code.launchpad.net

Commit message

Rename .desktop file for compatibility with gnome-control-center 3.8

Description of the change

gnome-control-center 3.8 looks for .desktop files for native panels in the format gnome-NAMEOFPANEL-panel.desktop.

To post a comment you must log in.
Revision history for this message
Jeremy Bícha (jbicha) wrote :

I bumped the original version number since otherwise moving the source files caused it not to build.

Revision history for this message
Michael Terry (mterry) wrote :

Looks fine, thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~jbicha/gnome-control-center-unity/rename-desktop-for-38/+merge/167608/+edit-commit-message

review: Needs Fixing (continuous-integration)
lp:~jbicha/gnome-control-center-unity/rename-desktop-for-38 updated
28. By PS Jenkins bot

Releasing 1.3daily13.06.13-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

29. By Jeremy Bícha

Rename .desktop file for compatibility with gnome-control-center 3.8

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'appearance/Makefile.am'
2--- appearance/Makefile.am 2012-11-16 18:50:01 +0000
3+++ appearance/Makefile.am 2013-06-13 16:25:29 +0000
4@@ -14,7 +14,7 @@
5
6 @INTLTOOL_DESKTOP_RULE@
7 desktopdir = $(datadir)/applications
8-desktop_DATA = gnome-control-center-unity-appearance.desktop
9+desktop_DATA = gnome-unity-appearance-panel.desktop
10
11 INCLUDES = \
12 $(APPEARANCE_PANEL_CFLAGS) \
13
14=== renamed file 'appearance/gnome-control-center-unity-appearance.desktop.in' => 'appearance/gnome-unity-appearance-panel.desktop.in'
15=== modified file 'debian/changelog'
16--- debian/changelog 2013-06-13 00:02:38 +0000
17+++ debian/changelog 2013-06-13 16:25:29 +0000
18@@ -1,3 +1,9 @@
19+gnome-control-center-unity (1.3daily13.06.14-0ubuntu1) UNRELEASED; urgency=low
20+
21+ * Rename .desktop file for compatibility with gnome-control-center 3.8
22+
23+ -- Jeremy Bicha <jbicha@ubuntu.com> Thu, 13 Jun 2013 12:22:17 -0400
24+
25 gnome-control-center-unity (1.3daily13.06.13-0ubuntu1) saucy; urgency=low
26
27 [ Sebastien Bacher ]
28
29=== modified file 'debian/lintian-overrides'
30--- debian/lintian-overrides 2012-11-16 18:50:01 +0000
31+++ debian/lintian-overrides 2013-06-13 16:25:29 +0000
32@@ -1,1 +1,1 @@
33-gnome-control-center-unity: desktop-command-not-in-package usr/share/applications/gnome-control-center-unity-appearance.desktop gnome-control-center
34+gnome-control-center-unity: desktop-command-not-in-package usr/share/applications/gnome-unity-appearance-panel.desktop gnome-control-center
35
36=== modified file 'po/POTFILES.in'
37--- po/POTFILES.in 2012-11-16 18:50:01 +0000
38+++ po/POTFILES.in 2013-06-13 16:25:29 +0000
39@@ -1,6 +1,6 @@
40 [encoding: UTF-8]
41 [type: gettext/glade]appearance/appearance.ui
42-appearance/gnome-control-center-unity-appearance.desktop.in
43+appearance/gnome-unity-appearance-panel.desktop.in
44 appearance/background-module.c
45 appearance/bg-colors-source.c
46 appearance/bg-flickr-source.c

Subscribers

People subscribed via source and target branches

to all changes: