summaryrefslogtreecommitdiffstats
path: root/build-aux/speedo
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2016-04-20 11:02:39 +0200
committerWerner Koch <wk@gnupg.org>2016-04-20 12:21:52 +0200
commit2385b9f1ddc4938e45c01a12a804f4b77d253305 (patch)
tree50cff78880d95cb466162c36a23b75d106c81387 /build-aux/speedo
parentgpg: Improve UID selction of --quick-sign-key. (diff)
downloadgnupg2-2385b9f1ddc4938e45c01a12a804f4b77d253305.tar.xz
gnupg2-2385b9f1ddc4938e45c01a12a804f4b77d253305.zip
speedo: Use swdb.lst to define the SQLite version.
* build-aux/speedo.mk: Change sqlite to use our mirror and the swdb.lst file. * build-aux/speedo/w32/inst.nsi: gpg is now build and installed as gpg. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'build-aux/speedo')
-rw-r--r--build-aux/speedo/w32/inst.nsi4
-rw-r--r--build-aux/speedo/w32/pkg-copyright.txt26
2 files changed, 24 insertions, 6 deletions
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index cb73e914e..a695d990a 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -573,8 +573,8 @@ Section "GnuPG" SEC_gnupg
SectionIn RO
SetOutPath "$INSTDIR\bin"
- File /oname=gpg.exe "bin/gpg2.exe"
- File /oname=gpgv.exe "bin/gpgv2.exe"
+ File "bin/gpg.exe"
+ File "bin/gpgv.exe"
File "bin/gpgsm.exe"
File "bin/gpgconf.exe"
File "bin/gpg-connect-agent.exe"
diff --git a/build-aux/speedo/w32/pkg-copyright.txt b/build-aux/speedo/w32/pkg-copyright.txt
index 4cc4dc928..9495bcd8a 100644
--- a/build-aux/speedo/w32/pkg-copyright.txt
+++ b/build-aux/speedo/w32/pkg-copyright.txt
@@ -1,11 +1,11 @@
Here is a list with collected copyright notices. For details see the
-description of each individual package. [Compiled by wk FIXME]
+description of each individual package. [Compiled by wk 2016-04-20]
GnuPG is
- Copyright (C) 1997-2015 Werner Koch
- Copyright (C) 1994-2015 Free Software Foundation, Inc.
- Copyright (C) 2003-2015 g10 Code GmbH
+ Copyright (C) 1997-2016 Werner Koch
+ Copyright (C) 1994-2016 Free Software Foundation, Inc.
+ Copyright (C) 2003-2016 g10 Code GmbH
Copyright (C) 2002 Klarälvdalens Datakonsult AB
Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper <drepper@gnu.ai.mit.edu>
Copyright (C) 1994 X Consortium
@@ -102,3 +102,21 @@ NSIS is
[It is distributed along with NSIS and the same conditions as stated
above apply]
+
+
+ADNS is
+
+ Copyright (C) 1997-2000,2003,2006 Ian Jackson
+ Copyright (C) 1999-2000,2003,2006 Tony Finch
+ Copyright (C) 1991 Massachusetts Institute of Technology
+
+
+SQLite has
+
+ been put into the public-domain by its author D. Richard Hipp:
+ The author disclaims copyright to this source code. In place of
+ a legal notice, here is a blessing:
+
+ May you do good and not evil.
+ May you find forgiveness for yourself and forgive others.
+ May you share freely, never taking more than you give.