From 8ded60326a98d26e51e1e0c0719380571d400a4b Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 20 Feb 2008 19:02:51 -0600
Subject: [PATCH] Updates before 3.1.2 release

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 NEWS         | 4 ++++
 configure.ac | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 451cd5191..329dffc15 100644
--- a/NEWS
+++ b/NEWS
@@ -5,9 +5,13 @@ VERSION         DESCRIPTION
               - mark gensync and updatesync as deprecated
               - fix pacman -Qo behavior on symlinks (FS#9473)
               - fix segfault on a broken symlinks in backup code (FS#9235)
+              - ensure filename is determined correctly for a pkg (FS#9547)
+              - fix conflict progress bar with UTF-8 chars (FS#6437)
               - fix chk_fileconflicts brokenness, ensure it reads entire list
+              - ensure -Sc operation locks DB, only checks DBs (FS#9609)
               - minor documentation and message updates
               - moved some translations to their more generic lang codes
+              - allow scripts to be run without gettext installed
               - makepkg:
                 - check to ensure we have non-URL sources (FS#9208)
                 - ensure we strip binaries in /opt/ dirs (FS#9342)
diff --git a/configure.ac b/configure.ac
index d2edd0fc3..9587f37b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,13 +46,13 @@ AC_PREREQ(2.60)
 #     For code under development: [devel]
 #     For production releases:    []
 
-m4_define([lib_current], [3])
+m4_define([lib_current], [4])
 m4_define([lib_revision], [0])
-m4_define([lib_age], [1])
+m4_define([lib_age], [2])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [1])
-m4_define([pacman_version_micro], [1])
+m4_define([pacman_version_micro], [2])
 m4_define([pacman_version_suffix], [])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
-- 
GitLab