[Xfce4-commits] <xfce4-power-manager:master> Updates for release.

[Nick Schermer]

Updating branch refs/heads/master
         to cf627a64c1b3691e773bf03e5275be4adba9ac4a (commit)
       from e67b276afe470acbe50dd95b32f7c0e988b2d8cf (commit)

commit cf627a64c1b3691e773bf03e5275be4adba9ac4a
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Apr 28 22:39:06 2012 +0200

    Updates for release.

 NEWS            |   23 +++++++++++++++++++----
 configure.ac.in |   14 +++++++-------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index d75fb03..b4280f1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+1.2.0
+=====
+- Fix compilation without dpms.
+- Fix incorrect dialog message and error.
+- Plug memory leak.
+- Use valid printf string.
+- Fix compilation with polkit in freebsd (bug #8712).
+- Translation updates: Czech, Danish, German, English (United
+  Kingdom), Spanish (Castilian), Basque, Finnish, French, Galician,
+  Croatian, Hungarian, Italian, Japanese, Kazakh, Korean, Lithuanian,
+  Dutch (Flemish), Norwegian Nynorsk, Portuguese, Portuguese
+  (Brazilian), Romanian, Russian, Slovak, Ukrainian, Chinese (China),
+  Chinese (Taiwan).
+
+
 1.1.0
 =====
 - Show dialog in settings category.
@@ -5,7 +20,7 @@
 - Put traps around X functions (bug #7999).
 - Prevent idle being called on removed battery (bug #7851).
 - Fix brightness not working with numlock on (bug #6549).
-- Translation updates: Greek, French, Japanese, Korean, Dutch 
+- Translation updates: Greek, French, Japanese, Korean, Dutch
   (Flemish), Polish, Portuguese, Turkish.
 
 
@@ -36,7 +51,7 @@
 =======
 - Because on some systems we might not have the brightness keys mapped.
   LCD brightness change are not reflected to xfpm when keys are pressed, so
-  save the actual brightness before dimming the screen on idle to restore it 
+  save the actual brightness before dimming the screen on idle to restore it
   afterword. (bug #5811).
 - Check if DPMS is enabled before doing action on lid close event (bug #5805).
 - Allow 1% as a minimum critical charge level.
@@ -53,7 +68,7 @@
 =======
 - Missing signal handler for power button settings (bug #5656).
 - Allow 5% as a minimum critical charge instead of 10%.
-- Change some property names, specially for buttons to avoid 
+- Change some property names, specially for buttons to avoid
   problems with old 0.6 configuration.
 
 0.8.3
@@ -62,6 +77,6 @@
 - Make it possible to compile without network manager support.
 - Add never show icon to the system tray configuration (bug #5613).
 - Fix a typo that prevents from getting the correct critical configuration (bug #5619).
-- Use Gtk as a popup indicator to show the brightness level as the cairo seems to be 
+- Use Gtk as a popup indicator to show the brightness level as the cairo seems to be
   problematic on some hardware. (bug #5544 #5632).
 - Better alignement in the interface file, worked by Josef Havran.
diff --git a/configure.ac.in b/configure.ac.in
index 592eba2..17d4e21 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],  [1])
-m4_define([xfpm_version_minor],  [1])
-m4_define([xfpm_version_micro],  [0])
-m4_define([xfpm_version_build],  [])
-m4_define([xfpm_version_tag],[git])
+m4_define([xfpm_version_major], [1])
+m4_define([xfpm_version_minor], [2])
+m4_define([xfpm_version_micro], [0])
+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/])
@@ -28,8 +28,8 @@ AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
 # ===================================================== #
 #               Initialize libtool                      #
 # ===================================================== #
-AC_DISABLE_STATIC()
-AC_PROG_LIBTOOL()
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
 # ==================================================== #
 #   Check for headers needed for standard interfaces   #