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

[galago-commits at freedesktop.org]

Author: johnp
Date: 2005-12-14 15:55:08 -0800 (Wed, 14 Dec 2005)
New Revision: 2386

Modified:
   trunk/notify-daemon-ng/ChangeLog
   trunk/notify-daemon-ng/NEWS
   trunk/notify-daemon-ng/configure.ac
   trunk/notify-daemon-ng/src/Makefile.am
Log:
* Release 0.3.0

* src/Makefile.am: fix for building in a seperate build directory

* configure.ac: Require D-Bus >= 0.60



Modified: trunk/notify-daemon-ng/ChangeLog
===================================================================
--- trunk/notify-daemon-ng/ChangeLog	2005-12-14 23:13:54 UTC (rev 2385)
+++ trunk/notify-daemon-ng/ChangeLog	2005-12-14 23:55:08 UTC (rev 2386)
@@ -1,3 +1,11 @@
+2005-12-14  John (J5) Palmieri  <johnp at redhat.com>
+
+	* Release 0.3.0
+
+	* src/Makefile.am: fix for building in a seperate build directory
+
+	* configure.ac: Require D-Bus >= 0.60
+
 2005-12-12  John (J5) Palmieri  <johnp at redhat.com>
 
 	* src/eggnotificationbubblewidget.c (size_request_handler): removed

Modified: trunk/notify-daemon-ng/NEWS
===================================================================
--- trunk/notify-daemon-ng/NEWS	2005-12-14 23:13:54 UTC (rev 2385)
+++ trunk/notify-daemon-ng/NEWS	2005-12-14 23:55:08 UTC (rev 2386)
@@ -0,0 +1,6 @@
+notify-daemon 0.3.0
+===
+
+* First release of the notify daemon which supports the new 0.3.0 protocol
+* Users of the older notification-daemon must make sure they uninstall it
+  as it will try to catch messages ment for the notify-daemon

Modified: trunk/notify-daemon-ng/configure.ac
===================================================================
--- trunk/notify-daemon-ng/configure.ac	2005-12-14 23:13:54 UTC (rev 2385)
+++ trunk/notify-daemon-ng/configure.ac	2005-12-14 23:55:08 UTC (rev 2386)
@@ -68,7 +68,7 @@
 
 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_modules="gtk+-2.0 >= 2.2.2 glib-2.0 >= 2.2.2, dbus-1 >= 0.60, dbus-glib-1 >= 0.60"
 PKG_CHECK_MODULES(NOTIFY_DAEMON, [$pkg_modules])
 AC_SUBST(NOTIFY_DAEMON_CFLAGS)
 AC_SUBST(NOTIFY_DAEMON_LIBS)
@@ -120,14 +120,7 @@
 if ! test -z "$with_dbus_services" ; then
 	DBUS_SERVICES_DIR="$with_dbus_services"
 else
-	# D-BUS 0.23 and higher use $prefix/share/dbus-1/services
-	# D-BUS 0.22 and lower use $prefix/lib/dbus-1/services
-	if test "$DBUS_MAJOR_VER" -ge 1 -o \
-	        "$DBUS_MINOR_VER" -ge 23; then
-		DBUS_SERVICES_DIR="$DATADIR/dbus-1/services"
-	else
-		DBUS_SERVICES_DIR="$LIBDIR/dbus-1/services"
-	fi
+	DBUS_SERVICES_DIR="$DATADIR/dbus-1/services"
 fi
 
 AC_SUBST(DBUS_SYS_DIR)

Modified: trunk/notify-daemon-ng/src/Makefile.am
===================================================================
--- trunk/notify-daemon-ng/src/Makefile.am	2005-12-14 23:13:54 UTC (rev 2385)
+++ trunk/notify-daemon-ng/src/Makefile.am	2005-12-14 23:55:08 UTC (rev 2386)
@@ -15,4 +15,4 @@
 BUILT_SOURCES = notifydaemon-dbus-glue.h
 
 notifydaemon-dbus-glue.h: notifydaemon.xml
-	dbus-binding-tool --mode=glib-server notifydaemon.xml > notifydaemon-dbus-glue.h
+	dbus-binding-tool --mode=glib-server $(srcdir)/notifydaemon.xml > notifydaemon-dbus-glue.h