Import Debian changes 1.1~pre17-1

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

  * New upstream release.
    - Includes fixes for CVE-2018-16737, CVE-2018-16738.
    - The GUI is no longer part of upstream, so has been removed.
  * Link with the miniupnpc library.
  * Bump Standards-Version.
  * Bump debian/compat.

debian/changelog

@@ -1,3 +1,14 @@
+tinc (1.1~pre17-1) experimental; urgency=medium
+
+  * New upstream release.
+    - Includes fixes for CVE-2018-16737, CVE-2018-16738.
+    - The GUI is no longer part of upstream, so has been removed.
+  * Link with the miniupnpc library.
+  * Bump Standards-Version.
+  * Bump debian/compat.
+
+ -- Guus Sliepen <guus@debian.org>  Mon, 08 Oct 2018 16:32:57 +0200
+
 tinc (1.1~pre15-1) experimental; urgency=medium
 
   * New upstream release.

debian/compat

@@ -1 +1 @@
-10
+11

debian/control

@@ -2,8 +2,8 @@ Source: tinc
 Section: net
 Priority: optional
 Maintainer: Guus Sliepen <guus@debian.org>
-Standards-Version: 4.0.0
-Build-Depends: libssl-dev (>>1.0.0), debhelper (>= 10), texinfo, zlib1g-dev, liblzo2-dev, libncurses5-dev, libreadline-dev, libvdeplug-dev, python | python-all | python-dev | python-all-dev, dh-python
+Standards-Version: 4.2.1
+Build-Depends: libssl-dev (>>1.0.0), debhelper (>= 11), texinfo, zlib1g-dev, liblzo2-dev, libncurses5-dev, libreadline-dev, libvdeplug-dev, libminiupnpc-dev
 Homepage: https://www.tinc-vpn.org/
 
 Package: tinc
@@ -14,15 +14,3 @@ Description: Virtual Private Network daemon
  (VPN). One daemon can handle multiple connections, so you can
  create an entire (moderately sized) VPN with only one daemon per
  participating computer.
-
-Package: tinc-gui
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk3.0, tinc (>= 1.1~pre3-1)
-Description: graphical user interface for tinc
- tinc is a daemon with which you can create a virtual private network
- (VPN). One daemon can handle multiple connections, so you can
- create an entire (moderately sized) VPN with only one daemon per
- participating computer.
- .
- This package contains a GUI that can interact with a running tinc daemon,
- showing the known nodes, edges and subnets of a VPN.

debian/patches/fix-version-number

@@ -1,11 +1,11 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1,7 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.
+@@ -3,7 +3,7 @@
+ origcflags="$CFLAGS"
  
  AC_PREREQ(2.61)
 -AC_INIT([tinc], m4_esyscmd_s((git describe || echo UNKNOWN) | sed 's/release-//'))
-+AC_INIT([tinc], [1.1~pre15])
++AC_INIT([tinc], [1.1~pre17])
  AC_CONFIG_SRCDIR([src/tincd.c])
- AC_GNU_SOURCE
  AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall])
+ AC_CONFIG_HEADERS([config.h])

debian/rules

@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --parallel --with python2
+	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-vde --with-systemd
+	dh_auto_configure -- --enable-uml --enable-vde --enable-miniupnp --with-systemd
 	$(MAKE) clean
 
 override_dh_auto_install:

debian/tinc-gui.install

@@ -1,2 +0,0 @@
-usr/bin/tinc-gui
-usr/share/man/man8/tinc-gui.*

debian/tinc.dirs

@@ -1,6 +0,0 @@
-usr/sbin
-usr/share
-etc
-etc/init.d
-usr/share/doc/tinc
-etc/tinc

debian/tinc.files

@@ -1,6 +0,0 @@
-usr/sbin/tincd
-usr/sbin/tinc
-usr/share/man
-etc
-usr/share/doc/tinc
-usr/share/info

debian/tinc.install

@@ -1,8 +0,0 @@
-usr/sbin/tincd
-usr/sbin/tinc
-usr/share/doc/tinc/tinc.html
-usr/share/man/man5
-usr/share/man/man8/tincd.*
-usr/share/man/man8/tinc.*
-usr/share/info
-lib/systemd/system