Import Debian changes 1.1~pre15-1

tinc (1.1~pre15-1) experimental; urgency=medium

  * New upstream release.
  * Bump Standards-Version.
  * Bump debian/compat.
  * Don't use while loops checking PID files anymore, the tinc CLI will
    wait properly for the daemon to start or stop. Closes: #772379, #832784
  * Clean up scripts as suggested by Dominik George. Closes: #832781
  * Test for /etc/default/tinc before trying to source it. Closes: #777262

debian/patches/fix-version-number

@@ -5,7 +5,7 @@
  
  AC_PREREQ(2.61)
 -AC_INIT([tinc], m4_esyscmd_s((git describe || echo UNKNOWN) | sed 's/release-//'))
-+AC_INIT([tinc], m4_esyscmd_s((git describe || echo 1.1pre14-16-g15b868e) | sed 's/release-//'))
++AC_INIT([tinc], [1.1~pre15])
  AC_CONFIG_SRCDIR([src/tincd.c])
  AC_GNU_SOURCE
  AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall])

debian/patches/reproducible-build

@@ -1,50 +0,0 @@
---- a/src/process.c
-+++ b/src/process.c
-@@ -219,8 +219,8 @@
- 
- 	openlogger(identname, logmode);
- 
--	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
--			   BUILD_VERSION, BUILD_DATE, BUILD_TIME, debug_level);
-+	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s starting, debug level %d",
-+			   BUILD_VERSION, debug_level);
- 
- 	return true;
- }
---- a/src/tincctl.c
-+++ b/src/tincctl.c
-@@ -87,8 +87,8 @@
- };
- 
- static void version(void) {
--	printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
--		   BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
-+	printf("%s version %s (protocol %d.%d)\n", PACKAGE,
-+		   BUILD_VERSION, PROT_MAJOR, PROT_MINOR);
- 	printf("Copyright (C) 1998-2016 Ivo Timmermans, Guus Sliepen and others.\n"
- 			"See the AUTHORS file for a complete list.\n\n"
- 			"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
---- a/src/tincd.c
-+++ b/src/tincd.c
-@@ -344,8 +344,8 @@
- 	chdir(confbase);
- 
- 	if(show_version) {
--		printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
--			   BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
-+		printf("%s version %s (protocol %d.%d)\n", PACKAGE,
-+			   BUILD_VERSION, PROT_MAJOR, PROT_MINOR);
- 		printf("Copyright (C) 1998-2016 Ivo Timmermans, Guus Sliepen and others.\n"
- 				"See the AUTHORS file for a complete list.\n\n"
- 				"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
---- a/src/version.c
-+++ b/src/version.c
-@@ -22,8 +22,6 @@
- #include "../config.h"
- 
- /* This file is always rebuilt (even if there are no changes) so that the following is updated */
--const char* const BUILD_DATE = __DATE__;
--const char* const BUILD_TIME = __TIME__;
- #ifdef GIT_DESCRIPTION
- const char* const BUILD_VERSION = GIT_DESCRIPTION;
- #else

debian/patches/series

@@ -1,2 +1 @@
 fix-version-number
-reproducible-build