Guido Günther · Guido Günther · Guido Günther · Guido Günther · Guido Günther · Guido Günther
--- a/AUTHORS
+++ b/AUTHORS
@@ -107,6 +107,7 @@ Steven Carr <Steven.Carr@scaa-usa.com>
 Sébastien Granjoux <seb.sfo@free.fr>
 Takeshi AIHANA <takeshi.aihana@gmail.com>
 Victor Ibragimov <victor.ibragimov@gmail.com>
+Victor Toso <me@victortoso.com>
 Yaron Shahrabani <sh.yaron@gmail.com>
 Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
 anthony@rhesus <anthony@codemonkey.ws>

--- a/ChangeLog
+++ b/ChangeLog
+2018-08-17  Daniel P. Berrangé  <berrange@redhat.com>
+
+	Update NEWS for 0.9.0 release
+
+	Bump next version to 0.9.0
+
+	Avoid uint8_t type as that's not always defined
+
+	Remove obsolete --without-python arg from mingw RPM
+
+	Reallow python2 usage
+	The keycodemapdb generator in fact works with python 2 or 3 so there is
+	no reason to force python 3 at this time.
+
+	Update bug tracker URL
+
+	Require glib2 >= 2.42.0
+	Based on targetted distros it is reasonable to require glib >= 2.42.0
+
+	   RHEL-7: 2.50.3
+	   Debian (Stretch): 2.50.3
+	   Debian (Jessie): 2.42.1
+	   OpenBSD (Ports): 2.54.3
+	   FreeBSD (Ports): 2.50.3
+	   OpenSUSE Leap 15: 2.54.3
+	   SLE12-SP2: 2.48.2
+	   Ubuntu (Xenial): 2.48.0
+	   macOS (Homebrew): 2.56.0
+
+	Require libgcrypt >= 1.5.0
+	libgcrypt 1.5.0 was released in 2011 and all the distros that are build
+	target platforms for GTK-VNC include it:
+
+	      RHEL-7: 1.5.3
+	      Debian (Stretch): 1.7.6
+	      Debian (Jessie): 1.6.3
+	      OpenBSD (ports): 1.8.2
+	      FreeBSD (ports): 1.8.3
+	      OpenSUSE Leap 15: 1.8.2
+	      Ubuntu (Xenial): 1.6.5
+	      macOS (Homebrew): 1.8.3
+
+	Based on this, it is reasonable to require libgcrypt >= 1.5.0 in QEMU
+	which allows for some conditional version checks in the code to be
+	removed.
+
+	Require gnutls >= 3.1.18
+	gnutls 3.0.0 was released in 2011 and all the distros that are build
+	target platforms for GTK-VNC include it:
+
+	      RHEL-7: 3.1.18
+	      Debian (Stretch): 3.5.8
+	      Debian (Jessie): 3.3.8
+	      OpenBSD (ports): 3.5.18
+	      FreeBSD (ports): 3.5.18
+	      OpenSUSE Leap 15: 3.6.2
+	      Ubuntu (Xenial): 3.4.10
+	      macOS (Homebrew): 3.5.19
+
+	Based on this, it is reasonable to require gnutls >= 3.1.18 in GTK-VNC
+	which allows for all conditional version checks in the code to be
+	removed.
+
+	Protect against divide by zero in MSLogon auth
+
+	Support new code for ultravnc mslogon auth type
+	The old AUTH_MSLOGON code is only used with vnc 3.3 protocol version.
+	The new auth type code functions in exactly the same way as the old
+	version.
+
+	Check for error after reading mslogon params
+
+	Add missing cipher close calls for ARD auth
+
+	Convert to use gcrypt for d3des routines
+	By munging the DES key we can use the standard APIs for DES
+
+2018-08-01  Piotr Drąg  <piotrdrag@gmail.com>
+
+	Add POTFILES.skip
+
+2018-08-01  Daniel P. Berrangé  <berrange@redhat.com>
+
+	rpm: remove obsolete defattr statements
+
+	rpm: skip gtk2-devel if gtk2 is not enabled
+
+	configure: post release version bump
+
+	README: update outdated notes about GTK/python
+
+	Update NEWS for 0.8.0 release
+
+	Pull in latest keycodemapdb content
+
+2018-07-23  Daniel P. Berrangé  <berrange@redhat.com>
+
+	Remove unused variable from configure script
+
+	Allow gtk2 build to be disabled
+
+2018-07-16  Victor Toso  <me@victortoso.com>
+
+	build-sys: Disable -Wcast-function-type
+	Previous commit fixed one -Wcast-function-type but the remaining ones
+	are related to g_source_set_callback() which cannot be solved with
+	intermediate wrappers as the callback signature will vary depending on
+	the source it's called on.
+
+	This commit suppress the following:
+
+	 | vncconnection.c: In function 'g_io_wait':
+	 | vncconnection.c:343:32: warning: cast between incompatible function types from
+	 |  'gboolean (*)(GSocket *, GIOCondition,  void *)' ... to
+	 |  'gboolean (*)(void *)' ...
+	 |
+	 |    g_source_set_callback(src, (GSourceFunc)g_io_wait_helper, coroutine_self(), NULL);
+	 |                               ^
+	 |
+	 | vncconnection.c: In function 'g_io_wait_interruptable':
+	 | vncconnection.c:379:32: warning: cast between incompatible function types from
+	 |  'gboolean (*)(GSocket *, GIOCondition,  void *)' ... to
+	 |  'gboolean (*)(void *)' ...
+	 |
+	 |    g_source_set_callback(src, (GSourceFunc)g_io_wait_helper,
+	 |                               ^
+
+	Fix -Wcast-function-type on vnc_base_framebuffer_rgb24_blt_*
+	The y axis is uint16 on vnc_base_framebuffer_rgb24_blt_func()
+
+2018-07-16  Daniel P. Berrangé  <berrange@redhat.com>
+
+	Delete old manual python binding
+	All applications should use the GObject Introspection dynamic binding
+
 2018-03-23  Daniel P. Berrangé  <berrange@redhat.com>

 	Update NEWS for 0.7.2 release

--- a/Makefile.in
+++ b/Makefile.in
@@ -291,7 +291,7 @@ GIOUNIX_CFLAGS = @GIOUNIX_CFLAGS@
 GIOUNIX_LIBS = @GIOUNIX_LIBS@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
-GIO_REQUIRED = @GIO_REQUIRED@
+GLIB_REQUIRED = @GLIB_REQUIRED@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -299,7 +299,6 @@ GNUTLS_LIBS = @GNUTLS_LIBS@
 GNUTLS_REQUIRED = @GNUTLS_REQUIRED@
 GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
 GOBJECT_LIBS = @GOBJECT_LIBS@
-GOBJECT_REQUIRED = @GOBJECT_REQUIRED@
 GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
@@ -377,11 +376,8 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
 PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-PYGTK_CFLAGS = @PYGTK_CFLAGS@
-PYGTK_LIBS = @PYGTK_LIBS@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@

--- a/NEWS
+++ b/NEWS
    GTK VNC News
    ============

+Aug 17, 2018: Release 0.9.0
+===========================
+
+Note that the next release (1.0.0) will drop support for GTK-2
+
+ o Requires gnutls >= 3.1.18
+ o Requires libgcrypt >= 1.5.0
+ o Requires glib2 >= 2.42.0
+ o Use libgcrypt for DES routines
+ o Add missing cipher close calls in ARD auth
+ o Check for errors after reading mslogon params
+ o Support newer UltraVNC mslogon auth type code
+ o Avoid divide by zero in mslogin auth from bogus params
+ o Re-allow python2 accidentally blocked when removing
+   python binding
+
+Aug  1, 2018: Release 0.8.0
+===========================
+
+ o Deleted the python2 binding in favour of GObject introspection
+ o Pull in latest keycodemapdb content
+ o Disable/fix -Wcast-function-type warnings
+
 Mar 23, 2018: Release 0.7.2
 ===========================


--- a/README
+++ b/README
@@ -9,8 +9,7 @@ asynchronous while remaining single threaded. It provides
 two core C libraries, libgvnc for interacting with the core
 RFB protocol and libgtk-vnc for a GTK display widget.

-There is a traditional Python binding built on PyGTK, and
-evolving support for arbitrary languages via the GObject
+Access from non-C languages is available using the GObject
 Introspection system.

 For information about the project visit the webpage at:
@@ -21,32 +20,26 @@ To contact developers use the project mailing list at:

  http://mail.gnome.org/mailman/listinfo/gtk-vnc-list

-To browse or report bugs, go to our bugzilla page at:
-
-  http://bugzilla.gnome.org/browse.cgi?product=gtk-vnc
+To browse or report bugs, go to our bug tracker page at:

+  https://gitlab.gnome.org/GNOME/gtk-vnc/issues

 Installation notes
 ------------------

- * GTK2/GTK3: The build currently defaults to using GTK2.
-   To enable GTK3 support the flag '--with-gtk=3.0' must
+ * GTK2/GTK3: The build currently defaults to using GTK3.
+   To enable legacy GTK2 support the flag '--with-gtk=2.0' must
   be passed to configure.

-         ./configure --with-gtk=3.0
-
-   Notes on GTK3 support:
-
-    - The traditional python bindings are disabled when GTK3
-      is used. Applications should use the GObject introspection
-      bindings instead.
+         ./configure --with-gtk=2.0

-    - When built against GTK3, the library name for gtk-vnc
+   Note that when built against GTK3 the library name for gtk-vnc
   will become 'gtk-vnc-2.0.so' and the pkg-config file will
-      also be 'gtk-vnc-2.0'.
+   also be 'gtk-vnc-2.0', rather than 'gtk-vnc-1.0.so' and 'gtk-vnc-1.0'
+   for the GTK2 build.

-    - The gvnc library is unaffected by GTK2/GTK3 build
-      since it only depends on GLib/GIO
+   The gvnc library is unaffected by GTK2/GTK3 build choice since it
+   only depends on GLib/GIO

 * NetBSD: You must run configure using


--- a/aclocal.m4
+++ b/aclocal.m4
@@ -47,7 +47,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 #
 # Modified to require ngettext
 # Matthias Clasen <mclasen@redhat.com> 08/06/2004
-#
+
+# Increment this whenever this file is changed.
+#serial 1
+
 # We need this here as well, since someone might use autoconf-2.5x
 # to configure GLib then an older version to configure a package
 # using AM_GLIB_GNU_GETTEXT

--- a/build-aux/compile
+++ b/build-aux/compile
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -7272,10 +7272,12 @@ func_mode_link ()
      # -tp=*                Portland pgcc target processor selection
      # --sysroot=*          for sysroot support
      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -specs=*             GCC specs files
      # -stdlib=*            select c++ std lib with clang
      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -specs=*)
        func_quote_for_eval "$arg"
 	arg=$func_quote_for_eval_result
        func_append compile_command " $arg"

