From 075fe92e0eb9ad03bd8cb4630260557d18eab2fa Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Mon, 6 Jan 2014 13:38:14 +0100 Subject: Bump version to 1.6.2 Commit also contains fixes for make dist and make distcheck from master branch --- Makefile.am | 2 -- configure.ac | 8 ++------ help/Makefile.am | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 61befbb..ec60574 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,8 +20,6 @@ man_MANS = mate-terminal.1 bin_SCRIPTS = mate-terminal.wrapper EXTRA_DIST = \ - ChangeLog.pre-2-23 \ - ChangeLog.README \ HACKING \ mate-doc-utils.make \ xmldocs.make \ diff --git a/configure.ac b/configure.ac index a0c3f52..f9328c6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ m4_define([gt_version_major],[1]) m4_define([gt_version_minor],[6]) -m4_define([gt_version_micro],[1]) +m4_define([gt_version_micro],[2]) m4_define([gt_version_extra],[]) m4_define([gt_version],[gt_version_major().gt_version_minor().gt_version_micro()gt_version_extra]) @@ -11,7 +11,7 @@ AC_CONFIG_SRCDIR([src/terminal.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2]) +AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])]) @@ -178,10 +178,6 @@ src/Makefile src/terminal-version.h src/skey/Makefile help/Makefile -help/bg/Makefile -help/ro/Makefile -help/ja/Makefile -help/zh_TW/Makefile po/Makefile.in ]) AC_OUTPUT diff --git a/help/Makefile.am b/help/Makefile.am index 5336a66..6c81395 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -12,6 +12,4 @@ DOC_LINGUAS = da de ca cs el en_GB es fr it ko oc pt_BR ru sv uk zh_CN # Move to DOC_LINGUAS in transition to mate-doc-utils -SUBDIRS = bg ro ja zh_TW - -include $(top_srcdir)/git.mk -- cgit v1.2.1