summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfujiwarat <takao.fujiwara1@gmail.com>2016-01-19 13:24:51 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2016-01-19 13:24:51 +0900
commit350140e2db5af88c05a4de8a13ce0589c057424e (patch)
tree583578a7c644eec5dad0e5269cd7e0300ca256c4
parent8bc47907c3292c1f4ec6b8f101ea936c928c877a (diff)
downloadibus-350140e2db5af88c05a4de8a13ce0589c057424e.tar.gz
Release 1.5.12
Review URL: https://codereview.appspot.com/285130043
-rw-r--r--Makefile.am12
-rw-r--r--configure.ac6
2 files changed, 13 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 54cdb018..cc628bb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@
#
# ibus - The Input Bus
#
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 Red Hat, Inc.
+# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2016 Red Hat, Inc.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -95,11 +95,19 @@ DISTCHECK_CONFIGURE_FLAGS = \
dist-hook:
if test -d .git ; then \
git log --name-status --date=iso > $(distdir)/ChangeLog ; \
+ IBUS_PREV_MICRO_VERSION=`expr $(IBUS_MICRO_VERSION) - 1`; \
+ IBUS_PREV_VERSION=\
+"$(IBUS_MAJOR_VERSION).$(IBUS_MINOR_VERSION).$$IBUS_PREV_MICRO_VERSION"; \
+ echo "Changes in IBus $(IBUS_VERSION)" > $(distdir)/NEWS; \
+ echo "" >> $(distdir)/NEWS; \
+ git log $$IBUS_PREV_VERSION...$(IBUS_VERSION) --reverse \
+ --pretty=format:'%s (%an) %h' >> $(distdir)/NEWS; \
fi
distclean-local:
if test "x$(srcdir)" = "x."; then :; else \
rm -f ChangeLog; \
+ echo > NEWS; \
fi
MAINTAINERCLEANFILES = \
diff --git a/configure.ac b/configure.ac
index ac8243d3..59ca9347 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
#
# ibus - The Input Bus
#
-# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2015 Red Hat, Inc.
+# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2016 Red Hat, Inc.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -26,7 +26,7 @@ m4_define([ibus_released], [1])
m4_define([ibus_major_version], [1])
m4_define([ibus_minor_version], [5])
-m4_define([ibus_micro_version], [11])
+m4_define([ibus_micro_version], [12])
m4_define([ibus_abi_current], [5])
m4_define([ibus_abi_revision],
[m4_eval(100 * ibus_minor_version + ibus_micro_version)])