--- a/build-aux/missing
+++ b/build-aux/missing
--- a/build-aux/test-driver
+++ b/build-aux/test-driver
--- a/config.h.in
+++ b/config.h.in
@@ -36,9 +36,6 @@
 /* Whether GIO UNIX is available */
 #undef HAVE_GIOUNIX

-/* whether gnutls uses gcrypt */
-#undef HAVE_GNUTLS_GCRYPT
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H


--- a/configure
+++ b/configure
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@

 AC_PREREQ(2.63)

-AC_INIT([gtk-vnc],[0.7.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gtk-vnc],[gtk-vnc],[https://wiki.gnome.org/Projects/gtk-vnc])
+AC_INIT([gtk-vnc],[0.9.0],[https://gitlab.gnome.org/GNOME/gtk-vnc/issues],[gtk-vnc],[https://wiki.gnome.org/Projects/gtk-vnc])
 AC_CONFIG_SRCDIR([src/vncconnection.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
@@ -27,21 +27,16 @@ dnl ****************************************************************************
 dnl Declare required library versions
 dnl *******************************************************************************

-GOBJECT_REQUIRED=2.10.0
-AC_SUBST(GOBJECT_REQUIRED)
-GIO_REQUIRED=2.10.0
-AC_SUBST(GIO_REQUIRED)
+GLIB_REQUIRED=2.42.0
+AC_SUBST(GLIB_REQUIRED)
 GDK_PIXBUF_REQUIRED=2.10.0
 AC_SUBST(GDK_PIXBUF_REQUIRED)
-GCRYPT_REQUIRED=1.4.0
+GCRYPT_REQUIRED=1.5.0
 AC_SUBST(GCRYPT_REQUIRED)
-GNUTLS_REQUIRED=2.2.0
+GNUTLS_REQUIRED=3.1.18
 AC_SUBST(GNUTLS_REQUIRED)

-PYGTK_REQUIRED=2.0.0
 VIEW_REQUIRED=0.6.0
-GTHREAD_REQUIRED=2.0.0
-PYTHON_REQUIRED=2.4
 CAIRO_REQUIRED=1.2.0

 dnl *******************************************************************************
@@ -118,20 +113,6 @@ AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])

 AC_CHECK_HEADERS([pwd.h termios.h])

-AC_ARG_WITH(python,
-[  --with-python           build python bindings],
-[case "${withval}" in
-   yes|no) ;;
-   *)      AC_MSG_ERROR([bad value ${withval} for python option]) ;;
- esac],[withval=yes])
-
-if test "$with_gtk" = "3.0"
-then
-  WITH_PYTHON=no
-else
-  WITH_PYTHON=$withval
-fi
-
 GTK_VNC_COMPILE_WARNINGS

 AC_ARG_WITH(examples,
@@ -169,15 +150,15 @@ AC_SUBST([NO_UNDEFINED_FLAGS])
 AC_SUBST([VERSION_SCRIPT_FLAGS])
 AM_CONDITIONAL([USE_VERSION_DEFS], [test "$USE_VERSION_DEFS" = "1"])

-PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >= $GOBJECT_REQUIRED)
+PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GOBJECT_CFLAGS)
 AC_SUBST(GOBJECT_LIBS)

-PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
+PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)

