aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-06-18 23:12:59 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-06-18 23:12:59 -0500
commit2c0b562cf3c58454d4e881569b7289bf464675e9 (patch)
tree7f25850bdb20e98e742fc0d5c3ce7701891d137a /data
parentc18a48d1c81cef6bf874caae86f6230e64d7a13a (diff)
parent50de20c540f2d268ebd7d1a8d16f009d218b86fd (diff)
downloadayatana-indicator-datetime-2c0b562cf3c58454d4e881569b7289bf464675e9.tar.gz
ayatana-indicator-datetime-2c0b562cf3c58454d4e881569b7289bf464675e9.tar.bz2
ayatana-indicator-datetime-2c0b562cf3c58454d4e881569b7289bf464675e9.zip
sync with lp:indicator-datetime trunk
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am6
-rw-r--r--data/gnome-indicator-datetime-panel.desktop.in (renamed from data/indicator-datetime-preferences.desktop.in)0
2 files changed, 3 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index e0019e6..3180cbe 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,12 +34,12 @@ EXTRA_DIST += $(dbus_services_in)
# the gnome-control-center panel
#
-EXTRA_DIST += datetime-dialog.ui
if BUILD_CCPANEL
pkgdata_DATA = datetime-dialog.ui
@INTLTOOL_DESKTOP_RULE@
desktopdir = $(datadir)/applications
- desktop_DATA = indicator-datetime-preferences.desktop
- EXTRA_DIST += $(desktop_DATA) $(desktop_DATA:.desktop=.desktop.in)
+ desktop_DATA = gnome-indicator-datetime-panel.desktop
+ EXTRA_DIST += $(desktop_DATA)
CLEANFILES += $(desktop_DATA)
endif
+EXTRA_DIST += $(desktop_DATA:.desktop=.desktop.in)
diff --git a/data/indicator-datetime-preferences.desktop.in b/data/gnome-indicator-datetime-panel.desktop.in
index 68571db..68571db 100644
--- a/data/indicator-datetime-preferences.desktop.in
+++ b/data/gnome-indicator-datetime-panel.desktop.in