Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez
--- a/ChangeLog
+++ b/ChangeLog
+commit ac0302b1c40577defba094caf663fb93977ed3d0
+Author: Pjotr <pjotrvertaalt@gmail.com>
+Date:   Thu Dec 5 00:30:10 2019 +0100
+
+    I18n: Update translation nl (100%).
+    
+    194 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 3b6166b861bbeff8f98c247135698060d68c2ca1
+Author: Michal Várady <miko.vaji@gmail.com>
+Date:   Thu Dec 5 00:30:10 2019 +0100
+
+    I18n: Update translation cs (100%).
+    
+    194 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 65bce05b85213fe0e5204c81a86c292927be6b51
+Author: Kiril Kirilov <cybercop_montana@abv.bg>
+Date:   Thu Dec 5 00:30:10 2019 +0100
+
+    I18n: Update translation bg (100%).
+    
+    194 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 6d4ec5e1ae3d515af32696323c6347e8943ce81a
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Wed Dec 4 11:01:03 2019 +0100
+
+    Drop support for Gtk2
+    
+    Signed-off-by: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+    Signed-off-by: Romain Bouvier <skunnyk@alteroot.org>
+
+commit e1b9895dff37a5c2430aa9b65abbc2db8dd5f6eb
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Wed Dec 4 12:11:24 2019 +0100
+
+    xfce-about: Hide system tab conditionally
+
+commit 87a5c0d5720fd832f5f926cf65b28dcc10669a46
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Wed Dec 4 12:05:45 2019 +0100
+
+    Make glibtop an optional dependency
+
+commit a90e922832a36e534c66c1026de67c922e18d315
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Wed Dec 4 10:24:04 2019 +0100
+
+    system-info: Clean up code and UI
+
+commit 37f7100bf1e5e8f9d1244a34b208f6ef198aacb0
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Sun Sep 29 01:09:56 2019 +0200
+
+    about: Add xfce version and vendor info
+
+commit af21b9a8f757f451a549386253e4c5194eb8d918
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Thu Aug 22 16:55:08 2019 +0200
+
+    about: Add system info tab
+
+commit 411cbc430ea7f10d756ac5bcbca5f8b8f96972f9
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Wed Dec 4 10:08:27 2019 +0100
+
+    dialogs: Use symbolic window-close icon
+
+commit fc43f50eced23ebb7adec5fe150860fbc083eb84
+Author: Programy1 Programy1 <programy1.borec.cz@gmail.com>
+Date:   Tue Dec 3 18:30:10 2019 +0100
+
+    I18n: Update translation cs (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit c3a2cd0c6638ec6054cd928366d5b9924b8e0e35
+Author: Michael Martins <michaelfm21@gmail.com>
+Date:   Sun Nov 24 00:30:09 2019 +0100
+
+    I18n: Update translation pt_BR (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit ab05bc210991cb9504df608509673127fd1febbb
+Author: Hugo Carvalho <hugokarvalho@hotmail.com>
+Date:   Sat Nov 23 06:30:09 2019 +0100
+
+    I18n: Update translation pt (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 363b69dbdb971c89952a96a2900e49e185070e77
+Author: Hugo Carvalho <hugokarvalho@hotmail.com>
+Date:   Sat Nov 23 00:30:09 2019 +0100
+
+    I18n: Update translation pt (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 784dfbe58ecbb62a8426f81edd2f871514c6092b
+Author: Anonymous <noreply@xfce.org>
+Date:   Thu Nov 21 00:30:09 2019 +0100
+
+    I18n: Update translation fi (98%).
+    
+    183 translated messages, 2 untranslated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 1e012fc934b9f05ec44ca12ef88cc7b7c423415e
+Author: Toni Estévez <toni.estevez@gmail.com>
+Date:   Sun Nov 17 18:30:09 2019 +0100
+
+    I18n: Update translation es (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 2929297db2d5c62ba8cc0874394c81830a6c7dba
+Author: Toni Estévez <toni.estevez@gmail.com>
+Date:   Sun Nov 17 12:30:09 2019 +0100
+
+    I18n: Update translation es (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 84039edf0b16097a776ce6813343d919ea0c2174
+Author: Toni Estévez <toni.estevez@gmail.com>
+Date:   Sun Nov 17 06:30:13 2019 +0100
+
+    I18n: Update translation es (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 0492ddd98792a940d7e5836c0ff63bb8eddc0dbf
+Author: Anonymous <noreply@xfce.org>
+Date:   Mon Nov 11 18:30:10 2019 +0100
+
+    I18n: Update translation ie (91%).
+    
+    169 translated messages, 16 untranslated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 2e7193a93af190a7507cf28fd78314d00928cb3b
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Nov 3 14:48:34 2019 -0300
+
+    Fix Window has not been made visible when grabbing keyboard (Bug #16054)
+    
+    This is a strange new behavior of gtk3 that seems to require showing
+    the root window. If this causes anymore trouble, stick to the deprecated
+    function.
+
+commit 68bec4367c242692b4ef154163939372022ec238
+Author: Andre Miranda <andre42m@gmail.com>
+Date:   Sun Nov 3 18:30:10 2019 +0100
+
+    I18n: Update translation pt_BR (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 34917bade4699ff1145a7e75eb8b575bc9259b55
+Author: Kjell Cato Heskjestad <cato@heskjestad.xyz>
+Date:   Sun Nov 3 12:30:10 2019 +0100
+
+    I18n: Update translation nb (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 84ce9227f7beba548b81a9c319f1dbd8c47af392
+Author: Саша Петровић <salepetronije@gmail.com>
+Date:   Thu Oct 31 00:30:10 2019 +0100
+
+    I18n: Update translation sr (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 248716ec109ee30f39038d459c66d1bcb516fbe7
+Author: Dongyu Chu <chudongyu@126.com>
+Date:   Sun Oct 27 18:30:10 2019 +0100
+
+    I18n: Update translation zh_CN (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit fe099056d0a23091224b4a38a0060b0eb717e719
+Author: Jason Collins <JasonPCollins@protonmail.com>
+Date:   Fri Oct 25 18:30:10 2019 +0200
+
+    I18n: Update translation en_GB (94%).
+    
+    174 translated messages, 11 untranslated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 21899730cd9a1ac884db5084ea1013cd1e73d772
+Author: Arnold Marko <arnold.marko@gmail.com>
+Date:   Sat Oct 19 00:30:10 2019 +0200
+
+    I18n: Update translation sl (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit fed1a1d356eae620ac3717b3d5a33358498a7fa2
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Thu Oct 17 06:30:12 2019 +0200
+
+    I18n: Update translation ko (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 65746bfb3b73a3faf25fdec87b81cf9b33657909
+Author: Yannick Le Guen <leguen.yannick@gmail.com>
+Date:   Thu Oct 17 00:30:09 2019 +0200
+
+    I18n: Update translation fr (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 6330f727f21c452f4617051a2c466821822c0b1b
+Author: Anonymous <noreply@xfce.org>
+Date:   Wed Oct 16 18:30:10 2019 +0200
+
+    I18n: Update translation hu (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 9802f69673c22e5ac9cf46b52e6e84a2ade2842c
+Author: Demiray Muhterem <mdemiray@msn.com>
+Date:   Wed Oct 16 12:30:10 2019 +0200
+
+    I18n: Update translation tr (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit d2d61921a36f6b2dff478236443f177fbdf11eb8
+Author: Daniel Muñiz Fontoira <dani@damufo.com>
+Date:   Wed Oct 16 00:30:09 2019 +0200
+
+    I18n: Update translation gl (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit b225a635b28c3d6d3018cc4e8fd13e47a5a18c37
+Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Date:   Tue Oct 15 18:30:10 2019 +0200
+
+    I18n: Update translation ja (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 1e267975496383fde75d73804eef3b9244c72a2b
+Author: Hugo Carvalho <hugokarvalho@hotmail.com>
+Date:   Tue Oct 15 00:30:10 2019 +0200
+
+    I18n: Update translation pt (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit b3f73bc8d23e5d58fc3c6d5dfc2ecee38de9be9f
+Author: Pjotr <pjotrvertaalt@gmail.com>
+Date:   Tue Oct 15 00:30:10 2019 +0200
+
+    I18n: Update translation nl (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 25e1d5fbcc11baf7e6ff78b6049646f4a6b82794
+Author: Edin Veskovic <edin.lockedin@gmail.com>
+Date:   Tue Oct 15 00:30:10 2019 +0200
+
+    I18n: Update translation hr (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit da60c202185fb6287fe21dd7f126c903935e8011
+Author: Igor <f2404@yandex.ru>
+Date:   Mon Oct 14 18:30:10 2019 +0200
+
+    I18n: Update translation ru (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 15412d082954c08732685dab07bd8b0cd2d27197
+Author: Anonymous <noreply@xfce.org>
+Date:   Mon Oct 14 18:30:10 2019 +0200
+
+    I18n: Update translation da (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit df0d280ea79ca124047a030102c9e7e9511df88b
+Author: Anonymous <noreply@xfce.org>
+Date:   Mon Oct 14 12:30:10 2019 +0200
+
+    I18n: Update translation es (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit dd97b643180972f22821462150bebdd529dbaa9b
+Author: 玉堂白鹤 <yjwork@qq.com>
+Date:   Mon Oct 14 06:30:10 2019 +0200
+
+    I18n: Update translation zh_CN (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 24ca186c3643776f31af8472b32f21df30ec4055
+Author: Michael Martins <michaelfm21@gmail.com>
+Date:   Mon Oct 14 06:30:10 2019 +0200
+
+    I18n: Update translation pt_BR (99%).
+    
+    184 translated messages, 1 untranslated message.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 29bd10d8c686ff7de8d42e6f07bdb6c96239c89e
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Aug 4 13:50:03 2019 -0300
+
+    Do not use gdk_screen_get_monitor_at_point (Bug #15781)
+
+commit 4f90f4f09b2fda2971235e46473a1bafbeb956e4
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Aug 4 13:49:51 2019 -0300
+
+    Replace gtk_show_uri (Bug #15781)
+
+commit 1d6948a30f490ab1949c648567026eca38de9654
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Aug 4 13:49:25 2019 -0300
+
+    Replace gdk_display_get_screen (Bug #15781)
+
+commit 1f3732957ea8234510c38ffcb763a95e5d6246b2
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Aug 4 13:48:38 2019 -0300
+
+    Replace gdk_keymap_get_default (Bug #15781)
+
+commit e8756631cae39dd7c3830b44db7af561867550ae
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Aug 4 13:45:29 2019 -0300
+
+    Replace deprecated device functions (Bug #15781)
+
+commit 813575ece727837f5133b460074e0d036de27473
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Aug 4 13:37:15 2019 -0300
+
+    Replace gdk_error_trap_* and gdk_flush (Bug #15781)
+
+commit cec6be7f4091a8188b6b3a6c7be65f9309b50926
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Aug 4 13:35:10 2019 -0300
+
+    Ignore what is hard to replace (Bug #15781)
+
+commit da3c7aef1046829a0979e1606d308cb205305534
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Aug 4 13:34:10 2019 -0300
+
+    Bump gtk to 3.22 (Bug #15781)
+
+commit 537658ba68ff364ce43af1ca62e58b85955eb15c
+Author: Emanuele Petriglia <transifex@emanuelepetriglia.com>
+Date:   Sun Oct 13 18:30:10 2019 +0200
+
+    I18n: Update translation it (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit c877bee8f641dc08e9c8210e534a139e9672af5b
+Author: Andreas Eitel <github-aneitel@online.de>
+Date:   Sun Oct 13 18:30:10 2019 +0200
+
+    I18n: Update translation de (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit cc11aa0041e7f89cacb71cee977314b8bafea1ed
+Author: Anonymous <noreply@xfce.org>
+Date:   Sun Oct 13 12:30:09 2019 +0200
+
+    I18n: Update translation pl (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 83fef310b688e62bbd41637379173df1f431a0f0
+Author: 黃柏諺 <s8321414@gmail.com>
+Date:   Sun Oct 13 06:30:15 2019 +0200
+
+    I18n: Update translation zh_TW (100%).
+    
+    185 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 68994e2d4e0e27ab853527d8e3e978eaab224ffa
+Author: Reuben Green <reubengreen73@gmail.com>
+Date:   Wed Oct 2 16:04:47 2019 +0100
+
+    Add a dialog to confirm closure of multiple tabs (bug #15873)
+    
+    Adds a new function xfce_dialog_confirm_close_tabs, which runs a dialog
+    box to
+    ask the user if they wish to close the current tab, close the whole
+    window, or
+    cancel. The function has the option of adding a check box to the dialog
+    to let
+    the user choose whether they wish to see this dialog in future.
+
+commit 8334ce9d252acd76b6320128455a267f0d4d061e
+Author: Ivica  Kolić <ikoli@yahoo.com>
+Date:   Mon Sep 30 12:30:27 2019 +0200
+
+    I18n: Update translation hr (100%).
+    
+    179 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit f872859baa00c257ea3fcb617e6b4ea0fc4fcc2a
+Author: Dušan Kazik <prescott66@gmail.com>
+Date:   Sat Sep 21 00:30:10 2019 +0200
+
+    I18n: Update translation sk (96%).
+    
+    172 translated messages, 7 untranslated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 5cbba3e0d01a5e572fc4ee4c5473d443e4ee8d9b
+Author: Yannick Le Guen <leguen.yannick@gmail.com>
+Date:   Thu Sep 19 18:30:18 2019 +0200
+
+    I18n: Update translation fr (100%).
+    
+    179 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit fd69d2668f7ec8db5f696c8d6438ceb05eda3670
+Author: Kevin Brubeck Unhammer <unhammer+dill@mm.st>
+Date:   Thu Sep 12 12:30:10 2019 +0200
+
+    I18n: Update translation nn (97%).
+    
+    175 translated messages, 4 untranslated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 2d9da503aa31dde2ee551fccee6c03c063a19971
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Mon Sep 9 12:30:10 2019 +0200
+
+    I18n: Update translation ko (100%).
+    
+    179 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit b64f674ab3906dde7cbe772c60a88e48e11ddfee
+Author: Daniel Muñiz Fontoira <dani@damufo.com>
+Date:   Fri Aug 23 18:30:15 2019 +0200
+
+    I18n: Update translation gl (100%).
+    
+    179 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit b88d3365d63e3899a79f9c294eb24c62e524be83
+Author: Daniel Muñiz Fontoira <dani@damufo.com>
+Date:   Sat Aug 17 00:30:25 2019 +0200
+
+    I18n: Update translation gl (100%).
+    
+    179 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 7e064959ad5798d6eb027b3c304eb569f73ff7f7
+Author: Piotr Sokół <psokol.l10n@gmail.com>
+Date:   Wed Aug 14 18:30:09 2019 +0200
+
+    I18n: Update translation pl (100%).
+    
+    179 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 2891737ee4b9d2f24df2ba2294987e6da555c81f
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Aug 11 20:19:36 2019 -0300
+
+    Remove myself as translator of es and en_GB
+
+commit feffd827934500ebe908227477773e1597c1dd72
+Author: Romain Bouvier <skunnyk@alteroot.org>
+Date:   Sun Aug 11 22:59:32 2019 +0200
+
+    Back to development
+
+commit a39150c9ca6679932182d2bc2b050a36bd677899
+Author: Romain Bouvier <skunnyk@alteroot.org>
+Date:   Sun Aug 11 22:54:10 2019 +0200
+
+    Update for release
+
 commit 989e976a612e63b78436c691adccdfe4389577f4
 Author: Romain Bouvier <skunnyk@alteroot.org>
 Date:   Sun Aug 11 22:26:03 2019 +0200

--- a/Makefile.in
+++ b/Makefile.in
@@ -97,7 +97,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -160,7 +160,8 @@ CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
 	COPYING ChangeLog INSTALL NEWS README THANKS TODO compile \
-	config.guess config.sub install-sh ltmain.sh missing
+	config.guess config.sub install-sh ltmain.sh missing \
+	mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -239,13 +240,10 @@ GLADEUI2_MODULEDIR = @GLADEUI2_MODULEDIR@
 GLADEUI2_PIXMAPDIR = @GLADEUI2_PIXMAPDIR@
 GLADEUI2_REQUIRED_VERSION = @GLADEUI2_REQUIRED_VERSION@
 GLADEUI2_VERSION = @GLADEUI2_VERSION@
-GLADEUI_CATALOGDIR = @GLADEUI_CATALOGDIR@
-GLADEUI_CFLAGS = @GLADEUI_CFLAGS@
-GLADEUI_LIBS = @GLADEUI_LIBS@
-GLADEUI_MODULEDIR = @GLADEUI_MODULEDIR@
-GLADEUI_PIXMAPDIR = @GLADEUI_PIXMAPDIR@
-GLADEUI_REQUIRED_VERSION = @GLADEUI_REQUIRED_VERSION@
-GLADEUI_VERSION = @GLADEUI_VERSION@
+GLIBTOP_CFLAGS = @GLIBTOP_CFLAGS@
+GLIBTOP_LIBS = @GLIBTOP_LIBS@
+GLIBTOP_REQUIRED_VERSION = @GLIBTOP_REQUIRED_VERSION@
+GLIBTOP_VERSION = @GLIBTOP_VERSION@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_LIBS = @GLIB_LIBS@
@@ -254,10 +252,6 @@ GLIB_VERSION = @GLIB_VERSION@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@
-GTK2_VERSION = @GTK2_VERSION@
 GTK3_CFLAGS = @GTK3_CFLAGS@
 GTK3_LIBS = @GTK3_LIBS@
 GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@
@@ -425,6 +419,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@

--- a/NEWS
+++ b/NEWS
+4.15.0
+======
+- Drop support for Gtk2
+- Make glibtop an optional dependency ("About System" tab)
+- about: Add system info tab
+- about: Hide system tab conditionally
+- dialogs: Use symbolic window-close icon
+- Fix Window has not been made visible when grabbing keyboard (Bug #16054)
+- Do not use gdk_screen_get_monitor_at_point (Bug #15781)
+- Replace gtk_show_uri (Bug #15781)
+- Replace gdk_display_get_screen (Bug #15781)
+- Replace gdk_keymap_get_default (Bug #15781)
+- Replace deprecated device functions (Bug #15781)
+- Replace gdk_error_trap_* and gdk_flush (Bug #15781)
+- Ignore what is hard to replace (Bug #15781)
+- Bump gtk to 3.22 (Bug #15781)
+- Add a dialog to confirm closure of multiple tabs (bug #15873)
+- Translation Updates:
+  Bulgarian, Chinese (China), Chinese (Taiwan), Croatian, Czech, Danish,
+  Dutch, English (United Kingdom), Finnish, French, Galician, German,
+  Hungarian, Interlingue, Italian, Japanese, Korean, Norwegian Bokmål,
+  Norwegian Nynorsk, Polish, Portuguese, Portuguese (Brazil), Russian,
+  Serbian, Slovak, Slovenian, Spanish, Turkish
+
 4.14.1
 ======

- No change, re release because 4.14.0 tarball was broken
+- No changes, re release because 4.14.0 tarball was broken

 4.14.0
 ======

--- a/aclocal.m4
+++ b/aclocal.m4
@@ -540,9 +540,9 @@ AC_DEFUN([AM_NLS],
  AC_SUBST([USE_NLS])
 ])

-# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 11 (pkg-config-0.29.1)
-
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
 dnl
@@ -816,74 +816,6 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR

-dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
-dnl   [DESCRIPTION], [DEFAULT])
-dnl ------------------------------------------
-dnl
-dnl Prepare a "--with-" configure option using the lowercase
-dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
-dnl PKG_CHECK_MODULES in a single macro.
-AC_DEFUN([PKG_WITH_MODULES],
-[
-m4_pushdef([with_arg], m4_tolower([$1]))
-
-m4_pushdef([description],
-           [m4_default([$5], [build with ]with_arg[ support])])
-
-m4_pushdef([def_arg], [m4_default([$6], [auto])])
-m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
-m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
-
-m4_case(def_arg,
-            [yes],[m4_pushdef([with_without], [--without-]with_arg)],
-            [m4_pushdef([with_without],[--with-]with_arg)])
-
-AC_ARG_WITH(with_arg,
-     AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
-    [AS_TR_SH([with_]with_arg)=def_arg])
-
-AS_CASE([$AS_TR_SH([with_]with_arg)],
-            [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
-            [auto],[PKG_CHECK_MODULES([$1],[$2],
-                                        [m4_n([def_action_if_found]) $3],
-                                        [m4_n([def_action_if_not_found]) $4])])
-
-m4_popdef([with_arg])
-m4_popdef([description])
-m4_popdef([def_arg])
-
-])dnl PKG_WITH_MODULES
-
-dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [DESCRIPTION], [DEFAULT])
-dnl -----------------------------------------------
-dnl
-dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
-dnl check._[VARIABLE-PREFIX] is exported as make variable.
-AC_DEFUN([PKG_HAVE_WITH_MODULES],
-[
-PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
-
-AM_CONDITIONAL([HAVE_][$1],
-               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
-])dnl PKG_HAVE_WITH_MODULES
-
-dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [DESCRIPTION], [DEFAULT])
-dnl ------------------------------------------------------
-dnl
-dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
-dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
-dnl and preprocessor variable.
-AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
-[
-PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
-
-AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
-        [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
-])dnl PKG_HAVE_DEFINE_WITH_MODULES
-
 # Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -2436,7 +2368,7 @@ AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],

 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2018 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -2655,8 +2587,8 @@ esac
 ofile=libtool
 can_build_shared=yes

-# All known linkers require a '.a' archive for static linking (except MSVC and
-# ICC, which need '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
 libext=a

 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -3158,7 +3090,6 @@ _LT_CONFIG_SAVE_COMMANDS([
    cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
 # Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.

 # Provide generalized library-building support services.
@@ -3470,8 +3401,8 @@ int forced_loaded() { return 2;}
 _LT_EOF
      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
      cat > conftest.c << _LT_EOF
@@ -3921,22 +3852,9 @@ need_locks=$enable_libtool_lock
 m4_defun([_LT_PROG_AR],
 [AC_CHECK_TOOLS(AR, [ar], false)
 : ${AR=ar}
+: ${AR_FLAGS=cru}
 _LT_DECL([], [AR], [1], [The archiver])
-
-# Use ARFLAGS variable as AR's operation code to sync the variable naming with
-# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
-# higher priority because thats what people were doing historically (setting
-# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
-# variable obsoleted/removed.
-
-test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
-lt_ar_flags=$AR_FLAGS
-_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
-
-# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
-# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
-_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}],
-         [Flags to create an archive])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])

 AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
  [lt_cv_ar_at_file=no
@@ -4648,26 +4566,18 @@ m4_defun([_LT_CMD_STRIPLIB],
 striplib=
 old_striplib=
 AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -z "$STRIP"; then
-  AC_MSG_RESULT([no])
-else
-  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-    old_striplib="$STRIP --strip-debug"
-    striplib="$STRIP --strip-unneeded"
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
  AC_MSG_RESULT([yes])
 else
+# FIXME - insert some real tests, host_os isn't really good enough
  case $host_os in
  darwin*)
-      # FIXME - insert some real tests, host_os isn't really good enough
+    if test -n "$STRIP"; then
      striplib="$STRIP -x"
      old_striplib="$STRIP -S"
      AC_MSG_RESULT([yes])
-      ;;
-    freebsd*)
-      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
-        old_striplib="$STRIP --strip-debug"
-        striplib="$STRIP --strip-unneeded"
-        AC_MSG_RESULT([yes])
    else
      AC_MSG_RESULT([no])
    fi
@@ -4677,7 +4587,6 @@ else
    ;;
  esac
 fi
-fi
 _LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
 _LT_DECL([], [striplib], [1])
 ])# _LT_CMD_STRIPLIB
@@ -5015,8 +4924,8 @@ m4_if([$1], [],[
    dynamic_linker='Win32 ld.exe'
    ;;

-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl*)
+    # Native MSVC
    libname_spec='$name'
    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
    library_names_spec='$libname.dll.lib'
@@ -5072,7 +4981,7 @@ m4_if([$1], [],[
    ;;

  *)
-    # Assume MSVC and ICC wrapper
+    # Assume MSVC wrapper
    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
    dynamic_linker='Win32 ld.exe'
    ;;
@@ -5337,6 +5246,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
  dynamic_linker='GNU/Linux ld.so'
  ;;

+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
  version_type=sunos
  need_lib_prefix=no
@@ -5996,7 +5917,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
  lt_cv_deplibs_check_method=pass_all
  ;;

-netbsd*)
+netbsd* | netbsdelf*-gnu)
  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
  else
@@ -6460,7 +6381,7 @@ for ac_symprfx in "" "_"; do
  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
    # Fake it for dumpbin and say T for any non-static function,
    # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
+    # Also find C++ and __fastcall symbols from MSVC++,
    # which start with @ or ?.
    lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
@@ -6502,7 +6423,8 @@ _LT_EOF
  if AC_TRY_EVAL(ac_compile); then
    # Now try to grab the symbols.
    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
      # Try sorting and uniquifying the output.
      if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -6874,7 +6796,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
      *qnx* | *nto*)
        # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -7142,6 +7064,12 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
        ;;
+      # flang / f18. f95 an alias for gfortran or flang on Debian
+      flang* | f18* | f95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
      # icc used to be incompatible with GCC.
      # ICC 10 doesn't accept -KPIC any more.
      icc* | ifort*)
@@ -7369,7 +7297,7 @@ m4_if([$1], [CXX], [
    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
    fi
    ;;
  pw32*)
@@ -7377,7 +7305,7 @@ m4_if([$1], [CXX], [
    ;;
  cygwin* | mingw* | cegcc*)
    case $cc_basename in
-    cl* | icl*)
+    cl*)
      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
      ;;
    *)
@@ -7386,6 +7314,9 @@ m4_if([$1], [CXX], [
      ;;
    esac
    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
  *)
    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -7434,20 +7365,23 @@ dnl Note also adjust exclude_expsyms for C++ above.

  case $host_os in
  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++ or Intel C++ Compiler.
+    # Microsoft Visual C++.
    if test yes != "$GCC"; then
      with_gnu_ld=no
    fi
    ;;
  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
    with_gnu_ld=yes
    ;;
  openbsd* | bitrig*)
    with_gnu_ld=no
    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
  esac

  _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -7606,7 +7540,6 @@ _LT_EOF
 	emximp -o $lib $output_objdir/$libname.def'
      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='@'
      ;;

    interix[[3-9]]*)
@@ -7703,7 +7636,7 @@ _LT_EOF
      fi
      ;;

-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -7824,7 +7757,7 @@ _LT_EOF
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no

@@ -8007,12 +7940,12 @@ _LT_EOF

    cygwin* | mingw* | pw32* | cegcc*)
      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++ or Intel C++ Compiler.
+      # Microsoft Visual C++.
      # hardcode_libdir_flag_spec is actually meaningless, as there is
      # no search path for DLLs.
      case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl*)
+	# Native MSVC
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	_LT_TAGVAR(always_export_symbols, $1)=yes
@@ -8053,7 +7986,7 @@ _LT_EOF
          fi'
 	;;
      *)
-	# Assume MSVC and ICC wrapper
+	# Assume MSVC wrapper
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -8224,6 +8157,7 @@ _LT_EOF
 	if test yes = "$lt_cv_irix_exported_symbol"; then
          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
      else
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -8245,7 +8179,7 @@ _LT_EOF
      esac
      ;;

-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
      else
@@ -8312,7 +8246,6 @@ _LT_EOF
 	emximp -o $lib $output_objdir/$libname.def'
      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='@'
      ;;

    osf3*)
@@ -9079,8 +9012,8 @@ if test yes != "$_lt_caught_CXX_error"; then

      cygwin* | mingw* | pw32* | cegcc*)
 	case $GXX,$cc_basename in
-	,cl* | no,cl* | ,icl* | no,icl*)
-	  # Native MSVC or ICC
+	,cl* | no,cl*)
+	  # Native MSVC
 	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 	  # no search path for DLLs.
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -9178,7 +9111,6 @@ if test yes != "$_lt_caught_CXX_error"; then
 	  emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
 	;;

      dgux*)
@@ -10809,7 +10741,7 @@ _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],

 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2018 Free Software
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
 #   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
@@ -11241,7 +11173,7 @@ LT_OPTION_DEFINE([LTDL_INIT], [convenience],

 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004-2005, 2007-2008, 2011-2018 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
 # Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
@@ -11366,7 +11298,7 @@ m4_define([lt_dict_filter],

 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2011-2018 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -11375,22 +11307,22 @@ m4_define([lt_dict_filter],

 # @configure_input@

-# serial 4221 ltversion.m4
+# serial 4179 ltversion.m4
 # This file is part of GNU Libtool

-m4_define([LT_PACKAGE_VERSION], [2.4.6.42-b88ce])
-m4_define([LT_PACKAGE_REVISION], [2.4.6.42])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])

 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6.42-b88ce'
-macro_revision='2.4.6.42'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])

 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2018 Free Software
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
 #   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #

--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.

-timestamp='2018-03-08'
+timestamp='2018-02-24'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1046,7 +1046,11 @@ EOF
 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 	exit ;;
    x86_64:Linux:*:*)
+	if objdump -f /bin/sh | grep -q elf32-x86-64; then
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
+	else
 	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	fi
 	exit ;;
    xtensa*:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1469,7 +1473,7 @@ EOF
 exit 1

 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

--- a/config.h.in
+++ b/config.h.in
@@ -9,10 +9,10 @@
 /* always defined to indicate that i18n is enabled */
 #undef ENABLE_NLS

-/* Prevent post 3.18 APIs */
+/* Prevent post 3.22 APIs */
 #undef GDK_VERSION_MAX_ALLOWED

-/* Ignore post 3.18 deprecations */
+/* Ignore post 3.22 deprecations */
 #undef GDK_VERSION_MIN_REQUIRED

 /* Name of default gettext domain */
@@ -57,14 +57,11 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT

-/* Define if gladeui-1.0 >= 3.5.0 present */
-#undef HAVE_GLADEUI
-
 /* Define if gladeui-2.0 >= 3.5.0 present */
 #undef HAVE_GLADEUI2

-/* Define if gtk+-2.0 >= 2.24.0 present */
-#undef HAVE_GTK2
+/* Define if libgtop-2.0 >= 2.24.0 present */
+#undef HAVE_GLIBTOP

 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H

--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.

-timestamp='2018-03-08'
+timestamp='2018-02-22'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1376,7 +1376,7 @@ case $os in
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
@@ -1794,7 +1794,7 @@ echo "$basic_machine$os"
 exit

 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

--- a/configure
+++ b/configure
--- a/configure.ac
+++ b/configure.ac
@@ -11,17 +11,17 @@ dnl ***************************
 dnl *** Version information ***
 dnl ***************************
 m4_define([libxfce4ui_verinfo], [0:0:0])
-m4_define([libxfce4ui_version_api], [1])
+m4_define([libxfce4ui_version_api], [2])
 m4_define([libxfce4ui_version_major], [4])
-m4_define([libxfce4ui_version_minor], [14])
-m4_define([libxfce4ui_version_micro], [1])
+m4_define([libxfce4ui_version_minor], [15])
+m4_define([libxfce4ui_version_micro], [0])
 m4_define([libxfce4ui_version_nano], []) dnl leave this empty to have no nano version
-m4_define([libxfce4ui_version_build], [989e976])
+m4_define([libxfce4ui_version_build], [ac0302b])
 m4_define([libxfce4ui_version_tag], [])
 m4_define([libxfce4ui_version], [libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(), [], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [git], [libxfce4ui_version_tag()-libxfce4ui_version_build()], [libxfce4ui_version_tag()])])

 m4_define([libxfce4kbd_private_verinfo], [0:0:0])
-m4_define([libxfce4kbd_private_version_api], [2])
+m4_define([libxfce4kbd_private_version_api], [3])

 dnl # DO NOT MODIFY ANYTHING BELOW THIS LINE, UNLESS YOU KNOW WHAT
 dnl # YOU ARE DOING.
@@ -132,22 +132,22 @@ dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
-XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.18.0])
+XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])

-dnl ***********************************************************
-dnl *** Optional support for a GTK+2 version of the library ***
-dnl ***********************************************************
-XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
-                           [gtk+-2.0], [2.24.0], [gtk2],
-                           [GTK+ 2 support])
-AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"])
+dnl ****************************************************************
+dnl *** Optional support for system information based on glibtop ***
+dnl ****************************************************************
+XDT_CHECK_OPTIONAL_PACKAGE([GLIBTOP],
+                           [libgtop-2.0], [2.24.0], [glibtop],
+                           [GLIBTOP support])
+AM_CONDITIONAL([ENABLE_GLIBTOP], [test "x$GLIBTOP_FOUND" = "xyes"])

 AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_42, [Ignore post 2.42 deprecations])
 AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_42, [Prevent post 2.42 APIs])

-AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_18, [Ignore post 3.18 deprecations])
-AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_18, [Prevent post 3.18 APIs])
+AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_22, [Ignore post 3.22 deprecations])
+AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_22, [Prevent post 3.22 APIs])

 dnl ***************************************
 dnl *** Check for gobject-introspection ***
@@ -207,46 +207,6 @@ AC_MSG_RESULT([$with_manual_website])
 dnl *********************************************************
 dnl *** Optional support for the Glade Interface Designer ***
 dnl *********************************************************
-dnl Do not try to build gladeui when gtk2 is disabled
-if test "x$GTK2_FOUND" = "xyes"; then
-    XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI], [gladeui-1.0],
-                            [3.5.0], [gladeui], [glade interface designer])
-    AC_ARG_WITH([gladeui-catalogdir],
-                [AC_HELP_STRING([--with-gladeui-catalogdir=PATH],
-                                [Specify where to install glade designer catalog files (default=autodetect)])],
-                [gladeui_catalogdir="$withval"])
-    AC_ARG_WITH([gladeui-moduledir],
-                [AC_HELP_STRING([--with-gladeui-moduledir=PATH],
-                                [Specify where to install glade designer modules (default=autodetect)])],
-                [gladeui_moduledir="$withval"])
-    AC_ARG_WITH([gladeui-pixmapdir],
-                [AC_HELP_STRING([--with-gladeui-pixmapdir=PATH],
-                                [Specify where to install glade designer pixmaps (default=autodetect)])],
-                [gladeui_pixmapdir="$withval"])
-    if test x"$GLADEUI_FOUND" = x"yes"; then
-    if test x"$gladeui_catalogdir" = x""; then
-        GLADEUI_CATALOGDIR=`$PKG_CONFIG "--variable=catalogdir" "gladeui-1.0"`
-    else
-        GLADEUI_CATALOGDIR="$gladeui_catalogdir"
-    fi
-    if test x"$gladeui_moduledir" = x""; then
-        GLADEUI_MODULEDIR=`$PKG_CONFIG "--variable=moduledir" "gladeui-1.0"`
-    else
-        GLADEUI_MODULEDIR="$gladeui_moduledir"
-    fi
-    if test x"$gladeui_pixmapdir" = x""; then
-        GLADEUI_PIXMAPDIR=`$PKG_CONFIG "--variable=pixmapdir" "gladeui-1.0"`
-    else
-        GLADEUI_PIXMAPDIR="$gladeui_pixmapdir"
-    fi
-    fi
-    AC_SUBST([GLADEUI_CATALOGDIR])
-    AC_SUBST([GLADEUI_MODULEDIR])
-    AC_SUBST([GLADEUI_PIXMAPDIR])
-else
-    dnl Hacky way to declare HAVE_GLADEUI false with --disable-gtk2
-    AM_CONDITIONAL([HAVE_GLADEUI], false)
-fi

 XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI2], [gladeui-2.0],
                           [3.5.0], [gladeui2], [glade interface designer])
@@ -380,10 +340,8 @@ glade/icons/16x16/Makefile
 glade/icons/22x22/Makefile
 icons/Makefile
 icons/48x48/Makefile
-libxfce4kbd-private/libxfce4kbd-private-2.pc
 libxfce4kbd-private/libxfce4kbd-private-3.pc
 libxfce4kbd-private/Makefile
-libxfce4ui/libxfce4ui-1.pc
 libxfce4ui/libxfce4ui-2.pc
 libxfce4ui/libxfce4ui-config.h
 libxfce4ui/Makefile
@@ -398,19 +356,6 @@ dnl ***************************
 echo
 echo "Build Configuration:"
 echo
-if test x"$GTK2_FOUND" = x"yes"; then
-echo "* GTK2 support:  yes"
-else
-echo "* GTK2 support:  no"
-fi
-if test x"$GLADEUI_FOUND" = x"yes"; then
-echo "* Glade Interface Designer:  yes"
-echo "  - Catalog directory:       $GLADEUI_CATALOGDIR"
-echo "  - Module directory:        $GLADEUI_MODULEDIR"
-echo "  - Pixmap directory:        $GLADEUI_PIXMAPDIR"
-else
-echo "* Glade Interface Designer:  no"
-fi
 if test x"$GLADEUI2_FOUND" = x"yes"; then
 echo "* Glade 3.0 Interface Designer:  yes"
 echo "  - Catalog directory:       $GLADEUI2_CATALOGDIR"
@@ -445,5 +390,10 @@ echo "in this text file: \"${datarootdir}/xfce4/vendorinfo\""
 else
 echo "* Vendor:                    none"
 fi
+if test x"$GLIBTOP_FOUND" = x"yes"; then
+echo "* System Info:               yes"
+else
+echo "* System Info:               no"
+fi
 echo "* Manual website:            $with_manual_website"
 echo
--- a/debian/changelog
+++ b/debian/changelog
+libxfce4ui (4.15.0-1) experimental; urgency=medium
+
+  [ Unit 193 ]
+  * d/watch: Update for upstream's move to mirrorbit.
+
+  [ Yves-Alexis Perez ]
+  * d/watch: use uscan special strings
+  * New upstream version 4.15.0
+  * d/control: update dh compat level to 12
+  * d/control: update standards version to 4.4.1
+  * d/control: update build-dep for new upstream
+  * drop libxfce4ui-1 packages, gone upstream
+  * d/libxfce4ui-2-0.symbols updated for new release
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 03 Jan 2020 14:07:47 +0100
+
 libxfce4ui (4.14.1-1) unstable; urgency=medium

  [ Unit 193 ]

--- a/debian/control
+++ b/debian/control
@@ -3,49 +3,21 @@ Priority: optional
 Section: xfce
 Maintainer: Debian Xfce Maintainers <debian-xfce@lists.debian.org>
 Uploaders: Yves-Alexis Perez <corsac@debian.org>
-Build-Depends: debhelper-compat (= 11),
+Build-Depends: debhelper-compat (= 12),
               gtk-doc-tools,
               intltool (>= 0.31),
-               libgladeui-dev,
               libgtk-3-dev,
-               libgtk2.0-dev,
+               libgtop2-dev,
               libstartup-notification0-dev,
               libxfce4util-dev (>= 4.12),
               libxfconf-0-dev (>= 4.12),
               pkg-config,
               xfce4-dev-tools
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Homepage: https://www.xfce.org/
 Vcs-Git: https://salsa.debian.org/xfce-team/desktop/libxfce4ui.git
 Vcs-Browser: https://salsa.debian.org/xfce-team/desktop/libxfce4ui

-Package: libxfce4ui-1-0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libxfce4ui-common (>= 4.11), ${misc:Depends}, ${shlibs:Depends}
-Description: widget library for Xfce - Gtk+2 variant
- libxfce4ui is used to share commonly used Xfce widgets among the Xfce
- applications.
- .
- This package provides the Gtk+2 variant of libxfce4ui.
-
-Package: libxfce4ui-1-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libgtk2.0-dev,
-         libxfce4ui-1-0 (= ${binary:Version}),
-         libxfce4util-dev (>= 4.10.0),
-         libxfconf-0-dev (>= 4.10.0),
-         ${misc:Depends}
-Description: Development files for libxfce4ui - Gtk+2 variant
- This package contains the headers and the static library
- for libxfce4ui.
- .
- This package provides development files for the Gtk+2 variant of libxfce4ui.
-
 Package: libxfce4ui-2-0
 Section: libs
 Architecture: any
@@ -95,5 +67,5 @@ Breaks: xfce4-utils
 Replaces: xfce4-utils
 Description: Utility files for libxfce4ui
 This package contains the Xfce settings plugin and the utility files for
- libxfce4ui-1-0 which are:
+ libxfce4ui-2-0 which are:
   - xfce4-about
--- a/debian/libxfce4ui-1-0.install
+++ b/debian/libxfce4ui-1-0.install
-usr/lib/*/libxfce4kbd-private-2.so.*
-usr/lib/*/libxfce4ui-1.so.*
--- a/debian/libxfce4ui-1-0.lintian-overrides
+++ b/debian/libxfce4ui-1-0.lintian-overrides
-# libxfce4kbd-private-2 is private to Xfce core
-libxfce4ui-1-0: shlib-missing-in-symbols-control-file libxfce4kbd-private-2 0 for usr/lib/x86_64-linux-gnu/libxfce4kbd-private-2.so.0.0.0
--- a/debian/libxfce4ui-1-0.shlibs
+++ b/debian/libxfce4ui-1-0.shlibs
-libxfce4ui-1 0 libxfce4ui-1-0
-libxfce4kbd-private-2 0 libxfce4ui-1-0 (>= 4.11.0)
--- a/debian/libxfce4ui-1-0.symbols
+++ b/debian/libxfce4ui-1-0.symbols
-libxfce4ui-1.so.0 libxfce4ui-1-0 #MINVER#
-* Build-Depends-Package: libxfce4ui-1-dev
- libxfce4ui_check_version@Base 4.8.0
- libxfce4ui_major_version@Base 4.8.0
- libxfce4ui_micro_version@Base 4.8.0
- libxfce4ui_minor_version@Base 4.8.0
- xfce_dialog_confirm@Base 4.8.0
- xfce_dialog_show_error@Base 4.8.0
- xfce_dialog_show_help@Base 4.9.1
- xfce_dialog_show_help_with_version@Base 4.11.1
- xfce_dialog_show_info@Base 4.8.0
- xfce_dialog_show_warning@Base 4.8.0
- xfce_gdk_screen_get_active@Base 4.8.0
- xfce_gdk_screen_get_geometry@Base 4.13.5
- xfce_gtk_button_new_mixed@Base 4.8.0
- xfce_gtk_frame_box_new@Base 4.8.0
- xfce_gtk_frame_box_new_with_content@Base 4.8.0
- xfce_gtk_menu_popup_until_mapped@Base 4.13.0
- xfce_gtk_window_center_on_active_screen@Base 4.8.0
- xfce_message_dialog@Base 4.8.0
- xfce_message_dialog_new@Base 4.8.0
- xfce_message_dialog_new_valist@Base 4.8.0
- xfce_sm_client_connect@Base 4.8.0
- xfce_sm_client_disconnect@Base 4.8.0
- xfce_sm_client_error_enum_get_type@Base 4.11.0
- xfce_sm_client_error_quark@Base 4.11.0
- xfce_sm_client_get@Base 4.8.0
- xfce_sm_client_get_client_id@Base 4.8.0
- xfce_sm_client_get_current_directory@Base 4.8.0
- xfce_sm_client_get_full@Base 4.8.0
- xfce_sm_client_get_option_group@Base 4.8.0
- xfce_sm_client_get_priority@Base 4.8.0
- xfce_sm_client_get_restart_command@Base 4.8.0
- xfce_sm_client_get_restart_style@Base 4.8.0
- xfce_sm_client_get_state_file@Base 4.8.0
- xfce_sm_client_get_type@Base 4.8.0
- xfce_sm_client_get_with_argv@Base 4.8.0
- xfce_sm_client_is_connected@Base 4.8.0
- xfce_sm_client_is_resumed@Base 4.8.0
- xfce_sm_client_request_shutdown@Base 4.8.0
- xfce_sm_client_restart_style_get_type@Base 4.8.0
- xfce_sm_client_set_current_directory@Base 4.8.0
- xfce_sm_client_set_desktop_file@Base 4.8.0
- xfce_sm_client_set_priority@Base 4.8.0
- xfce_sm_client_set_restart_command@Base 4.8.0
- xfce_sm_client_set_restart_style@Base 4.8.0
- xfce_sm_client_shutdown_hint_get_type@Base 4.8.0
- xfce_spawn_command_line_on_screen@Base 4.8.0
- xfce_spawn_on_screen@Base 4.8.0
- xfce_spawn_on_screen_with_child_watch@Base 4.8.0
- xfce_titled_dialog_get_subtitle@Base 4.8.0
- xfce_titled_dialog_get_type@Base 4.8.0
- xfce_titled_dialog_new@Base 4.8.0
- xfce_titled_dialog_new_with_buttons@Base 4.8.0
- xfce_titled_dialog_new_with_mixed_buttons@Base 4.13.0
- xfce_titled_dialog_set_subtitle@Base 4.8.0
- xfce_widget_reparent@Base 4.13.0
--- a/debian/libxfce4ui-1-dev.install
+++ b/debian/libxfce4ui-1-dev.install
-usr/include/xfce4/libxfce4kbd-private-2
-usr/include/xfce4/libxfce4ui-1
-usr/lib/*/libxfce4kbd-private-2.so
-usr/lib/*/libxfce4ui-1.so
-usr/lib/*/pkgconfig/libxfce4kbd-private-2.pc
-usr/lib/*/pkgconfig/libxfce4ui-1.pc
--- a/debian/libxfce4ui-2-0.symbols
+++ b/debian/libxfce4ui-2-0.symbols
@@ -5,6 +5,7 @@ libxfce4ui-2.so.0 libxfce4ui-2-0 #MINVER#
 libxfce4ui_micro_version@Base 4.11.0
 libxfce4ui_minor_version@Base 4.11.0
 xfce_dialog_confirm@Base 4.11.0
+ xfce_dialog_confirm_close_tabs@Base 4.15.0
 xfce_dialog_show_error@Base 4.11.0
 xfce_dialog_show_help@Base 4.11.0
 xfce_dialog_show_help_with_version@Base 4.11.1

--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ endif
 	dh $@

 override_dh_auto_configure:
-	dh_auto_configure -- --with-vendor-info=$(XFVENDOR) --disable-gladeui2 --with-gtk2 --enable-gtk-doc
+	dh_auto_configure -- --with-vendor-info=$(XFVENDOR) --enable-gtk-doc

 override_dh_install:
 ifneq ($(XFVENDOR),Xubuntu)
@@ -24,11 +24,9 @@ override_dh_missing:
 	dh_missing --fail-missing -X .la

 override_dh_strip:
-	dh_strip -plibxfce4ui-1-0 --dbgsym-migration='libxfce4ui-1-dbg (<< 4.13.2-1~)'
 	dh_strip -plibxfce4ui-2-0 --dbgsym-migration='libxfce4ui-2-dbg (<< 4.13.2-1~)'
 	dh_strip -plibxfce4ui-utils --dbgsym-migration='libxfce4ui-utils-dbg (<< 4.13.2-1~)'
 	dh_strip --remaining-packages

 override_dh_makeshlibs:
-	dh_makeshlibs -plibxfce4ui-1-0 -Xlibxfce4kbd-private
 	dh_makeshlibs -plibxfce4ui-2-0 -Xlibxfce4kbd-private
--- a/debian/watch
+++ b/debian/watch
 version=3
-https://archive.xfce.org/src/xfce/libxfce4ui/(\d[\d\.]+)/ \
-	libxfce4ui-([\d\.]+)\.tar\.(?:gz|bz2)
+https://archive.xfce.org/src/xfce/@PACKAGE@/(\d[\d\.]+)/ \
+	@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -52,12 +52,12 @@ AM_CPPFLAGS =	 							\
 	-I$(top_srcdir) 						\
 	-I$(top_builddir) 						\
 	$(LIBXFCE4UTIL_CFLAGS)						\
-	$(GTK2_CFLAGS)	 						\
+	$(GTK3_CFLAGS)	 						\
 	$(GTK_DOC_EXTRA_CFLAGS)

 GTKDOC_LIBS =  								\
 	$(LIBXFCE4UTIL_LIBS)						\
-	$(GTK2_LIBS)							\
+	$(GTK3_LIBS)							\
 	$(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la

 include $(top_srcdir)/gtk-doc.make