-PKG_CHECK_MODULES(GIOUNIX, gio-unix-2.0 >= $GIO_REQUIRED, [have_giounix=yes], [have_giounix=no])
+PKG_CHECK_MODULES(GIOUNIX, gio-unix-2.0 >= $GLIB_REQUIRED, [have_giounix=yes], [have_giounix=no])
 AC_SUBST(GIOUNIX_CFLAGS)
 AC_SUBST(GIOUNIX_LIBS)
 if test $have_giounix = "yes" ; then
@@ -261,21 +242,6 @@ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED)
 AC_SUBST(GNUTLS_CFLAGS)
 AC_SUBST(GNUTLS_LIBS)

-if $PKG_CONFIG --exists 'gnutls >= 3.0'; then
-    GNUTLS_GCRYPT=no
-elif $PKG_CONFIG --exists 'gnutls >= 2.12'; then
-    case `$PKG_CONFIG --libs --static gnutls` in
-      *gcrypt*) GNUTLS_GCRYPT=yes     ;;
-      *nettle*) GNUTLS_GCRYPT=no      ;;
-      *)        GNUTLS_GCRYPT=yes     ;;
-    esac
-else
-    GNUTLS_GCRYPT=yes
-fi
-if test "x$GNUTLS_GCRYPT" = "xyes"; then
-  AC_DEFINE_UNQUOTED([HAVE_GNUTLS_GCRYPT], [1], [whether gnutls uses gcrypt])
-fi
-

 dnl Cyrus SASL
 AC_ARG_WITH([sasl],
@@ -356,7 +322,7 @@ if test "$with_coroutine" = "ucontext"; then
 fi

 if test "$with_coroutine" = "gthread"; then
-  PKG_CHECK_MODULES(GTHREAD, gthread-2.0 > $GTHREAD_REQUIRED)
+  PKG_CHECK_MODULES(GTHREAD, gthread-2.0 > $GLIB_REQUIRED)
  WITH_UCONTEXT=0
 fi
 AC_SUBST(GTHREAD_CFLAGS)
@@ -365,33 +331,7 @@ AC_DEFINE_UNQUOTED([WITH_UCONTEXT],[$WITH_UCONTEXT], [Whether to use ucontext co
 AM_CONDITIONAL(WITH_UCONTEXT, [test "$WITH_UCONTEXT" != "0"])

 # Needed for keycodemap generator
-AM_PATH_PYTHON
-
-if test "$WITH_PYTHON" = "yes"; then
-  PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQUIRED)
-  AC_SUBST(PYGTK_CFLAGS)
-  AC_SUBST(PYGTK_LIBS)
-
-  AC_MSG_CHECKING([whether $PYTHON version >= $PYTHON_REQUIRED])
-  HAVE_PYTHON_REQUIRED=no
-  AM_PYTHON_CHECK_VERSION([$PYTHON], [$PYTHON_REQUIRED],
-      [HAVE_PYTHON_REQUIRED="yes"],
-      [HAVE_PYTHON_REQUIRED="no"])
-
-  AC_MSG_RESULT($HAVE_PYTHON_REQUIRED)
-
-  if test "x$HAVE_PYTHON_REQUIRED" != "xyes"
-  then
-    AC_MSG_ERROR("No suitable python found")
-  fi
-
-  AM_CHECK_PYTHON_HEADERS(have_python_headers=yes,have_python_headers=no)
-
-  if test "x$have_python_headers" != "xyes"
-  then
-    AC_MSG_ERROR("No python development headers found")
-  fi
-fi
+AM_PATH_PYTHON()

 dnl define a MAINT-like variable REBUILD which is set
 dnl if Perl, so autogenerated sources can be rebuilt
@@ -406,8 +346,6 @@ fi
 AC_SUBST(REBUILD)


-AM_CONDITIONAL(WITH_PYTHON, [test "$WITH_PYTHON" = "yes"])
-
 AM_CONDITIONAL(WITH_EXAMPLES, [test "$WITH_EXAMPLES" = "yes"])

 GOBJECT_INTROSPECTION_CHECK([0.9.4])
@@ -461,18 +399,9 @@ Configure summary:
 	Extra Link Flags ...........:  ${VERSION_SCRIPT_FLAGS} ${NO_UNDEFINED_FLAGS}
 	Prefix......................:  ${prefix}

-	Python binding .............:  ${WITH_PYTHON}
 	Install example programs ...:  ${WITH_EXAMPLES}
 	SASL support................:  ${enable_sasl}
 	PulseAudio support..........:  ${HAVE_PULSEAUDIO}
 	GTK+ version................:  ${GTK_API_VERSION}
 	TLS priority................:  ${with_tls_priority}
 "
-
-if test ${WITH_PYTHON} = "yes" ; then
-  echo "WARNING:"
-  echo "WARNING: The python2 binding will be deleted in the next release."
-  echo "WARNING: Please use the GObject Introspection dynamic bindings."
-  echo "WARNING:"
-  echo
-fi
--- a/debian/changelog
+++ b/debian/changelog
+gtk-vnc (0.9.0-1) unstable; urgency=medium
+
+  * [ffcc52b] New upstream version 0.9.0
+  * [a4bcc35] Drop PyGTK specific bindings.
+    Use GObject introspection instead. (Closes: #885376)
+  * [4e767fd] Bump build-deps. Upstream requires newer versions.
+  * [1842f7f] d/copyright: drop copyright of now gone files
+  * [855b8e1] d/control: Use salsa URL
+  * [dbf297c] Rediff patches
+  * [511748f] gvnc-1.0.pc.in: Use GLIB_REQUIRED
+
+ -- Guido Günther <agx@sigxcpu.org>  Thu, 30 Aug 2018 18:17:21 +0200
+
 gtk-vnc (0.7.2-1) unstable; urgency=medium

  * New upstream version 0.7.2

--- a/debian/control
+++ b/debian/control
@@ -8,29 +8,26 @@ Standards-Version: 4.1.3
 Build-Depends:
 debhelper (>= 10),
 dh-autoreconf,
- dh-python,
 gobject-introspection,
 intltool,
 libcairo2-dev,
 libffi-dev,
- libgcrypt20-dev,
+ libgcrypt20-dev (>= 1.5.0),
 libgirepository1.0-dev,
- libgnutls28-dev,
+ libglib2.0-dev (>= 2.42.0),
+ libgnutls28-dev (>= 3.1.18),
 libgtk-3-dev,
 libgtk2.0-dev,
 libpulse-dev,
 libsasl2-dev,
 libtext-csv-perl,
 libtool,
- python-dev,
- python-gtk2-dev (>= 2.0),
 valac (>= 0.20),
 Build-Conflicts:
 libffi4-dev,
 valac-0.12,
-X-Python-Version: >= 2.5
-Vcs-Git: https://anonscm.debian.org/git/pkg-libvirt/gtk-vnc.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-libvirt/gtk-vnc.git
+Vcs-Git: https://salsa.debian.org/libvirt-team/gtk-vnc.git
+Vcs-Browser: https://salsa.debian.org/libvirt-team/gtk-vnc
 Homepage: https://wiki.gnome.org/Projects/gtk-vnc

 Package: libgvnc-1.0-0
@@ -50,8 +47,9 @@ Description: VNC GObject wrapper (runtime libraries)
 VeNCrypt authentication extension providing SSL/TLS encryption with x509
 certificate authentication.
 .
- The core library is written in C and a binding for Python using PyGTK is
- available. The networking layer supports connections over both IPv4 and IPv6.
+ The core library is written in C and a bindings for other languages are
+ available via GObject introspection. The networking layer supports connections
+ over both IPv4 and IPv6.
 .
 This package contains the shared library.

@@ -72,8 +70,9 @@ Description: VNC GObject wrapper (development files)
 VeNCrypt authentication extension providing SSL/TLS encryption with x509
 certificate authentication.
 .
- The core library is written in C and a binding for Python using PyGTK is
- available. The networking layer supports connections over both IPv4 and IPv6.
+ The core library is written in C and a bindings for other languages are
+ available via GObject introspection. The networking layer supports connections
+ over both IPv4 and IPv6.
 .
 This package contains the development headers for libgvnc-1.0 and
 Vala bindings.
@@ -93,8 +92,9 @@ Description: VNC viewer widget for GTK+2 (runtime libraries)
 VeNCrypt authentication extension providing SSL/TLS encryption with x509
 certificate authentication.
 .
- The core library is written in C and a binding for Python using PyGTK is
- available. The networking layer supports connections over both IPv4 and IPv6.
+ The core library is written in C and a bindings for other languages are
+ available via GObject introspection. The networking layer supports connections
+ over both IPv4 and IPv6.
 .
 This package contains the shared library built for GTK+2.

@@ -114,10 +114,12 @@ Description: VNC viewer widget for GTK+2 (development files)
 VeNCrypt authentication extension providing SSL/TLS encryption with x509
 certificate authentication.
 .
- The core library is written in C and a binding for Python using PyGTK is
- available. The networking layer supports connections over both IPv4 and IPv6.
+ The core library is written in C and a bindings for other languages are
+ available via GObject introspection. The networking layer supports connections
+ over both IPv4 and IPv6.
 .
- This package contains the development headers.
+ This package contains the development headers for programs built against
+ GTK+2.

 Package: libgtk-vnc-2.0-0
 Architecture: any
@@ -132,8 +134,9 @@ Description: VNC viewer widget for GTK+3 (runtime libraries)
 VeNCrypt authentication extension providing SSL/TLS encryption with x509
 certificate authentication.
 .
- The core library is written in C and a binding for Python using PyGTK is
- available. The networking layer supports connections over both IPv4 and IPv6.
+ The core library is written in C and a bindings for other languages are
+ available via GObject introspection. The networking layer supports connections
+ over both IPv4 and IPv6.
 .
 This package contains the shared library built for GTK+3.

@@ -154,8 +157,9 @@ Description: VNC viewer widget for GTK+3 (development files)
 VeNCrypt authentication extension providing SSL/TLS encryption with x509
 certificate authentication.
 .
- The core library is written in C and a binding for Python using PyGTK is
- available. The networking layer supports connections over both IPv4 and IPv6.
+ The core library is written in C and a bindings for other languages are
+ available via GObject introspection. The networking layer supports connections
+ over both IPv4 and IPv6.
 .
 This package contains the development headers for libgtk-vnc-2.0 and Vala
 bindings.
@@ -181,25 +185,6 @@ Description: GObject introspection data for GTK-VNC
 It can be used by packages using the GIRepository format to generate
 dynamic bindings.

-Package: python-gtk-vnc
-Architecture: any
-Section: python
-Depends:
- python-gtk2 (>= 2.0),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends},
-Description: VNC viewer widget for GTK+2 (Python binding)
- It is built using coroutines, allowing it to be completely asynchronous while
- remaining single threaded. It supports RFB protocols 3.3 through 3.8 and the
- VeNCrypt authentication extension providing SSL/TLS encryption with x509
- certificate authentication.
- .
- The core library is written in C and a binding for Python using PyGTK is
- available. The networking layer supports connections over both IPv4 and IPv6.
- .
- This package contains the Python binding.
-
 Package: gvncviewer
 Architecture: any
 Section: x11
@@ -212,7 +197,8 @@ Description: VNC viewer using gtk-vnc
 VeNCrypt authentication extension providing SSL/TLS encryption with x509
 certificate authentication.
 .
- The core library is written in C and a binding for Python using PyGTK is
- available. The networking layer supports connections over both IPv4 and IPv6.
+ The core library is written in C and a bindings for other languages are
+ available via GObject introspection. The networking layer supports connections
+ over both IPv4 and IPv6.
 .
 This package contains the VNC viewer and VNC capture utility.
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,11 +13,6 @@ Copyright: 2003-2008 Free Software Foundation, Inc.
           2008-2011 Red Hat, Inc.
 License: GPL-3+

-Files: src/d3des.c
-       src/d3des.h
-Copyright: 1988-1992 Richard Outerbridge
-License: public-domain
-
 Files: src/dh.c
 Copyright: 2008  Red Hat, Inc.
 License: LGPL-2.1+
@@ -74,9 +69,6 @@ License: GPL-3+
 On Debian systems, the complete text of the GNU General
 Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

-License: public-domain
- This file is under public domain.
-
 License: LGPL-2.1+
 This package is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

--- a/debian/patches/Remove-GNUmakefile-links.patch
+++ b/debian/patches/Remove-GNUmakefile-links.patch
@@ -9,10 +9,10 @@ since it breaks the out of tree build
 2 files changed, 22 deletions(-)

 diff --git a/configure b/configure
-index 308f931..274cf94 100755
+index f1a0766..502de4e 100755
 --- a/configure
 +++ b/configure
-@@ -12615,17 +12615,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -12597,17 +12597,6 @@ cat >>confdefs.h <<_ACEOF
 #define VERSION_MICRO $VERSION_MICRO
 _ACEOF
 
@@ -31,10 +31,10 @@ index 308f931..274cf94 100755
   no) :
     ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #(
 diff --git a/configure.ac b/configure.ac
-index bebbe46..9fba174 100644
+index bdfd66b..dc63851 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -55,17 +55,6 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], [$VERSION_MAJOR], [Major version number of p
+@@ -50,17 +50,6 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], [$VERSION_MAJOR], [Major version number of p
 AC_DEFINE_UNQUOTED([VERSION_MINOR], [$VERSION_MINOR], [Minor version number of package])
 AC_DEFINE_UNQUOTED([VERSION_MICRO], [$VERSION_MICRO], [Micro version number of package])