[california] Install .desktop file and basic desktop integration: Closes bgo#725765

[Jim Nelson <jnelson src gnome org>]

commit 51c9516e3db1bf7aa6badde64c5fd7a45ee3b82d
Author: Jim Nelson <jim yorba org>
Date:   Tue Apr 15 17:57:10 2014 -0700

    Install .desktop file and basic desktop integration: Closes bgo#725765

 Makefile.am                   |    8 +++++++-
 configure.ac                  |   24 +++++++++++++-----------
 data/Makefile.am              |   20 ++++++++++++++++++++
 data/california.desktop.in.in |   17 +++++++++++++++++
 po/POTFILES.in                |    1 +
 src/Makefile.am               |    3 ++-
 6 files changed, 60 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a071e68..d691c19 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 NULL =
-GITIGNOREFILES=
+GITIGNOREFILES =
 
 # Build in these directories:
 
@@ -25,6 +25,8 @@ EXTRA_DIST = \
        intltool-update.in\
        $(NULL)
 
+CLEANFILES =
+
 DISTCLEANFILES = \
        configure \
        config.guess \
@@ -81,4 +83,8 @@ GITIGNOREFILES += \
 devclean:
        $(MAKE) -C src devclean
 
+include data/Makefile.am
+
+ INTLTOOL_DESKTOP_RULE@
+
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index dcdd335..1f0e1b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,16 +32,16 @@ LIBSOUP_REQUIRED=2.44
 GDATA_REQUIRED=0.14.0
 GOA_REQUIRED=3.8.3
 
-PKG_CHECK_MODULES(CALIFORNIA, \
-       glib-2.0 >= $GLIB_REQUIRED \
-       gobject-2.0 >= $GLIB_REQUIRED \
-       gtk+-3.0 >= $GTK_REQUIRED \
-       gee-0.8 >= $GEE_REQUIRED \
-       libecal-1.2 >= $ECAL_REQUIRED \
-       libsoup-2.4 >= $LIBSOUP_REQUIRED \
-       libgdata >= $GDATA_REQUIRED \
-       goa-1.0 >= $GOA_REQUIRED \
-)
+PKG_CHECK_MODULES(CALIFORNIA, [
+       glib-2.0 >= $GLIB_REQUIRED
+       gobject-2.0 >= $GLIB_REQUIRED
+       gtk+-3.0 >= $GTK_REQUIRED
+       gee-0.8 >= $GEE_REQUIRED
+       libecal-1.2 >= $ECAL_REQUIRED
+       libsoup-2.4 >= $LIBSOUP_REQUIRED
+       libgdata >= $GDATA_REQUIRED
+       goa-1.0 >= $GOA_REQUIRED
+])
 AC_SUBST(CALIFORNIA_CFLAGS)
 AC_SUBST(CALIFORNIA_LIBS)
 
@@ -69,7 +69,9 @@ AM_CONDITIONAL(ENABLE_UNITY, test "x$unity" = "xyes")
 AC_CONFIG_FILES([
        Makefile
        src/Makefile
-       po/Makefile.in])
+       po/Makefile.in
+       data/california.desktop.in
+])
 
 AC_OUTPUT
 
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..56ee016
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,20 @@
+data_desktopdir = $(datadir)/applications
+data_desktop_in_files = data/california.desktop.in
+data_desktop_DATA = $(data_desktop_in_files:.desktop.in=.desktop)
+
+EXTRA_DIST += \
+       $(data_desktop_in_files) \
+       $(NULL)
+
+CLEANFILES += \
+       $(data_desktop_DATA) \
+       $(NULL)
+
+DISTCLEANFILES += \
+       $(data_desktop_DATA) \
+       $(NULL)
+
+GITIGNOREFILES += \
+       $(data_desktop_in_files) \
+       $(data_desktop_DATA) \
+       $(NULL)
diff --git a/data/california.desktop.in.in b/data/california.desktop.in.in
new file mode 100644
index 0000000..cc7c149
--- /dev/null
+++ b/data/california.desktop.in.in
@@ -0,0 +1,17 @@
+[Desktop Entry]
+_Name=California
+_Comment=GNOME 3 Calendar
+_Keywords=Event;Events;Schedule;
+Exec=california %u
+TryExec=california
+Terminal=false
+Type=Application
+Icon=x-office-calendar
+StartupNotify=true
+Categories=GNOME;GTK;Office;Calendar;
+OnlyShowIn=GNOME;Unity;
+MimeType=text/calendar;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=california
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version= VERSION@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 443f6ff..e96eaef 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
 [encoding: UTF-8]
 # List of source files which contain translatable strings.
+data/california.desktop.in.in
 src/activator/activator.vala
 src/application/california-commandline.vala
 src/activator/google/activator-google-authenticating-pane.vala
diff --git a/src/Makefile.am b/src/Makefile.am
index ee35640..f535a81 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
 NULL =
+GITIGNOREFILES = 
 
 AM_CPPFLAGS = \
        $(CALIFORNIA_CFLAGS) \
@@ -185,7 +186,7 @@ DISTCLEANFILES = \
        Makefile.in \
        $(NULL)
 
-GITIGNOREFILES = \
+GITIGNOREFILES += \
        $(california_VALASOURCES:%.vala=%.c) \
        $(NULL)