[Xfce4-commits] <xfce4-power-manager:master> Prepare 0.9.98

[Ali Abdallah]

Updating branch refs/heads/master
         to d79bc32401a342af381425d8a20678ce7f83b936 (commit)
       from 132c617743dbeed0c7e7cea0b6cb5c4a65b815f1 (commit)

commit d79bc32401a342af381425d8a20678ce7f83b936
Author: Ali Abdallah <aliov at xfce.org>
Date:   Wed May 19 11:22:51 2010 +0200

    Prepare 0.9.98

 configure.ac.in |    7 +++----
 src/Makefile.am |    6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index bdbe8b0..50727af 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,9 +1,9 @@
 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfpm_version_major],  [0])
 m4_define([xfpm_version_minor],  [9])
-m4_define([xfpm_version_micro],  [90])
-m4_define([xfpm_version_build],  [@REVISION@])
-m4_define([xfpm_version_tag],[git])
+m4_define([xfpm_version_micro],  [98])
+m4_define([xfpm_version_build],  [])
+m4_define([xfpm_version_tag],[])
 m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [git], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
 
 AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
@@ -60,7 +60,6 @@ m4_define([libxfce4panel_minimum_version],[4.6.0])
 
 m4_define([libnotify_minimum_version], [0.4.1])
 m4_define([xrandr_minimum_version], [1.2.0])
-m4_define([polkit_minimum_version], [0.91])
 
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version])
diff --git a/src/Makefile.am b/src/Makefile.am
index 8685f8c..8f6a505 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +55,6 @@ xfce4_power_manager_CFLAGS =                    \
 	$(XFCONF_CFLAGS)                        \
 	$(LIBNOTIFY_CFLAGS)                     \
 	$(XRANDR_CFLAGS)			\
-	$(POLKIT_CFLAGS)			\
 	$(DPMS_CFLAGS)                  
 
 xfce4_power_manager_LDADD =                     \
@@ -68,7 +67,6 @@ xfce4_power_manager_LDADD =                     \
 	$(XFCONF_LIBS)                          \
 	$(LIBNOTIFY_LIBS)                       \
 	$(XRANDR_LIBS)				\
-	$(POLKIT_LIBS)				\
 	$(DPMS_LIBS)
 
 xfce4_power_information_SOURCES =		\
@@ -99,8 +97,6 @@ manpage_DATA = xfce4-power-manager.1
 xfpm_glib_headers =                             \
         $(srcdir)/xfpm-enum-glib.h
 
-if MAINTAINER_MODE
-
 BUILT_SOURCES =					\
 	xfce-power-manager-dbus-server.h	\
 	xfce-power-manager-dbus-client.h	\
@@ -111,6 +107,8 @@ BUILT_SOURCES =					\
 	org.freedesktop.PowerManagement.h       \
 	org.freedesktop.PowerManagement.Inhibit.h
 
+if MAINTAINER_MODE
+
 xfpm-enum-types.h: $(xfpm_glib_headers)
 	( cd $(srcdir) && glib-mkenums \
 		--fhead "#ifndef _XFPM_ENUM_TYPES_H\n#define _XFPM_ENUM_TYPES_H\n#include <glib-object.h>\nG_BEGIN_DECLS\n" \