diff --git a/NEWS b/NEWS index 5e2de7fdd..3800c351c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +Noteworthy changes in version 2.0.25 (unreleased) +------------------------------------------------- + Noteworthy changes in version 2.0.24 (2014-06-24) ------------------------------------------------- diff --git a/configure.ac b/configure.ac index 4ea6606cb..2c92c3152 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ min_automake_version="1.10" # (git tag -s gnupg-2.n.m) and run "./autogen.sh --force". Please # bump the version number immediately *after* the release and do # another commit and push so that the git magic is able to work. -m4_define([mym4_version], [2.0.24]) +m4_define([mym4_version], [2.0.25]) # Below is m4 magic to extract and compute the git revision number, # the decimalized short revision number, a beta version string and a diff --git a/doc/Makefile.am b/doc/Makefile.am index a1ca4ba06..376a8f3be 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -140,8 +140,8 @@ online: gnupg.html gnupg.pdf if echo "@PACKAGE_VERSION@" | grep -- "-git" >/dev/null; then \ dashdevel="-devel" ; \ else \ - rsync -v gnupg.pdf $${user}@{webhost}:webspace/manuals/ ; \ + rsync -v gnupg.pdf $${user}@$${webhost}:webspace/manuals/ ; \ fi ; \ cd gnupg.html ; \ - rsync -vr --exclude='.svn' . \ - $${user}@{webhost}:webspace/manuals/gnupg$${dashdevel}/ + rsync -vr --exclude='.git' . \ + $${user}@$${webhost}:webspace/manuals/gnupg$${dashdevel}/