[Galago-commits] r2315 - in trunk/notify-daemon-ng: . src

[galago-commits at freedesktop.org]

Author: johnp
Date: 2005-11-15 10:26:22 -0800 (Tue, 15 Nov 2005)
New Revision: 2315

Modified:
   trunk/notify-daemon-ng/Makefile.am
   trunk/notify-daemon-ng/configure.ac
   trunk/notify-daemon-ng/src/Makefile.am
Log:
Bump to 0.3.0 add build and install fixes

Modified: trunk/notify-daemon-ng/Makefile.am
===================================================================
--- trunk/notify-daemon-ng/Makefile.am	2005-11-15 15:36:33 UTC (rev 2314)
+++ trunk/notify-daemon-ng/Makefile.am	2005-11-15 18:26:22 UTC (rev 2315)
@@ -1,20 +1,15 @@
 SUBDIRS = src
 
+servicedir       = $(DBUS_SERVICES_DIR)
+service_DATA     = notify-daemon.service
+
 EXTRA_DIST = \
 	AUTHORS NEWS INSTALL COPYING README \
 	ChangeLog \
 	autogen.sh \
 	configure.ac \
-	notify-daemon.service \
-	notify-daemon.service.in
+	notify-daemon.service
 
-servicedir       = $(DBUS_SERVICES_DIR)
-service_in_files = notify-daemon.service.in
-service_DATA     = notify-daemon.service
-
-%.service: %.service.in
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
 $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck

Modified: trunk/notify-daemon-ng/configure.ac
===================================================================
--- trunk/notify-daemon-ng/configure.ac	2005-11-15 15:36:33 UTC (rev 2314)
+++ trunk/notify-daemon-ng/configure.ac	2005-11-15 18:26:22 UTC (rev 2315)
@@ -3,7 +3,7 @@
 dnl ################################################################
 dnl # Initialize autoconf
 dnl ################################################################
-AC_INIT(notify-daemon, 0.0.2, johnp at redhat.com)
+AC_INIT(notify-daemon, 0.3.0, johnp at redhat.com)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(config.h.in)
 AC_COPYRIGHT([Copyright 2005 John (J5) Palmieri])
@@ -13,8 +13,8 @@
 dnl # Version information
 dnl ################################################################
 NOTIFY_DAEMON_MAJOR_VERSION=0
-NOTIFY_DAEMON_MINOR_VERSION=0
-NOTIFY_DAEMON_MICRO_VERSION=2
+NOTIFY_DAEMON_MINOR_VERSION=3
+NOTIFY_DAEMON_MICRO_VERSION=0
 NOTIFY_DAEMON_DEVEL_VERSION=0
 
 NOTIFY_DAEMON_VERSION=$NOTIFY_DAEMON_MAJOR_VERSION.$NOTIFY_DAEMON_MINOR_VERSION.$NOTIFY_DAEMON_MICRO_VERSION
@@ -29,19 +29,19 @@
 fi
 
 AC_DEFINE_UNQUOTED(NOTIFY_DAEMON_MAJOR_VERSION, $NOTIFY_DAEMON_MAJOR_VERSION,
-	[notification-daemon major version.])
+	[notify-daemon major version.])
 AC_DEFINE_UNQUOTED(NOTIFY_DAEMON_MINOR_VERSION, $NOTIFY_DAEMON_MINOR_VERSION,
-	[notification-daemon minor version.])
+	[notify-daemon minor version.])
 AC_DEFINE_UNQUOTED(NOTIFY_DAEMON_MICRO_VERSION, $NOTIFY_DAEMON_MICRO_VERSION,
-	[notification-daemon micro version.])
+	[notify-daemon micro version.])
 AC_DEFINE_UNQUOTED(NOTIFY_DAEMON_VERSION, "$NOTIFY_DAEMON_VERSION",
-	[notification-daemon version.])
+	[notify-daemon version.])
 
 dnl ################################################################
 dnl # Initialize automake
 dnl ################################################################
 VERSION=$NOTIFY_DAEMON_VERSION
-PACKAGE=notification-daemon
+PACKAGE=notify-daemon
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 

Modified: trunk/notify-daemon-ng/src/Makefile.am
===================================================================
--- trunk/notify-daemon-ng/src/Makefile.am	2005-11-15 15:36:33 UTC (rev 2314)
+++ trunk/notify-daemon-ng/src/Makefile.am	2005-11-15 18:26:22 UTC (rev 2315)
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir) $(NOTIFICATION_DAEMON_CFLAGS)
+INCLUDES=-I$(top_srcdir) $(NOTIFY_DAEMON_CFLAGS)
 
 EXTRA_DIST=notifydaemon.xml
 
@@ -10,7 +10,7 @@
 	notifydaemon.c			\
 	notifydaemon.h
 
-notify_daemon_LDADD= $(NOTIFICATION_DAEMON_LIBS)
+notify_daemon_LDADD= $(NOTIFY_DAEMON_LIBS)
 
 BUILT_SOURCES = notifydaemon-dbus-glue.h