[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.1-14-g66fb36d

by Werner Koch cvs at cvs.gnupg.org
Mon Jul 1 15:15:11 CEST 2013 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  66fb36df1b3807c08453fd297f683763023627dc (commit)
       via  befee4c0a223abcc21d66b102e83ab8684128f69 (commit)
      from  87ee2c995f2618e7b4ec62942e4ab4e19ad3cf93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 66fb36df1b3807c08453fd297f683763023627dc
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jul 1 14:51:51 2013 +0200

    Post release version bump.
    
    --
    
    (A bit late, though)

diff --git a/NEWS b/NEWS
index 6e09174..504b258 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
+Noteworthy changes in version 2.1.2 (unreleased)
+------------------------------------------------
+
+
 Noteworthy changes in version 2.1.1 (2013-05-28)
 ------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index ed7f770..c700dd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.9.3"
 # commit and push so that the git magic is able to work.
 #
 # After a release the make target "copy-news" is to be called as well!
-m4_define([my_version], [2.1.1])
+m4_define([my_version], [2.1.2])
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a

commit befee4c0a223abcc21d66b102e83ab8684128f69
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jul 1 14:02:15 2013 +0200

    Get rid of the include/ directory.
    
    * include/config.nsi.in: Move to src/
    * include/Makefile.am: Remove.
    * include/: Remove.
    * src/Makefile.am (EXTRA_DIST): Add config.nsi.
    * Makefile.am (SUBDIRS): Remove "include".
    * configure.ac (AC_CONFIG_FILES): Remove include/Makefile.am.
    Add src/config.nsi.
    * src/gpg4win-src.nsi, src/gpg4win.nsi: Adjust include directive for
    config.nsi.
    --
    
    A separate include directory does not make sense and is often gets in
    the way when grepping for things.

diff --git a/.gitignore b/.gitignore
index 6a2a10d..38cf6ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ stamp-h1
 /*.tar.bz2
 /gpg4win-2.*
 doc/manual/version.tex
-include/config.nsi
+src/config.nsi
 po/POTFILES
 po/*.nsi
 po/gpg4win.pot
diff --git a/Makefile.am b/Makefile.am
index 830e17d..d422902 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32
 
-SUBDIRS = po packages include doc src
+SUBDIRS = po packages doc src
 
 EXTRA_DIST = autogen.sh README.GIT ONEWS \
         build-aux/git-log-footer build-aux/git-log-fix \
diff --git a/configure.ac b/configure.ac
index 0fcd94a..ed7f770 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ GIT_REVISION=git_revision
 GIT_REVISION_DEC=git_revision_dec
 
 
-AC_CONFIG_SRCDIR(include/config.nsi.in)
+AC_CONFIG_SRCDIR(src/config.nsi.in)
 AC_CONFIG_MACRO_DIR(m4)
 
 AM_INIT_AUTOMAKE([tar-ustar])
@@ -440,9 +440,9 @@ chmod +x patches/gnupg2/01-version.patch
 ]])
 
 AC_CONFIG_FILES(Makefile)
-AC_CONFIG_FILES(packages/Makefile include/Makefile src/Makefile po/Makefile.in)
+AC_CONFIG_FILES(packages/Makefile src/Makefile po/Makefile.in)
 AC_CONFIG_FILES(po/build-cc)
-AC_CONFIG_FILES(include/config.nsi src/gpg4win.mk)
+AC_CONFIG_FILES(src/config.nsi src/gpg4win.mk)
 AC_CONFIG_FILES(doc/Makefile)
 AC_CONFIG_FILES(doc/logo/Makefile)
 AC_CONFIG_FILES(doc/manual/Makefile doc/manual/version.tex)
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 02cccec..0000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# Makefile.am - Installer for GnuPG 4 Windows Makefile.
-# Copyright (C) 2005 g10 Code GmbH
-# 
-# This file is part of GPG4Win.
-# 
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-EXTRA_DIST = config.nsi.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 77ff1f4..119dc4c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,8 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
-EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
+EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
+	config.site config.nsi.in \
         installer-options.ini.in libiconv.def libintl.def loreley.mid \
         gpg4win-splash.wav gpgwrap.c exdll.h g4wihelp.c g4wihelp.nsi \
         inst-sections.nsi installer.nsi installer-finish.nsi  \
diff --git a/include/config.nsi.in b/src/config.nsi.in
similarity index 100%
rename from include/config.nsi.in
rename to src/config.nsi.in
diff --git a/src/gpg4win-src.nsi b/src/gpg4win-src.nsi
index 801f556..f7842b8 100644
--- a/src/gpg4win-src.nsi
+++ b/src/gpg4win-src.nsi
@@ -22,7 +22,7 @@
 !addincludedir "${TOP_SRCDIR}/po"
 !addincludedir "${SRCDIR}"
 !addplugindir "${BUILD_DIR}"
-!include "../include/config.nsi"
+!include "config.nsi"
 
 # We need StrRep.
 !include "StrFunc.nsh"
diff --git a/src/gpg4win.nsi b/src/gpg4win.nsi
index bb07951..d69468b 100644
--- a/src/gpg4win.nsi
+++ b/src/gpg4win.nsi
@@ -22,7 +22,7 @@
 !addincludedir "${TOP_SRCDIR}/po"
 !addincludedir "${SRCDIR}"
 !addplugindir "${BUILD_DIR}"
-!include "../include/config.nsi"
+!include "config.nsi"
 
 # For the "light" version of the package, we explicitely disable some
 # of the packages right after including config.nsi.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                     |    2 +-
 Makefile.am                    |    2 +-
 NEWS                           |    4 ++++
 configure.ac                   |    8 ++++----
 include/Makefile.am            |   20 --------------------
 src/Makefile.am                |    3 ++-
 {include => src}/config.nsi.in |    0
 src/gpg4win-src.nsi            |    2 +-
 src/gpg4win.nsi                |    2 +-
 9 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 include/Makefile.am
 rename {include => src}/config.nsi.in (100%)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org

More information about the Gpg4win-commits mailing list