Merge branch 'master' of ssh://gnunet.org/gnunet

2 files changed, 29 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index f0d86b5ef..42a019674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnunet (0.14.0-2) unstable; urgency=medium
+
+  * Bugfix in GMT conversion of GNUNET_TIME_year_to_time().
+  * Other minor upstream fixes.
+
+ -- Christian Grothoff <grothoff@gnu.org>  Thu, 21 Jan 2021 12:02:10 +0100
+
 gnunet (0.14.0-1) unstable; urgency=medium
 
   * Renamed gnunet-dev to libgnunet-dev.
diff --git a/debian/patches/0001-Dont_copy_license_file.patch b/debian/patches/0001-Dont_copy_license_file.patch
new file mode 100644
index 000000000..5b13ab66e
--- /dev/null
+++ b/debian/patches/0001-Dont_copy_license_file.patch
@@ -0,0 +1,22 @@
+From: Bertrand Marc <bmarc@debian.org>
+Date: Sun, 5 Jul 2020 14:58:43 +0200
+Subject: Dont_copy_license_file
+
+---
+ contrib/Makefile.inc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/contrib/Makefile.inc b/contrib/Makefile.inc
+index a563ef4..c737a07 100644
+--- a/contrib/Makefile.inc
++++ b/contrib/Makefile.inc
+@@ -8,8 +8,7 @@ BUILDCOMMON_SHLIB_FILES = \
+     build-common/sh/lib.sh/existence_python.sh \
+     build-common/sh/lib.sh/msg.sh \
+     build-common/sh/lib.sh/progname.sh \
+-    build-common/sh/lib.sh/version_gnunet.sh \
+-    build-common/LICENSE
++    build-common/sh/lib.sh/version_gnunet.sh
+ 
+ BUILDCOMMON_CONF_FILES = \
+     build-common/conf/.dir-locals.el \