[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-161-g6894089
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Jun 24 12:57:32 CEST 2016
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 6894089ec66139e471b20100be2bb7fd3002991d (commit)
via 1a69bf23467295db9ca11bb41c826154d9ef76af (commit)
via 11216270c3a145f55bbbecf4eddb7389f540c493 (commit)
via ca9c945859efc37d63bf6737d99e839a9c0e7dab (commit)
via b1f5d7ea3589945add51ac070dfacb6522e40480 (commit)
from 525086e05d425715ca85aa519a23abda629fd4b9 (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 6894089ec66139e471b20100be2bb7fd3002991d
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jun 24 12:56:51 2016 +0200
Fix make dist
* Makefile.am (EXTRA_DIST): Fix path to gpgmepp patch.
diff --git a/Makefile.am b/Makefile.am
index 0fa7a12..b10a3ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
patches/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for-Windows.patch \
- patches/drop-version-dep.patch
+ patches/gpgmepp/drop-version-dep.patch
copy-news:
commit 1a69bf23467295db9ca11bb41c826154d9ef76af
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jun 24 12:54:47 2016 +0200
Mention README-msi.txt in README and for deps
* README: Mention README-msi.txt
* src/README-msi.txt: Mention uuid-runtime.
--
Thanks to Ángel González <angel at pgp.16bits.net> for noticing
this.
diff --git a/README b/README
index 2dd12e0..ef42273 100644
--- a/README
+++ b/README
@@ -2,6 +2,8 @@ This is gpg4win - the GUI Installer Builder for W32.
See also the file doc/README.en.txt.
+For MSI Package instructions see src/README-msi.txt.
+
Instructions:
=============
@@ -38,7 +40,8 @@ Basic requirements
A decent POSIX system is required for building this software as well
as GNU make. We are using Debian GNU/Linux 8 (Jessie), any other
POSIX system should work as well but you may run into problems due to
-different toolchain versions.
+different toolchain versions. For MSI Packages you will additionally
+need the dependencies mentioned in src/README-msi.txt
To satisfy all needs of configure at least the following packages need
to be installed:
diff --git a/src/README-msi.txt b/src/README-msi.txt
index 79d3a80..85d3961 100644
--- a/src/README-msi.txt
+++ b/src/README-msi.txt
@@ -20,6 +20,8 @@ Prerequisites
for example using a network connection and SMB, or a data medium to
transfer several hundred MB of data
+* Debian Packages: uuid-runtime
+
Instructions
============
commit 11216270c3a145f55bbbecf4eddb7389f540c493
Author: Ángel González <angel at pgp.16bits.net>
Date: Fri Jun 24 12:50:38 2016 +0200
MSI: Fix parsing installer.nsi
* src/installer.nsi: Move comment to next line.
--
Make MSI appears not to like comments in the same line with
instructions.
Signed-off-by: Andre Heinecke <aheinecke at intevation.de>
diff --git a/src/installer.nsi b/src/installer.nsi
index 59ec917..cc9b798 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -204,7 +204,9 @@ LangString T_RunKleopatra ${LANG_ENGLISH} \
LangString T_RunGPA ${LANG_ENGLISH} \
"Run GPA"
-!endif # SOURCES
+
+# /SOURCES
+!endif
# Uninstaller pages.
commit ca9c945859efc37d63bf6737d99e839a9c0e7dab
Author: Ángel González <angel at pgp.16bits.net>
Date: Fri Jun 24 12:49:13 2016 +0200
MSI: Fix unsupported outh path $TEMP error
* src/make-msi.pl (gpg4win_nsis_stubs): Fix $TEMP substitution.
--
Signed-off-by: Andre Heinecke <aheinecke at intevation.de>
diff --git a/src/make-msi.pl b/src/make-msi.pl
index df5bbe0..09c65c0 100644
--- a/src/make-msi.pl
+++ b/src/make-msi.pl
@@ -777,6 +777,10 @@ sub gpg4win_nsis_stubs
{
$parser->{outpath} = "%CommonAppDataFolder%\\" . $1;
}
+ elsif ($outpath =~ m/^"\$TEMP\\?(.*)"$/)
+ {
+ $parser->{outpath} = "%TEMP%\\" . $1;
+ }
else
{
fail "$file:$.: unsupported out path: $args[0]";
commit b1f5d7ea3589945add51ac070dfacb6522e40480
Author: Ángel González <angel at pgp.16bits.net>
Date: Fri Jun 24 12:34:07 2016 +0200
Redownload the package if size is zero
* packages/download.sh: Redownlad on zero size.
--
This can help if a mirror is temporaryily unavailable
and properly show a download error instead of a checksum
error in case download servers are unavailable.
Signed-off-by: Andre Heinecke <aheinecke at intevation.de>
diff --git a/packages/download.sh b/packages/download.sh
index 86ec679..ee7dfdd 100755
--- a/packages/download.sh
+++ b/packages/download.sh
@@ -155,7 +155,7 @@ while read key value ; do
if [ -z "$name" ]; then
name=`basename "$value"`
fi
- if [ -f "$name" -a "$force" = "no" ]; then
+ if [ -s "$name" -a "$force" = "no" ]; then
[ $quiet = no ] && echo "package \`$url' ... already exists"
else
echo -n "downloading \`$url' ..."
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
README | 5 ++++-
packages/download.sh | 2 +-
src/README-msi.txt | 2 ++
src/installer.nsi | 4 +++-
src/make-msi.pl | 4 ++++
6 files changed, 15 insertions(+), 4 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list