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

[Nick Schermer]

Updating branch refs/heads/master
         to 5112a0e454882c973765927724cb82bd9675bdb2 (commit)
       from 6c96bfaee886b278462efaed25c4899de096347b (commit)

commit 5112a0e454882c973765927724cb82bd9675bdb2
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Apr 14 00:52:27 2012 +0200

    Updates for release.

 NEWS                                             |   11 +++++++++++
 configure.ac.in                                  |    4 ++--
 module.xml                                       |   19 -------------------
 settings/xfce4-power-manager-settings.desktop.in |    4 ++--
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/NEWS b/NEWS
index 6992888..d75fb03 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+1.1.0
+=====
+- Show dialog in settings category.
+- Store brightness properties as uint (bug #7791).
+- 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 
+  (Flemish), Polish, Portuguese, Turkish.
+
+
 1.0.11
 ======
 - Solaris-specific code for determining the start time of a process.
diff --git a/configure.ac.in b/configure.ac.in
index efd480a..7a55afa 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,7 +1,7 @@
 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfpm_version_major],  [1])
-m4_define([xfpm_version_minor],  [0])
-m4_define([xfpm_version_micro],  [11])
+m4_define([xfpm_version_minor],  [1])
+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()])])
diff --git a/module.xml b/module.xml
deleted file mode 100644
index ff12eb9..0000000
--- a/module.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/"
-         xmlns:gnome="http://api.gnome.org/doap-extensions#"
-         xmlns="http://usefulinc.com/ns/doap#">
-
-  <name xml:lang="en">xfce4-power-manager</name>
-  <shortdesc xml:lang="en">Power Manager for Xfce</shortdesc>
-  <homepage rdf:resource="http://goodies.xfce.org/projects/applications/xfce4-power-manager"/>
-
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Ali Abdallah</foaf:name>
-      <foaf:mbox>mailto:aliov at xfce.org</foaf:mbox>
-      <gnome:userid>aliov</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-</Project>
diff --git a/settings/xfce4-power-manager-settings.desktop.in b/settings/xfce4-power-manager-settings.desktop.in
index 7cbd09f..65d97e3 100644
--- a/settings/xfce4-power-manager-settings.desktop.in
+++ b/settings/xfce4-power-manager-settings.desktop.in
@@ -7,8 +7,8 @@ Exec=xfce4-power-manager-settings
 Icon=xfpm-ac-adapter
 Terminal=false
 Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
+Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
 OnlyShowIn=XFCE;
 StartupNotify=true
 X-XfcePluggable=true
-X-XfceHelpFile=xfce4-power-manager.html
+X-XfceHelpFile=xfce4-power-manager