Merge lp:~noskcaj/vte/ubuntu into lp:~ubuntu-desktop/vte/ubuntu-vte2.91

[Jackson Doak]

Merge bugfix release from debian

[Tim Lunn (darkxst)]

latest debian is now 0.42.4-1, can you update merge to that version

review: Needs Fixing

[lp:~noskcaj/vte/ubuntu]

121. By Jackson Doak on 2016-02-12

New upstream release.

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-04 09:09:44 +0000
+++ debian/changelog	2016-02-12 07:24:20 +0000
@@ -1,3 +1,49 @@
+vte2.91 (0.42.4-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+  * debian/control:
+    - Depend on libgnutls-dev instead of obsolete libgnutls28-dev
+  * debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch:
+    - Keep as it is require for the Ubuntu theming
+  * debian/patches/91_keep_fds.patch:
+    - Keep file descriptors open on vte_fork_pty()
+
+ -- Jackson Doak <[e-mail]>  Fri, 12 Feb 2016 18:20:17 +1100
+
+vte2.91 (0.42.4-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Thu, 11 Feb 2016 20:25:23 +0100
+
+vte2.91 (0.42.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Wed, 03 Feb 2016 10:56:48 +0100
+
+vte2.91 (0.42.1-2ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable (LP: #1508636).  Remaining changes:
+  * debian/control:
+    - Depend on libgnutls-dev instead of obsolete libgnutls28-dev
+  * debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch:
+    - Keep as it is require for the Ubuntu theming
+  * debian/patches/91_keep_fds.patch:
+    - Keep file descriptors open on vte_fork_pty()
+
+ -- Jackson Doak <[e-mail]>  Sun, 20 Dec 2015 07:10:18 +1100
+
+vte2.91 (0.42.1-2) unstable; urgency=medium
+
+  * Bump debhelper version to 9
+  * Add multi-arch support (LP: #1508636)
+  * Remove remaining bits related to gnome-pty-helper
+  * Pass --as-needed to dh_autoreconf and to the linker to reduce runtime
+    dependencies
+
+ -- Laurent Bigonville <[e-mail]>  Fri, 13 Nov 2015 15:26:04 +0100
+
 vte2.91 (0.42.1-1ubuntu2) xenial; urgency=medium
 
   * debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch:
@@ -1683,3 +1729,4 @@
   * Initial Release (Closes: #153740)
 
  -- Christian Marillat <[e-mail]>  Sun, 21 Jul 2002 16:30:57 +0200
+

=== modified file 'debian/compat'
--- debian/compat	2011-05-17 10:19:47 +0000
+++ debian/compat	2016-02-12 07:24:20 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2016-01-04 09:09:44 +0000
+++ debian/control	2016-02-12 07:24:20 +0000
@@ -7,10 +7,10 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Michael Biebl <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Laurent Bigonville <[e-mail]>, Michael Biebl <[e-mail]>
 Standards-Version: 3.9.6
-Build-Depends: cdbs (>= 0.4.90),
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 9),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
                libglib2.0-dev (>= 2.40.0),
@@ -35,6 +35,8 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libvte-2.91-common (= ${source:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Terminal emulator widget for GTK+ 3.0 - runtime files
  The VTE library provides a terminal emulator widget VteTerminal for
  applications using the GTK+ toolkit. It also provides the VtePTY object
@@ -65,6 +67,7 @@
 Section: introspection
 Depends: ${gir:Depends},
          ${misc:Depends}
+Multi-Arch: same
 Description: GObject introspection data for the VTE library
  This package contains introspection data for VTE, a terminal emulator
  widget for GTK+.
@@ -86,6 +89,7 @@
          libvte-2.91-common
 Recommends: libvte-2.91-doc
 Conflicts: libvte-2.90-dev
+Multi-Arch: same
 Description: Terminal emulator widget for GTK+ 3.0 - development files
  The VTE library provides a terminal emulator widget VteTerminal for
  applications using the GTK+ toolkit. It also provides the VtePTY object
@@ -99,6 +103,7 @@
 Package: libvte-2.91-common
 Architecture: all
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: Terminal emulator widget for GTK+ 3.0 - common files
  The VTE library provides a terminal emulator widget VteTerminal for
  applications using the GTK+ toolkit. It also provides the VtePTY object

=== modified file 'debian/control.in'
--- debian/control.in	2016-01-04 09:09:44 +0000
+++ debian/control.in	2016-02-12 07:24:20 +0000
@@ -5,8 +5,8 @@
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.9.6
-Build-Depends: cdbs (>= 0.4.90),
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 9),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
                libglib2.0-dev (>= 2.40.0),
@@ -31,6 +31,8 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libvte-2.91-common (= ${source:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Terminal emulator widget for GTK+ 3.0 - runtime files
  The VTE library provides a terminal emulator widget VteTerminal for
  applications using the GTK+ toolkit. It also provides the VtePTY object
@@ -61,6 +63,7 @@
 Section: introspection
 Depends: ${gir:Depends},
          ${misc:Depends}
+Multi-Arch: same
 Description: GObject introspection data for the VTE library
  This package contains introspection data for VTE, a terminal emulator
  widget for GTK+.
@@ -82,6 +85,7 @@
          libvte-2.91-common
 Recommends: libvte-2.91-doc
 Conflicts: libvte-2.90-dev
+Multi-Arch: same
 Description: Terminal emulator widget for GTK+ 3.0 - development files
  The VTE library provides a terminal emulator widget VteTerminal for
  applications using the GTK+ toolkit. It also provides the VtePTY object
@@ -95,6 +99,7 @@
 Package: libvte-2.91-common
 Architecture: all
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: Terminal emulator widget for GTK+ 3.0 - common files
  The VTE library provides a terminal emulator widget VteTerminal for
  applications using the GTK+ toolkit. It also provides the VtePTY object

=== modified file 'debian/gir1.2-vte-2.91.install'
--- debian/gir1.2-vte-2.91.install	2016-01-04 09:09:44 +0000
+++ debian/gir1.2-vte-2.91.install	2016-02-12 07:24:20 +0000
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/Vte-2.91.typelib
+usr/lib/*/girepository-1.0/Vte-2.91.typelib

=== modified file 'debian/libvte-2.91-0.install'
--- debian/libvte-2.91-0.install	2016-01-04 09:09:44 +0000
+++ debian/libvte-2.91-0.install	2016-02-12 07:24:20 +0000
@@ -1,1 +1,1 @@
-usr/lib/libvte-2.91.so.*
+usr/lib/*/libvte-2.91.so.*

=== removed file 'debian/libvte-2.91-0.lintian-overrides'
--- debian/libvte-2.91-0.lintian-overrides	2016-01-04 09:09:44 +0000
+++ debian/libvte-2.91-0.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# Setgid on purpose to write the utmp file
-libvte-2.91-0: setgid-binary usr/lib/libvte-2.91-0/gnome-pty-helper 2755 root/utmp

=== modified file 'debian/libvte-2.91-dev.install'
--- debian/libvte-2.91-dev.install	2016-01-04 09:09:44 +0000
+++ debian/libvte-2.91-dev.install	2016-02-12 07:24:20 +0000
@@ -1,7 +1,7 @@
 usr/include/vte-2.91
-usr/lib/pkgconfig/vte-2.91.pc
-usr/lib/libvte-2.91.a
-usr/lib/libvte-2.91.so
+usr/lib/*/pkgconfig/vte-2.91.pc
+usr/lib/*/libvte-2.91.a
+usr/lib/*/libvte-2.91.so
 usr/share/gir-1.0
 usr/share/glade
 usr/share/vala/vapi

=== modified file 'debian/rules'
--- debian/rules	2016-01-04 09:09:44 +0000
+++ debian/rules	2016-02-12 07:24:20 +0000
@@ -14,19 +14,27 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+DEB_DH_AUTORECONF_ARGS = --as-needed
+
+# Ensure at build time that the library has no dependencies on undefined
+# symbols, and speed up loading.
+DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+include /usr/share/dpkg/default.mk
+
 DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(libvte2.91N)
-DEB_FIXPERMS_EXCLUDE += gnome-pty-helper
 DEB_DH_MAKESHLIBS_ARGS_$(libvte2.91N) += --add-udeb=$(udeb) -- -c4
 
 DEB_CONFIGURE_FLAGS_main += \
-	--enable-gnome-pty-helper \
+	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	--enable-glade-catalogue \
 	--enable-gtk-doc \
 	--enable-introspection \
 	--with-gnutls
 
+# FIXME: not honoured
+#DEB_CONFIGURE_EXTRA_FLAGS_main += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
 DEB_CONFIGURE_FLAGS_udeb += \
-	--disable-gnome-pty-helper \
 	--disable-gtk-doc \
 	--without-gnutls