Indicator Date and Time

Merge lp:~jbicha/indicator-datetime/rename-desktop-for-38 into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

  1. rename-desktop-for-38
  2. Merge into trunk.13.10
Proposed by Jeremy Bícha
Status: Merged
Approved by: Ted Gould
Approved revision: 220
Merged at revision: 220
Proposed branch: lp:~jbicha/indicator-datetime/rename-desktop-for-38
Merge into: lp:~indicator-applet-developers/indicator-datetime/trunk.13.10
Diff against target: 47 lines (+11/-5)
3 files modified
data/Makefile.am (+4/-4)
debian/changelog (+6/-0)
po/POTFILES.in (+1/-1)
To merge this branch: bzr merge lp:~jbicha/indicator-datetime/rename-desktop-for-38
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ted Gould (community) Approve
Review via email: mp+167621@code.launchpad.net

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
Ted Gould (ted) :
review: Approve
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 'data/Makefile.am'
2--- data/Makefile.am 2012-02-17 22:15:25 +0000
3+++ data/Makefile.am 2013-06-05 19:08:25 +0000
4@@ -21,14 +21,14 @@
5
6 @INTLTOOL_DESKTOP_RULE@
7 desktopdir = $(datadir)/applications
8-desktop_DATA = indicator-datetime-preferences.desktop
9+desktop_DATA = gnome-indicator-datetime-panel.desktop
10
11 EXTRA_DIST += \
12- indicator-datetime-preferences.desktop
13+ gnome-indicator-datetime-panel.desktop
14
15-CLEANFILES += indicator-datetime-preferences.desktop
16+CLEANFILES += gnome-indicator-datetime-panel.desktop
17 endif
18
19 EXTRA_DIST += \
20 datetime-dialog.ui \
21- indicator-datetime-preferences.desktop.in
22+ gnome-indicator-datetime-panel.desktop.in
23
24=== renamed file 'data/indicator-datetime-preferences.desktop.in' => 'data/gnome-indicator-datetime-panel.desktop.in'
25=== modified file 'debian/changelog'
26--- debian/changelog 2013-06-05 08:49:39 +0000
27+++ debian/changelog 2013-06-05 19:08:25 +0000
28@@ -1,3 +1,9 @@
29+indicator-datetime (12.10.3daily13.06.05-0ubuntu1) UNRELEASED; urgency=low
30+
31+ * Rename .desktop file for compatibility with gnome-control-center 3.8
32+
33+ -- Jeremy Bicha <jbicha@ubuntu.com> Wed, 05 Jun 2013 14:30:22 -0400
34+
35 indicator-datetime (12.10.3daily13.05.06.1-0ubuntu2) saucy; urgency=low
36
37 * debian/control, configure.ac: Remove obsolete dependency on
38
39=== modified file 'po/POTFILES.in'
40--- po/POTFILES.in 2011-03-11 05:10:43 +0000
41+++ po/POTFILES.in 2013-06-05 19:08:25 +0000
42@@ -5,4 +5,4 @@
43 src/utils.c
44 src/settings-shared.h
45 [type: gettext/glade]data/datetime-dialog.ui
46-data/indicator-datetime-preferences.desktop.in
47+data/gnome-indicator-datetime-panel.desktop.in

Subscribers

People subscribed via source and target branches