From 3b75881c0584b5929f591ef11eb06e8f2e87b9c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 20 Jul 2017 00:20:23 +0200
Subject: [PATCH] Bump version to 3.25.4

Update NEWS.
---
 NEWS         | 27 +++++++++++++++++++++++++++
 configure.ac |  2 +-
 meson.build  |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index fd0334750..adf9f13db 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,30 @@
+3.25.4
+======
+* gdm: Fix "Not listed" focus indication [Florian; #784040]
+* Fix missing icons in freedesktop notifications [Florian; #784245]
+* gdm: Disable user list when empty [Xiaoguang; #731320]
+* gdm: Allow empty reponse to PAM messages [Ray; #784360]
+* Fix blocked clicks in shutdown dialog [Florian; #781738]
+* Show OSD popup when changing volume via scroll wheel [Florian; #781028]
+* Refine list search results [Rares; #749957]
+* Replace mutter's unresponsive app dialog [Carlos; #762083]
+* Improve handling of extension errors [Florian; #781728]
+* Implement tablet rings/strips configuration [Carlos; #782033]
+* Adjust to mozjs52 update in gjs [Florian; #785084, #785090]
+* Support the meson build system [Florian; #783229]
+* Misc. bug fixes [Ray, Florian, Jonas, Marco, Shih-Yuan, Joaquim, Carlos S.;
+  #780403, #772589, #784130, #783975, #784353, #784361, #772284, #765011,
+  #765011, #765011, #784985, #781471, #785047, #736148, #736148]
+
+Contributors:
+  Jonas Ådahl, Alessandro Bono, Michael Catanzaro, Carlos Garnacho,
+  Shih-Yuan Lee (FourDollars), Florian Müllner, Joaquim Rocha,
+  Mario Sanchez Prada, Carlos Soriano, Ray Strode, Marco Trevisan (Treviño),
+  Rares Visalom, Xiaoguang Wang
+
+Translations:
+  Jeremy Bicha po/es, he.po, Kukuh Syafaat [id], Fabio Tomat [fur]
+
 3.25.3
 ======
 * Bypass proxies for captive portal [Bastien; #769692]
diff --git a/configure.ac b/configure.ac
index db30125df..70a6ea4e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.25.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.25.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 AX_IS_RELEASE([git-directory])
 
 AC_CONFIG_HEADERS([config.h])
diff --git a/meson.build b/meson.build
index b8844d7fc..00a541da4 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.25.3',
+  version: '3.25.4',
   meson_version: '>= 0.41.0',
   license: 'GPLv2+'
 )