Change package name to 'alarm-clock-applet' to avoid name conflicts.

Update to reflect the new location of gnome-default-applications.xml.
Bump to version 0.2.6.

configure.ac

@@ -2,9 +2,9 @@ dnl ***************************************************************************
 dnl *** configure.ac for ALARM-CLOCK                                        ***
 dnl ***************************************************************************
 
-AC_INIT([Alarm Clock], [0.2.5],
+AC_INIT([Alarm Clock], [0.2.6],
 		[Johannes H. Jensen <joh@pseudoberries.com>],
-		[alarm-clock])
+		[alarm-clock-applet])
 		
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
@@ -129,8 +129,6 @@ iconsdir="${datadir}/icons"
 AC_SUBST(iconsdir)
 pixmapsdir="${datadir}/pixmaps"
 AC_SUBST(pixmapsdir)
-pkgdatadir="${datadir}/alarm-clock"
-AC_SUBST(pkgdatadir)
 gladedir="${pkgdatadir}/glade"
 AC_SUBST(gladedir)
 soundsdir="${datadir}/sounds"

src/AlarmClock.server.in

@@ -1,6 +1,6 @@
 <oaf_info>
 <oaf_server iid="OAFIID:AlarmClock_Factory" type="exe"
-			location="@BINDIR@/alarm-clock-applet">
+			location="@LIBEXECDIR@/alarm-clock-applet">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
@@ -23,4 +23,4 @@
 	<oaf_attribute name="panel:category" type="string" value="Accessories"/>
 	<oaf_attribute name="panel:icon" type="string" value="alarm-clock.png"/>
 </oaf_server>
-</oaf_info>
+</oaf_info>

src/Makefile.am

@@ -13,7 +13,7 @@ INCLUDES =						\
 	$(LIBNOTIFY_CFLAGS)			\
 	-I$(includedir) 			
 
-bin_PROGRAMS = alarm-clock-applet
+libexec_PROGRAMS = alarm-clock-applet
 
 alarm_clock_applet_SOURCES = alarm-applet.c alarm-applet.h	\
 							 player.c player.h				\
@@ -39,7 +39,7 @@ server_in_files = AlarmClock.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_DATA): $(server_in_files)
-	sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
+	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
 uidir = $(gladedir)
 ui_DATA = ui/alarm-clock.glade
@@ -142,4 +142,4 @@ uninstall-local: uninstall-schemas uninstall-icons uninstall-data
 EXTRA_DIST += $(server_in_files)	\
 			  $(schemas_DATA)		\
 		      $(icons)				\
-		      $(ui_DATA)			
+		      $(ui_DATA)			

src/alarm-applet.c

@@ -252,6 +252,7 @@ alarm_applet_apps_load (AlarmApplet *applet)
 	// from gnome-control-center
 	filename = g_build_filename (DATADIR,
 								 "gnome-control-center",
+								 "default-apps",
 					 			 "gnome-default-applications.xml",
 					 			 NULL);