[gnome-power-manager/gnome-2-26] ==== Version 2.26.1 ====

[Richard Hughes <rhughes src gnome org>]

commit 86bace9817e4f7c6ee8a1727229aa771483e7642
Author: Richard Hughes <richard hughsie com>
Date:   Tue Apr 21 12:25:15 2009 +0100

    ==== Version 2.26.1 ====
---
 NEWS         |   27 +++++++++++++++++++++++++++
 RELEASE      |   21 +++++++++------------
 configure.ac |    2 +-
 3 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/NEWS b/NEWS
index b9f2497..32b80b0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,31 @@
 ==============
+Version 2.26.1
+==============
+
+Fixed:
+ - Fix the low capacity warning to fix rh#489832 (Richard Hughes)
+ - Convert a floating reference to prevent a GTK warning (Richard Hughes)
+ - Backport DPMS and IDLETIME fixes from master to fix multiple bugs (Richard Hughes)
+ - Connect to gnome-session and exit on logout (Richard Hughes)
+ - Use G_GINT64_FORMAT to fix compile on 64 bit computers (Richard Hughes)
+ - Trivial build fix (Matthias Clasen)
+
+Translations:
+ - Updated assamese translations (Amitakhya Phukan)
+ - Updated Turkish translation (Baris Cicek)
+ - Updated Korean translation (Changwoo Ryu)
+ - Updated Arabic translation (Djihed Afifi)
+ - Updated Catalan translation (David Planella)
+ - Updated Serbian translation (MiloÅ¡ PopoviÄ?)
+ - Updated Galician translation (Suso Baleato)
+ - Updated Norwegian bokmål translation (Kjartan Maraas)
+ - Updated Telugu translation (Krishnababu Krothapalli)
+ - Updated Kannada tanslation (Shankar Prasad)
+ - Updated Greek translation (Michael Kotsarinis, Simos Xenitellis)
+ - Updated Russian translation (Nickolay V. Shmyrev)
+ - Updated Czech translation by Lucas Lommer (Petr Kovar)
+
+==============
 Version 2.26.0
 ==============
 
diff --git a/RELEASE b/RELEASE
index e6d6037..b5d942f 100644
--- a/RELEASE
+++ b/RELEASE
@@ -2,14 +2,14 @@ Follow http://developer.gnome.org/dotplan/for_maintainers.html and http://live.g
 
 â?¢ update configure.in, NEWS, ChangeLog (the "==== <version> ====") to the right release
 â?¢ Add translators to NEWS: maintainer.py -w -r GNOME_POWER_MANAGER_2_25_92
-â?¢ Run "make distcheck", correct any problems encountered (don't forget to update the ChangeLog if you make any changes)
+â?¢ Run "make distcheck", correct any problems encountered
 â?¢ Commit all the changes
 â?¢ Create a tag:
 
-svn copy \
-svn+ssh://rhughes svn gnome org/svn/gnome-power-manager/trunk \
-svn+ssh://rhughes svn gnome org/svn/gnome-power-manager/tags/GNOME_POWER_MANAGER_2_25_92 \
--m "Tagged for release 2.25.92"
+git commit -a -m "==== Version 2.26.1 ===="
+git tag GNOME_POWER_MANAGER_2_26_1
+git push --tags
+git push
 
 â?¢ Copy the resulting tarball to master.gnome.org (scp)
 scp gnome-power-manager-*.tar.gz  rhughes master gnome org:
@@ -21,6 +21,9 @@ install-module gnome-power-manager-*.tar.gz
 
 - Do a post-release version bump by updating configure.in
 
+git commit -a -m "Post release version bump"
+git push
+
 - Update jhbuild modulesets
 
 - Notify gnome-announce-list gnome org, gnome-doc-list gnome org, gnome-i18n gnome org
@@ -28,13 +31,7 @@ install-module gnome-power-manager-*.tar.gz
 GNOME Power Manager is a session daemon that makes it easy to manage the
 power on your laptop or desktop system.
 
-This _unstable_ release contains lots of crazy new code since 2.25.3 was released. WARNING, this code will impregnate your cat called Dave and steal all of the magazines from the bathroom.
+This stable release contains important fixes since 2.24.4 was released. Distributions should consider upgrading gnome-power-manager via errata packages if possible.
 
 - Done!
 
-Making a Branch
-===============
-
-svn cp svn+ssh://rhughes svn gnome org/svn/gnome-power-manager/trunk svn+ssh://rhughes svn gnome org/svn/gnome-power-manager/branches/gnome-2-24  -m "Branched for gnome-2-24"
-
-Additionally, gnome-power-manager has branched, with future development work being done in trunk.
diff --git a/configure.ac b/configure.ac
index 5ac0064..4ae448d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.60)
 
-AC_INIT(gnome-power-manager, 2.26.0)
+AC_INIT(gnome-power-manager, 2.26.1)
 AC_CONFIG_SRCDIR(src)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)