From fdcaa944276891ec12de887b8ac0a76835d16188 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 10 Nov 2012 01:00:32 +0100
Subject: last changes for release.

---
 Makefile.am                      |  1 +
 NEWS                             |  2 +-
 cfg.mk                           |  2 +-
 doc/manpages/Makefile.am         |  2 ++
 tests/cert-tests/Makefile.am     |  2 +-
 tests/cert-tests/cert-ecc256.pem | 18 ++++++++++++++++++
 tests/cert-tests/dane            |  2 +-
 7 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 tests/cert-tests/cert-ecc256.pem

diff --git a/Makefile.am b/Makefile.am
index 74208b1e38..c4a4bfada6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,3 +50,4 @@ dist-hook:
 		mv -f *.1 ../doc/manpages/; \
 	done
 	sed 's/\@\@VERSION\@\@/$(VERSION)/g' -i $(distdir)/doc/invoke-*.texi
+	touch $(distdir)/doc/*.html $(distdir)/doc/*.pdf
diff --git a/NEWS b/NEWS
index 2fef15638c..06ed439cab 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ GnuTLS NEWS -- History of user-visible changes.                -*- outline -*-
 Copyright (C) 2000-2012 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-* Version 3.1.4 (unreleased)
+* Version 3.1.4 (released 2012-11-10)
 
 ** libgnutls: gnutls_certificate_verify_peers2() will set flags depending on
 the available revocation data validity.
diff --git a/cfg.mk b/cfg.mk
index 5fbb5cfb30..66e95f609a 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -115,7 +115,7 @@ clang-upload:
 # Release
 
 ChangeLog:
-	git log --pretty --numstat --summary --since="2010 November 07" -- | git2cl > ChangeLog
+	git log --pretty --numstat --summary --since="2011 November 07" -- | git2cl > ChangeLog
 	cat .clcopying >> ChangeLog
 
 tag = $(PACKAGE)_`echo $(VERSION) | sed 's/\./_/g'`
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 562a1428c9..b477482a36 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -19,6 +19,8 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+EXTRA_DIST = stamp_mans
+
 dist_man_MANS = gnutls-cli.1 gnutls-cli-debug.1 gnutls-serv.1	\
 	certtool.1 psktool.1 p11tool.1 ocsptool.1 tpmtool.1
 
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 0819b2d99a..367ab59f67 100644
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -21,7 +21,7 @@
 
 EXTRA_DIST = ca-no-pathlen.pem no-ca-or-pathlen.pem aki-cert.pem \
 	template-test.key template-test.pem template-test.tmpl \
-	funny-spacing.pem ca-certs.pem dane-test.rr
+	funny-spacing.pem ca-certs.pem dane-test.rr cert-ecc256.pem
 
 dist_check_SCRIPTS = pathlen aki template-test pem-decoding dane
 
diff --git a/tests/cert-tests/cert-ecc256.pem b/tests/cert-tests/cert-ecc256.pem
new file mode 100644
index 0000000000..3f5cbc1fc2
--- /dev/null
+++ b/tests/cert-tests/cert-ecc256.pem
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC4DCCAoagAwIBAgIBBzAKBggqhkjOPQQDAjB9MQswCQYDVQQGEwJCRTEPMA0G
+A1UEChMGR251VExTMSUwIwYDVQQLExxHbnVUTFMgY2VydGlmaWNhdGUgYXV0aG9y
+aXR5MQ8wDQYDVQQIEwZMZXV2ZW4xJTAjBgNVBAMTHEdudVRMUyBjZXJ0aWZpY2F0
+ZSBhdXRob3JpdHkwIhgPMjAxMjA5MDEwOTIyMzZaGA8yMDE5MTAwNTA5MjIzNlow
+gbgxCzAJBgNVBAYTAkdSMRIwEAYDVQQKEwlLb2tvIGluYy4xFzAVBgNVBAsTDnNs
+ZWVwaW5nIGRlcHQuMQ8wDQYDVQQIEwZBdHRpa2kxFTATBgNVBAMTDENpbmR5IExh
+dXBlcjEXMBUGCgmSJomT8ixkAQETB2NsYXVwZXIxDDAKBgNVBAwTA0RyLjEPMA0G
+A1UEQRMGamFja2FsMRwwGgYJKoZIhvcNAQkBFg1ub25lQG5vbmUub3JnMFkwEwYH
+KoZIzj0CAQYIKoZIzj0DAQcDQgAEPBVvHUg+ZFkTLG0EGjgNMFzkP1XL2RcVRnJx
+ksH4xjM9BC7IwQ/AUAR7n8lItUD6b5OCWWFeclfLgwa9zIKUwaOBtjCBszAMBgNV
+HRMBAf8EAjAAMD0GA1UdEQQ2MDSCDHd3dy5ub25lLm9yZ4ITd3d3Lm1vcmV0aGFu
+b25lLm9yZ4IJbG9jYWxob3N0hwTAqAEBMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8G
+A1UdDwEB/wQFAwMHgAAwHQYDVR0OBBYEFKz6R2fGG0F5Elf3rAXBUOKO0A5bMB8G
+A1UdIwQYMBaAFPC0gf6YEr+1KLlkQAPLzB9mTigDMAoGCCqGSM49BAMCA0gAMEUC
+ICgq4CTInkRQ1DaFoI8wmu2KP8445NWRXKouag2WJSFzAiEAx4KxaoZJNVfBBSc4
+bA9XTz/2OnpgAZutUohNNb/tmRE=
+-----END CERTIFICATE-----
diff --git a/tests/cert-tests/dane b/tests/cert-tests/dane
index e62c7cf12f..0f7907b6fd 100755
--- a/tests/cert-tests/dane
+++ b/tests/cert-tests/dane
@@ -25,7 +25,7 @@ set -e
 srcdir=${srcdir:-.}
 DANETOOL=${DANETOOL:-../../src/danetool$EXEEXT}
 
-$DANETOOL --tlsa-rr --load-certificate $srcdir/../certs/cert-ecc256.pem --host www.example.com --outfile tmp-dane.rr 2>/dev/null
+$DANETOOL --tlsa-rr --load-certificate $srcdir/cert-ecc256.pem --host www.example.com --outfile tmp-dane.rr 2>/dev/null
 
 diff $srcdir/dane-test.rr tmp-dane.rr
 rc=$?
-- 
cgit v1.2.1