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

galago-commits at freedesktop.org galago-commits at freedesktop.org
Tue Nov 15 07:36:36 PST 2005 

Author: johnp
Date: 2005-11-15 07:36:33 -0800 (Tue, 15 Nov 2005)
New Revision: 2314

Added:
   trunk/notify-daemon-ng/notify-daemon.service.in
Removed:
   trunk/notify-daemon-ng/notification-daemon.service.in
Modified:
   trunk/notify-daemon-ng/ChangeLog
   trunk/notify-daemon-ng/Makefile.am
   trunk/notify-daemon-ng/autogen.sh
   trunk/notify-daemon-ng/configure.ac
   trunk/notify-daemon-ng/src/Makefile.am
Log:
- change refrences from notification to notify

Modified: trunk/notify-daemon-ng/ChangeLog
===================================================================
--- trunk/notify-daemon-ng/ChangeLog	2005-11-15 15:07:35 UTC (rev 2313)
+++ trunk/notify-daemon-ng/ChangeLog	2005-11-15 15:36:33 UTC (rev 2314)
@@ -1,3 +1,7 @@
+2005-11-15  John (J5) Palmieri  <johnp at redhat.com>
+	
+	* Change refrences from notification to notify
+
 2005-11-10  John (J5) Palmieri  <johnp at redhat.com>
 
 	* Makefile.am: remove Doxyfile.in ref 

Modified: trunk/notify-daemon-ng/Makefile.am
===================================================================
--- trunk/notify-daemon-ng/Makefile.am	2005-11-15 15:07:35 UTC (rev 2313)
+++ trunk/notify-daemon-ng/Makefile.am	2005-11-15 15:36:33 UTC (rev 2314)
@@ -5,12 +5,12 @@
 	ChangeLog \
 	autogen.sh \
 	configure.ac \
-	notification-daemon.service \
-	notification-daemon.service.in
+	notify-daemon.service \
+	notify-daemon.service.in
 
 servicedir       = $(DBUS_SERVICES_DIR)
-service_in_files = notification-daemon.service.in
-service_DATA     = notification-daemon.service
+service_in_files = notify-daemon.service.in
+service_DATA     = notify-daemon.service
 
 %.service: %.service.in
 	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@

Modified: trunk/notify-daemon-ng/autogen.sh
===================================================================
--- trunk/notify-daemon-ng/autogen.sh	2005-11-15 15:07:35 UTC (rev 2313)
+++ trunk/notify-daemon-ng/autogen.sh	2005-11-15 15:36:33 UTC (rev 2314)
@@ -3,7 +3,7 @@
 
 DIE=0
 
-PACKAGE=notification-daemon
+PACKAGE=notify-daemon
 
 echo "Generating configuration files for $PACKAGE, please wait..."
 

Modified: trunk/notify-daemon-ng/configure.ac
===================================================================
--- trunk/notify-daemon-ng/configure.ac	2005-11-15 15:07:35 UTC (rev 2313)
+++ trunk/notify-daemon-ng/configure.ac	2005-11-15 15:36:33 UTC (rev 2314)
@@ -3,7 +3,7 @@
 dnl ################################################################
 dnl # Initialize autoconf
 dnl ################################################################
-AC_INIT(notification-daemon, 0.0.2, johnp at redhat.com)
+AC_INIT(notify-daemon, 0.0.2, johnp at redhat.com)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(config.h.in)
 AC_COPYRIGHT([Copyright 2005 John (J5) Palmieri])
@@ -12,35 +12,35 @@
 dnl ################################################################
 dnl # Version information
 dnl ################################################################
-NOTIFICATION_DAEMON_MAJOR_VERSION=0
-NOTIFICATION_DAEMON_MINOR_VERSION=0
-NOTIFICATION_DAEMON_MICRO_VERSION=2
-NOTIFICATION_DAEMON_DEVEL_VERSION=0
+NOTIFY_DAEMON_MAJOR_VERSION=0
+NOTIFY_DAEMON_MINOR_VERSION=0
+NOTIFY_DAEMON_MICRO_VERSION=2
+NOTIFY_DAEMON_DEVEL_VERSION=0
 
-NOTIFICATION_DAEMON_VERSION=$NOTIFICATION_DAEMON_MAJOR_VERSION.$NOTIFICATION_DAEMON_MINOR_VERSION.$NOTIFICATION_DAEMON_MICRO_VERSION
+NOTIFY_DAEMON_VERSION=$NOTIFY_DAEMON_MAJOR_VERSION.$NOTIFY_DAEMON_MINOR_VERSION.$NOTIFY_DAEMON_MICRO_VERSION
 
-if test "x$NOTIFICATION_DAEMON_DEVEL_VERSION" != "x0"; then
-	if test "x$NOTIFICATION_DAEMON_MICRO_VERSION" = "x0"; then
-		NOTIFICATION_DAEMON_MICRO_VERSION=$NOTIFICATION_DAEMON_DEVEL_VERSION
-		NOTIFICATION_DAEMON_VERSION=$NOTIFICATION_DAEMON_MAJOR_VERSION.$NOTIFICATION_DAEMON_MINOR_VERSION.$NOTIFICATION_DAEMON_DEVEL_VERSION
+if test "x$NOTIFY_DAEMON_DEVEL_VERSION" != "x0"; then
+	if test "x$NOTIFY_DAEMON_MICRO_VERSION" = "x0"; then
+		NOTIFY_DAEMON_MICRO_VERSION=$NOTIFY_DAEMON_DEVEL_VERSION
+		NOTIFY_DAEMON_VERSION=$NOTIFY_DAEMON_MAJOR_VERSION.$NOTIFY_DAEMON_MINOR_VERSION.$NOTIFY_DAEMON_DEVEL_VERSION
 	else
-		NOTIFICATION_DAEMON_VERSION=$NOTIFICATION_DAEMON_VERSION.$NOTIFICATION_DAEMON_DEVEL_VERSION
+		NOTIFY_DAEMON_VERSION=$NOTIFY_DAEMON_VERSION.$NOTIFY_DAEMON_DEVEL_VERSION
 	fi
 fi
 
-AC_DEFINE_UNQUOTED(NOTIFICATION_DAEMON_MAJOR_VERSION, $NOTIFICATION_DAEMON_MAJOR_VERSION,
+AC_DEFINE_UNQUOTED(NOTIFY_DAEMON_MAJOR_VERSION, $NOTIFY_DAEMON_MAJOR_VERSION,
 	[notification-daemon major version.])
-AC_DEFINE_UNQUOTED(NOTIFICATION_DAEMON_MINOR_VERSION, $NOTIFICATION_DAEMON_MINOR_VERSION,
+AC_DEFINE_UNQUOTED(NOTIFY_DAEMON_MINOR_VERSION, $NOTIFY_DAEMON_MINOR_VERSION,
 	[notification-daemon minor version.])
-AC_DEFINE_UNQUOTED(NOTIFICATION_DAEMON_MICRO_VERSION, $NOTIFICATION_DAEMON_MICRO_VERSION,
+AC_DEFINE_UNQUOTED(NOTIFY_DAEMON_MICRO_VERSION, $NOTIFY_DAEMON_MICRO_VERSION,
 	[notification-daemon micro version.])
-AC_DEFINE_UNQUOTED(NOTIFICATION_DAEMON_VERSION, "$NOTIFICATION_DAEMON_VERSION",
+AC_DEFINE_UNQUOTED(NOTIFY_DAEMON_VERSION, "$NOTIFY_DAEMON_VERSION",
 	[notification-daemon version.])
 
 dnl ################################################################
 dnl # Initialize automake
 dnl ################################################################
-VERSION=$NOTIFICATION_DAEMON_VERSION
+VERSION=$NOTIFY_DAEMON_VERSION
 PACKAGE=notification-daemon
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
@@ -69,9 +69,9 @@
 AC_CHECK_LIB([popt], [poptGetArg], , AC_MSG_ERROR([Popt is required]))
 
 pkg_modules="gtk+-2.0 >= 2.2.2 glib-2.0 >= 2.2.2, dbus-1 >= 0.35, dbus-glib-1 >= 0.35"
-PKG_CHECK_MODULES(NOTIFICATION_DAEMON, [$pkg_modules])
-AC_SUBST(NOTIFICATION_DAEMON_CFLAGS)
-AC_SUBST(NOTIFICATION_DAEMON_LIBS)
+PKG_CHECK_MODULES(NOTIFY_DAEMON, [$pkg_modules])
+AC_SUBST(NOTIFY_DAEMON_CFLAGS)
+AC_SUBST(NOTIFY_DAEMON_LIBS)
 
 gdk_modules="gdk-2.0 gdk-pixbuf-2.0"
 PKG_CHECK_MODULES(GDK, [$gdk_modules], have_gdk=yes,
@@ -147,7 +147,7 @@
 dnl ################################################################
 AC_CONFIG_FILES([
 Makefile
-notification-daemon.service
+notify-daemon.service
 src/Makefile
 ])
 

Deleted: trunk/notify-daemon-ng/notification-daemon.service.in
===================================================================
--- trunk/notify-daemon-ng/notification-daemon.service.in	2005-11-15 15:07:35 UTC (rev 2313)
+++ trunk/notify-daemon-ng/notification-daemon.service.in	2005-11-15 15:36:33 UTC (rev 2314)
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Notifications
-Exec=@LIBEXECDIR@/notification-daemon

Copied: trunk/notify-daemon-ng/notify-daemon.service.in (from rev 2290, trunk/notify-daemon-ng/notification-daemon.service.in)
===================================================================
--- trunk/notify-daemon-ng/notification-daemon.service.in	2005-11-10 21:54:29 UTC (rev 2290)
+++ trunk/notify-daemon-ng/notify-daemon.service.in	2005-11-15 15:36:33 UTC (rev 2314)
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Notifications
+Exec=@LIBEXECDIR@/notify-daemon

Modified: trunk/notify-daemon-ng/src/Makefile.am
===================================================================
--- trunk/notify-daemon-ng/src/Makefile.am	2005-11-15 15:07:35 UTC (rev 2313)
+++ trunk/notify-daemon-ng/src/Makefile.am	2005-11-15 15:36:33 UTC (rev 2314)
@@ -2,15 +2,15 @@
 
 EXTRA_DIST=notifydaemon.xml
 
-libexec_PROGRAMS = notification-daemon
+libexec_PROGRAMS = notify-daemon
 
-notification_daemon_SOURCES=		\
+notify_daemon_SOURCES=		\
 	eggnotificationbubblewidget.c	\
 	eggnotificationbubblewidget.h	\
 	notifydaemon.c			\
 	notifydaemon.h
 
-notification_daemon_LDADD= $(NOTIFICATION_DAEMON_LIBS)
+notify_daemon_LDADD= $(NOTIFICATION_DAEMON_LIBS)
 
 BUILT_SOURCES = notifydaemon-dbus-glue.h

More information about the galago-commits mailing list