Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez
--- a/ChangeLog
+++ b/ChangeLog
 # created with git log --pretty=format:"%ad %h %s %aN <%aE>" --no-merges --date=short
+2019-04-30 3f7222e WIP release notes Sean Davis <smd.seandavis@gmail.com>
+2019-04-27 8a0ccad I18n: Update translation fr (100%). Yannick Le Guen <leguen.yannick@gmail.com>
+2019-04-23 9119d47 I18n: Update translation sq (100%). Besnik <besnik@programeshqip.org>
+2019-04-21 75b3d28 Update README Sean Davis <smd.seandavis@gmail.com>
+2019-04-21 f0e9308 Fix initial image size, make plugin square by default Sean Davis <smd.seandavis@gmail.com>
+2019-04-21 a5daf60 Fix reloading of icon themes Sean Davis <smd.seandavis@gmail.com>
+2019-04-21 6ca4519 Fix builds with debug=full Sean Davis <smd.seandavis@gmail.com>
+2019-04-21 5616aeb Improve appearance of preferences dialog Sean Davis <smd.seandavis@gmail.com>
+2019-04-21 2493cd6 Drop GTK_CHECK_VERSION checks, current minimum is 3.22 Sean Davis <smd.seandavis@gmail.com>
+2019-04-21 f3cab04 Drop inline function definitions Sean Davis <smd.seandavis@gmail.com>
+2019-04-21 f3056ca Replace deprecated gtk_menu_popup Sean Davis <smd.seandavis@gmail.com>
+2019-04-20 34a424a Replace gtk_menu_popup Andre Miranda <andreldm@xfce.org>
+2019-04-20 bba2a39 Fix runtime errors Andre Miranda <andreldm@xfce.org>
+2019-04-20 efe07e3 Drop inline/extern from function declarations Andre Miranda <andreldm@xfce.org>
+2019-04-20 3e27f12 Bump glib version Andre Miranda <andreldm@xfce.org>
+2019-04-20 549855a Use xfce4-panel 4.13 xfce_panel_plugin_get_icon_size or ignore deprecated gtk_widget_get_style Sean Davis <smd.seandavis@gmail.com>
+2019-04-20 b46dd74 Replace deprecated GtkMisc Sean Davis <smd.seandavis@gmail.com>
+2019-04-20 26c04d3 Sync todo from xfce4-panel panel_utils_grab_available to pview_grab_available Sean Davis <smd.seandavis@gmail.com>
+2019-04-20 4e22b99 Replace deprecated GtkAlignment Sean Davis <smd.seandavis@gmail.com>
+2019-04-20 496f9cc Replace deprecated GtkStock Sean Davis <smd.seandavis@gmail.com>
+2019-04-20 2bc8996 Ignore GtkImageMenuItem deprecations Sean Davis <smd.seandavis@gmail.com>
+2019-04-20 64c7f9f Replace deprecated gtk_icon_info_free Sean Davis <smd.seandavis@gmail.com>
+2019-04-20 c41fe6b Replace deprecated gtk_show_uri Sean Davis <smd.seandavis@gmail.com>
+2019-03-07 126df13 I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2019-01-16 e2f7973 I18n: Update translation be (100%). Zmicer Turok <zmicerturok@gmail.com>
+2019-01-02 6f09203 Replace style-set signal by style-updated and disable it Andre Miranda <andreldm@xfce.org>
+2019-01-02 c7bd8b2 Remove GTK_ICON_LOOKUP_GENERIC_FALLBACK flag Andre Miranda <andreldm@xfce.org>
+2018-12-04 817b144 I18n: Update translation sq (73%). Besnik <besnik@programeshqip.org>
+2018-10-22 6842a4f I18n: Update translation ca (100%). Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>
+2018-09-25 f164e2d I18n: Update translation eu (100%). Aitor Beriain <beriain@bitmessage.ch>
+2018-08-25 4076901 I18n: Update translation ca (100%). Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>
+2018-07-16 e8ce97a I18n: Update translation fi (100%). Anonymous <noreply@xfce.org>
+2018-07-15 e5de0a7 I18n: Update translation it (100%). Emanuele Petriglia <inbox@emanuelepetriglia.me>
+2018-07-11 2bc3977 I18n: Update translation it (100%). Emanuele Petriglia <inbox@emanuelepetriglia.me>
+2018-06-24 0f2261c I18n: Update translation be (100%). Zmicer Turok <zmicerturok@gmail.com>
+2018-03-19 0ff1f69 Handle deprecations Andre Miranda <andreldm@xfce.org>
+2018-03-19 87a047f Update panel API version Andre Miranda <andreldm@xfce.org>
+2018-03-19 e0e9936 Remove old code (panel < 4.9) Andre Miranda <andreldm@xfce.org>
+2018-03-19 69ce621 Update .gitignore Andre Miranda <andreldm@xfce.org>
+2018-03-19 ea282fe Bump dependencies Andre Miranda <andreldm@xfce.org>
+2018-03-18 1266dcf I18n: Update translation fr (100%). Charles Monzat <superboa@hotmail.fr>
+2018-03-17 24e741b I18n: Update translation fr (100%). Charles Monzat <superboa@hotmail.fr>
+2018-02-19 7bec22f I18n: Update translation fi (93%). Jiri Grönroos <jiri.gronroos@iki.fi>
+2018-01-07 6501d74 I18n: Update translation zh_CN (100%). xiaobo zhou <zhouxiaobo.500@gmail.com>
+2018-01-01 91ba544 I18n: Update translation ca (100%). Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>
+2017-11-14 1ec06fa I18n: Update translation ko (100%). 박정규(Jung-Kyu Park) <bagjunggyu@gmail.com>
+2017-11-03 1d4fd18 I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2017-11-03 46b5fca I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2017-11-01 04c411f I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2017-10-01 23e6b92 I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2017-09-30 0d3dbf7 I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2017-09-24 7633dab I18n: Update translation ug (97%). Xfce Bot <transifex@xfce.org>
+2017-09-24 fc9b43c I18n: Update translation th (100%). Theppitak Karoonboonyanan <theppitak@gmail.com>
+2017-09-24 02130a2 I18n: Update translation ru (100%). Sergey Alyoshin <alyoshin.s@gmail.com>
+2017-09-24 62a0867 I18n: Update translation pt_BR (100%). Michael Martins <michaelfm21@gmail.com>
+2017-09-24 88b700c I18n: Update translation pl (100%). Piotr Sokół <psokol.l10n@gmail.com>
+2017-09-24 ab5ddb4 I18n: Update translation oc (100%). Cédric Valmary <cvalmary@yahoo.fr>
+2017-09-24 be74704 I18n: Update translation nl (100%). Pjotr <pjotrvertaalt@gmail.com>
+2017-09-24 78c773e I18n: Update translation it (100%). Cristian Marchi <cri.penta@gmail.com>
+2017-09-24 d049d29 I18n: Update translation hr (100%). Ivica  Kolić <ikoli@yahoo.com>
+2017-09-24 355df9a I18n: Update translation he (100%). GenghisKhan <genghiskhan@gmx.ca>
+2017-09-24 4d0c279 I18n: Update translation fr (100%). Yannick Le Guen <leguen.yannick@gmail.com>
+2017-09-24 9a97a75 I18n: Update translation en_AU (100%). Michael Findlay <translate@cobber-linux.org>
+2017-09-23 46ac0e4 I18n: Update translation lt (100%). Anonymous <noreply@xfce.org>
+2017-09-20 a78cccc I18n: Update translation zh_TW (100%). Walter Cheuk <wwycheuk@gmail.com>
+2017-09-20 e622560 I18n: Update translation zh_CN (100%). Xiaobo Zhou <zhouxiaobo.500@gmail.com>
+2017-09-20 27c5122 I18n: Update translation ur (71%). Xfce Bot <transifex@xfce.org>
+2017-09-20 49e6321 I18n: Update translation ur_PK (71%). Xfce Bot <transifex@xfce.org>
+2017-09-20 ba79178 I18n: Update translation uk (100%). Yarema aka Knedlyk <yupadmin@gmail.com>
+2017-09-20 6d0a66c I18n: Update translation ug (97%). Xfce Bot <transifex@xfce.org>
+2017-09-20 5f6e7da I18n: Update translation tr (100%). Necdet Yücel <necdetyucel@gmail.com>
+2017-09-20 e43c6e0 I18n: Update translation th (100%). Theppitak Karoonboonyanan <theppitak@gmail.com>
+2017-09-20 244895f I18n: Update translation sv (100%). Påvel Nicklasson <pavel2@frimix.se>
+2017-09-20 6abfc0e I18n: Update translation sr (100%). Саша Петровић <salepetronije@gmail.com>
+2017-09-20 ae7970c I18n: Update translation sq (71%). Xfce Bot <transifex@xfce.org>
+2017-09-20 46fee2a I18n: Update translation sl (100%). Anonymous <noreply@xfce.org>
+2017-09-20 0aeecde I18n: Update translation sk (100%). Slavko <linux@slavino.sk>
+2017-09-20 1b26adb I18n: Update translation ru (100%). Sergey Alyoshin <alyoshin.s@gmail.com>
+2017-09-20 40b9a31 I18n: Update translation ro (71%). Xfce Bot <transifex@xfce.org>
+2017-09-20 1a369fd I18n: Update translation pt (100%). Sérgio Marques <smarquespt@gmail.com>
+2017-09-20 6100d5e I18n: Update translation pt_BR (100%). Michael Martins <michaelfm21@gmail.com>
+2017-09-20 3bd6aca I18n: Update translation pl (100%). Piotr Sokół <psokol.l10n@gmail.com>
+2017-09-20 9f3f164 I18n: Update translation pa (71%). Xfce Bot <transifex@xfce.org>
+2017-09-20 8e3050f I18n: Update translation oc (100%). Cédric Valmary <cvalmary@yahoo.fr>
+2017-09-20 c384bc7 I18n: Update translation nl (100%). Pjotr <pjotrvertaalt@gmail.com>
+2017-09-20 f9c7f71 I18n: Update translation nb (100%). Harald H <haarektrans@gmail.com>
+2017-09-20 9d92621 I18n: Update translation ms (100%). abuyop <abuyop@gmail.com>
+2017-09-20 fcd110c I18n: Update translation lv (71%). Xfce Bot <transifex@xfce.org>
+2017-09-20 e4424b0 I18n: Update translation lt (100%). Anonymous <noreply@xfce.org>
+2017-09-20 ad92862 I18n: Update translation ko (100%). Seong-ho Cho <darkcircle.0426@gmail.com>
+2017-09-20 fff1f72 I18n: Update translation kk (100%). Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+2017-09-20 39716c0 I18n: Update translation ja (100%). Masato HASHIMOTO <cabezon.hashimoto@gmail.com>
+2017-09-20 f677345 I18n: Update translation it (100%). Cristian Marchi <cri.penta@gmail.com>
+2017-09-20 0886be1 I18n: Update translation is (100%). Sveinn í Felli <sv1@fellsnet.is>
+2017-09-20 b3e65ad I18n: Update translation id (100%). Ardjuna <Asyura.x@gmail.com>
+2017-09-20 05687af I18n: Update translation hu (100%). Benedek Imre <nucleo@indamail.hu>
+2017-09-20 2a85116 I18n: Update translation hr (100%). Ivica  Kolić <ikoli@yahoo.com>
+2017-09-20 6c62423 I18n: Update translation he (100%). GenghisKhan <genghiskhan@gmx.ca>
+2017-09-20 b4e7252 I18n: Update translation gl (100%). Xosé <xosecalvo@gmail.com>
+2017-09-20 efab340 I18n: Update translation fr (100%). Yannick Le Guen <leguen.yannick@gmail.com>
+2017-09-20 d962bbd I18n: Update translation fi (84%). Xfce Bot <transifex@xfce.org>
+2017-09-20 4ffb7ba I18n: Update translation eu (97%). Xfce Bot <transifex@xfce.org>
+2017-09-20 dc4ee9f I18n: Update translation es (100%). Manolo Díaz <diaz.manolo@gmail.com>
+2017-09-20 c3d7477 I18n: Update translation en_GB (84%). Xfce Bot <transifex@xfce.org>
+2017-09-20 5d49f60 I18n: Update translation en_AU (100%). Michael Findlay <translate@cobber-linux.org>
+2017-09-20 10c1183 I18n: Update translation el (100%). Anonymous <noreply@xfce.org>
+2017-09-20 76c426b I18n: Update translation de (100%). Tobias Bannert <tobannert@gmail.com>
+2017-09-20 fdb7d67 I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2017-09-20 0bc5000 I18n: Update translation cs (100%). Michal Várady <miko.vaji@gmail.com>
+2017-09-20 8bb3943 I18n: Update translation ca (100%). Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>
+2017-09-20 a08d744 I18n: Update translation bg (100%). Anonymous <noreply@xfce.org>
+2017-09-20 9b74607 I18n: Update translation ast (100%). Ḷḷumex03 <tornes@opmbx.org>
+2017-09-20 f825ffb I18n: Update translation ar (100%). Anonymous <noreply@xfce.org>
+2017-09-20 05e6fde I18n: Update translation am (57%). samson <sambelet@yahoo.com>
+2017-09-13 9fc3f1e I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2017-09-01 eca4f91 I18n: Update translation lt (100%). Anonymous <noreply@xfce.org>
+2017-08-29 231dc0f I18n: Update translation pt_BR (100%). Michael Martins <michaelfm21@gmail.com>
+2017-08-08 3c05b5e I18n: Update translation nl (100%). Pjotr <pjotrvertaalt@gmail.com>
+2017-07-25 48e5251 I18n: Update translation zh_TW (100%). Walter Cheuk <wwycheuk@gmail.com>
+2017-07-25 ab57ced I18n: Update translation zh_CN (100%). Xiaobo Zhou <zhouxiaobo.500@gmail.com>
+2017-07-25 b2f4209 I18n: Update translation ur (71%). Xfce Bot <transifex@xfce.org>
+2017-07-25 0fe647d I18n: Update translation ur_PK (71%). Xfce Bot <transifex@xfce.org>
+2017-07-25 5eca6f9 I18n: Update translation uk (100%). Yarema aka Knedlyk <yupadmin@gmail.com>
+2017-07-25 b3f9b37 I18n: Update translation ug (97%). Xfce Bot <transifex@xfce.org>
+2017-07-25 d0298c3 I18n: Update translation tr (100%). Necdet Yücel <necdetyucel@gmail.com>
+2017-07-25 45e9b7a I18n: Update translation th (100%). Theppitak Karoonboonyanan <theppitak@gmail.com>
+2017-07-25 071f3f8 I18n: Update translation sv (100%). Påvel Nicklasson <pavel2@frimix.se>
+2017-07-25 7593213 I18n: Update translation sr (100%). Саша Петровић <salepetronije@gmail.com>
+2017-07-25 ac6f87c I18n: Update translation sq (71%). Xfce Bot <transifex@xfce.org>
+2017-07-25 ce98049 I18n: Update translation sl (100%). Anonymous <noreply@xfce.org>
+2017-07-25 358fbfd I18n: Update translation sk (100%). Slavko <linux@slavino.sk>
+2017-07-25 f2d76fa I18n: Update translation ru (100%). Sergey Alyoshin <alyoshin.s@gmail.com>
+2017-07-25 edba253 I18n: Update translation ro (71%). Xfce Bot <transifex@xfce.org>
+2017-07-25 9b678de I18n: Update translation pt (100%). Sérgio Marques <smarquespt@gmail.com>
+2017-07-25 f79dac0 I18n: Update translation pt_BR (100%). Rafael Fontenelle <rffontenelle@gmail.com>
+2017-07-25 32ad850 I18n: Update translation pl (100%). Piotr Sokół <psokol.l10n@gmail.com>
+2017-07-25 3e768f6 I18n: Update translation pa (71%). Xfce Bot <transifex@xfce.org>
+2017-07-25 fb0fe70 I18n: Update translation oc (100%). Cédric Valmary <cvalmary@yahoo.fr>
+2017-07-25 0c53c9e I18n: Update translation nl (100%). Pjotr <pjotrvertaalt@gmail.com>
+2017-07-25 9aaceb1 I18n: Update translation nb (100%). Harald H <haarektrans@gmail.com>
+2017-07-25 3041ebd I18n: Update translation ms (100%). abuyop <abuyop@gmail.com>
+2017-07-25 67564b7 I18n: Update translation lv (71%). Xfce Bot <transifex@xfce.org>
+2017-07-25 e3d1010 I18n: Update translation lt (100%). Anonymous <noreply@xfce.org>
+2017-07-25 fe62bbd I18n: Update translation ko (100%). Seong-ho Cho <darkcircle.0426@gmail.com>
+2017-07-25 988dcd1 I18n: Update translation kk (100%). Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+2017-07-25 4c2111b I18n: Update translation ja (100%). Masato HASHIMOTO <cabezon.hashimoto@gmail.com>
+2017-07-25 b7ee15d I18n: Update translation it (100%). Cristian Marchi <cri.penta@gmail.com>
+2017-07-25 746e4b4 I18n: Update translation is (100%). Sveinn í Felli <sv1@fellsnet.is>
+2017-07-25 2fa47b9 I18n: Update translation id (100%). Ardjuna <Asyura.x@gmail.com>
+2017-07-25 437b4b6 I18n: Update translation hu (100%). Benedek Imre <nucleo@indamail.hu>
+2017-07-25 c552ad5 I18n: Update translation hr (100%). Ivica  Kolić <ikoli@yahoo.com>
+2017-07-25 a274227 I18n: Update translation he (100%). GenghisKhan <genghiskhan@gmx.ca>
+2017-07-25 6f482ca I18n: Update translation gl (100%). Xosé <xosecalvo@gmail.com>
+2017-07-25 f146c16 I18n: Update translation fr (100%). Yannick Le Guen <leguen.yannick@gmail.com>
+2017-07-25 32b4e55 I18n: Update translation fi (84%). Xfce Bot <transifex@xfce.org>
+2017-07-25 9b3af3d I18n: Update translation eu (97%). Xfce Bot <transifex@xfce.org>
+2017-07-25 bf76786 I18n: Update translation es (100%). Manolo Díaz <diaz.manolo@gmail.com>
+2017-07-25 e85dbf4 I18n: Update translation en_GB (84%). Xfce Bot <transifex@xfce.org>
+2017-07-25 2ea2933 I18n: Update translation en_AU (100%). Michael Findlay <translate@cobber-linux.org>
+2017-07-25 fe10c57 I18n: Update translation el (100%). Anonymous <noreply@xfce.org>
+2017-07-25 3388d95 I18n: Update translation de (100%). Tobias Bannert <tobannert@gmail.com>
+2017-07-25 26c6f0e I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2017-07-25 2b14058 I18n: Update translation cs (100%). Michal Várady <miko.vaji@gmail.com>
+2017-07-25 3dee3fd I18n: Update translation ca (100%). Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>
+2017-07-25 24207e9 I18n: Update translation bg (100%). Anonymous <noreply@xfce.org>
+2017-07-25 c38ebcf I18n: Update translation ast (100%). Ḷḷumex03 <tornes@opmbx.org>
+2017-07-25 5d8f67f I18n: Update translation ar (100%). Anonymous <noreply@xfce.org>
+2017-07-25 ef6eb85 I18n: Update translation am (57%). samson <sambelet@yahoo.com>
+2017-04-13 8cb9dd3 I18n: Update translation lt (100%). Anonymous <noreply@xfce.org>
+2017-03-21 3665e94 I18n: Update translation gl (100%). Xosé <xosecalvo@gmail.com>
+2017-02-23 9ee727c I18n: Update translation lt (100%). Anonymous <noreply@xfce.org>
+2017-01-23 3c98c66 I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2017-01-22 96af8fe I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2017-01-16 2049b04 I18n: Update translation da (100%). Anonymous <noreply@xfce.org>
+2017-01-06 59aaacf I18n: Update translation hr (100%). Ivica  Kolić <ikoli@yahoo.com>
+2016-09-07 813316e I18n: Update translation lt (100%). Anonymous <noreply@xfce.org>
+2016-06-24 ad026d1 I18n: Update translation lt (100%). Anonymous <noreply@xfce.org>
+2016-06-20 4df0bf2 I18n: Update translation ca (100%). Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>
+2016-06-06 43b6c9e I18n: Update translation ca (100%). Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>
+2016-05-03 0aeafb9 I18n: Update translation ca (100%). Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>
+2016-04-01 eb2f40e I18n: Update translation ca (100%). Davidmp <medipas@gmail.com>
+2016-02-27 3cf0183 I18n: Update translation am (57%). samson <sambelet@yahoo.com>
+2016-02-27 da9c5ac I18n: Add new translation am (57%). samson <sambelet@yahoo.com>
+2016-02-08 93acfba I18n: Update translation he (100%). GenghisKhan <genghiskhan@gmx.ca>
+2016-02-07 807cc93 I18n: Update translation he (100%). Elishai Eliyahu <e1907@mm.st>
+2015-11-13 a856ca4 I18n: Update translation el (100%). Anonymous <noreply@xfce.org>
+2015-08-22 3cbae95 I18n: Update translation he (86%). GenghisKhan <genghiskhan@gmx.ca>
+2015-07-20 51e770c I18n: Update translation sv (100%). Påvel Nicklasson <pavelnicklasson@bahnhof.se>
+2015-07-07 94d583d Bug 11939:  xfce4-places-plugin 1.7.0 crashes with undefined symbol Andrzej <ndrwrdck@gmail.com>
+2015-06-12 58bcfdb I18n: Update translation lt (100%). Anonymous <noreply@xfce.org>
+2015-04-17 1f92930 I18n: Update translation lt (100%). Anonymous <noreply@xfce.org>
+2015-03-19 61ac5ff I18n: Update translation el (100%). Efstathios Iosifidis <iefstathios@gmail.com>
+2015-03-19 a3de053 I18n: Update translation el (88%). Efstathios Iosifidis <iefstathios@gmail.com>
+2015-03-17 b4ef9d8 I18n: Update translation lt (91%). Anonymous <noreply@xfce.org>
+2015-03-05 08f542b Prepare for a release Andrzej <ndrwrdck@gmail.com>
 2015-02-27 9431b2a I18n: Update translation es (100%). Manolo Díaz <diaz.manolo@gmail.com>
 2015-02-26 9307104 I18n: Update translation sk (100%). Slavko <linux@slavino.sk>
 2015-02-26 4a62b99 I18n: Update translation sk (93%). Slavko <linux@slavino.sk>

--- a/INSTALL
+++ b/INSTALL
--- a/Makefile.in
+++ b/Makefile.in
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@

 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
@@ -78,15 +88,12 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in COPYING TODO compile config.guess \
-	config.sub depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+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
@@ -127,7 +134,7 @@ am__recursive_targets = \
  $(RECURSIVE_CLEAN_TARGETS) \
  $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope distdir distdir-am dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -150,6 +157,9 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
+	COPYING ChangeLog INSTALL NEWS README TODO compile \
+	config.guess config.sub install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -272,6 +282,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
@@ -299,6 +310,7 @@ LIBXFCE4UTIL_VERSION = @LIBXFCE4UTIL_VERSION@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -392,6 +404,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -438,15 +451,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -588,7 +600,10 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -653,7 +668,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
@@ -668,17 +683,17 @@ dist-xz: distdir
 	$(am__post_remove_distdir)

 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)

 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)

 dist-zip: distdir
@@ -696,7 +711,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -706,23 +721,23 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -900,6 +915,8 @@ uninstall-am:
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am

+.PRECIOUS: Makefile
+

 distclean-local:
 	rm -rf *.cache *~

--- a/NEWS
+++ b/NEWS
+2019-04-30
+================================================================================
+xfce4-places-plugin v1.8.0 released
+
+* Port to GTK+ 3!
+* Bumped dependencies to modern stack:
+  - GTK 3.22
+  - GLib 2.42
+  - Xfce 4.12
+* Added support for Xfce Panel's icon size preference
+* Improved appearance of the preferences dialog
+* Fixed crash with undefined symbol (bug #11939)
+* Updated translations
+
 2015-03-05
 ================================================================================
 xfce4-places-plugin v1.7.0 released

--- a/README
+++ b/README
@@ -6,6 +6,6 @@ The plugin adds a small button to the panel. Clicking on it opens a menu, which
 1) System folders: home directory, trash, desktop, file system
 2) Removable media
 3) User-defined bookmarks
- 4) Recent Documents (with gtk v2.10+)
+ 4) Recent Documents

 vim: wrap linebreak
--- a/aclocal.m4
+++ b/aclocal.m4
--- a/compile
+++ b/compile
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.

-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC

-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@ EOF
    echo "compile $scriptversion"
    exit $?
    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
    func_cl_wrapper "$@"      # Doesn't return...
    ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/config.guess
+++ b/config.guess
--- a/config.h.in
+++ b/config.h.in
@@ -15,6 +15,14 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET

+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
 /* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT

@@ -24,7 +32,7 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT

-/* Define if gio-unix-2.0 >= 2.22.0 present */
+/* Define if gio-unix-2.0 >= 2.42.0 present */
 #undef HAVE_GIO_UNIX

 /* Define to 1 if you have the <inttypes.h> header file. */
@@ -66,8 +74,7 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H

-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR

 /* Name of package */

--- a/config.sub
+++ b/config.sub
--- a/configure
+++ b/configure
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ dnl
 dnl xfce4-places-plugin

 dnl version info
-m4_define([places_version], [1.7.0])
+m4_define([places_version], [1.8.0])

 dnl initialize autoconf
 AC_COPYRIGHT([Copyright (c) 2007-2009 Diego Ongaro <ongardie@gmail.com>])
@@ -30,20 +30,20 @@ LT_PREREQ([2.2.6])
 LT_INIT([disable-static])

 dnl check for required packages
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.22.0])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.22.0])
-XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.22.0])
-XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.22.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.22.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
-XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
+XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.42.0])
+XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.42.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0])
+XDT_CHECK_PACKAGE([EXO], [exo-2], [0.11.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
 XDT_CHECK_LIBX11()

-XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.22.0], [gio-unix],
+XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix],
    [gio-unix, for special treatment of mount points on UNIX])

 dnl *** Optional support for libnotify ***
@@ -51,7 +51,7 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.4.0], [notifications],
                           [Mount notification support], [yes])

 dnl check for i18n support
-XDT_I18N([ar ast be bg ca cs da de el en_AU en_GB eo es et eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl oc pa pl pt_BR pt ro ru sk sl sq sr sv th tr ug uk ur_PK ur zh_CN zh_TW ])
+XDT_I18N([am ar ast be bg ca cs da de el en_AU en_GB eo es et eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl oc pa pl pt_BR pt ro ru sk sl sq sr sv th tr ug uk ur_PK ur zh_CN zh_TW ])

 XDT_FEATURE_DEBUG()


--- a/debian/changelog
+++ b/debian/changelog
+xfce4-places-plugin (1.8.0-1) UNRELEASED; urgency=medium
+
+  * New upstream version 1.8.0
+  * d/control: update b-deps for new version
+  * d/patches: drop patch, included upstream
+  * d/control: update standards version to 4.3.0
+  * use debhelper-compat b-d for debhelper compat level
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 06 May 2019 14:19:07 +0200
+
 xfce4-places-plugin (1.7.0-4) unstable; urgency=medium

  * Moved the package to git on salsa.debian.org

--- a/debian/compat
+++ b/debian/compat
-10
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,19 @@ Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <debian-xfce@lists.debian.org>
 Uploaders: Yves-Alexis Perez <corsac@debian.org>
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper-compat (= 10),
               intltool,
-               libexo-1-dev,
+               libexo-2-dev,
               libgtk2.0-dev,
               libnotify-dev,
               libx11-dev,
-               libxfce4ui-1-dev,
+               libxfce4ui-2-dev (>= 4.13),
               libxfce4util-dev,
+               libxfce4panel-2.0-dev,
+               libxfconf-0-dev,
               pkg-config,
               xfce4-dev-tools,
-               xfce4-panel-dev
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
 Vcs-Git: https://salsa.debian.org/xfce-team/goodies/xfce4-places-plugin.git
 Vcs-Browser: https://salsa.debian.org/xfce-team/goodies/xfce4-places-plugin

--- a/debian/patches/fix-ftbfs-gcc5.patch
+++ b/debian/patches/fix-ftbfs-gcc5.patch
-Description: Fix FTBFS with build on gcc-5.
-Author: Shivaji Sathe
-Bug-Debian: https://bugs.debian.org/778182
-commit 94d583d0ba257cdc96cde5794ebb7d38001ae3a5
-Author: Andrzej <ndrwrdck@gmail.com>
-Date:   Tue Jul 7 22:26:51 2015 +0100
-
-    Bug 11939:  xfce4-places-plugin 1.7.0 crashes with undefined symbol
-    
-    Patch from Fedora. Submitted by Kevin Fenzi.
-
-diff --git a/panel-plugin/model.h b/panel-plugin/model.h
-index 06d9d6f..043e391 100644
--- a/panel-plugin/model.h
-+++ b/panel-plugin/model.h
-@@ -36,13 +36,13 @@ struct _PlacesBookmarkAction
-     void        (*finalize) (PlacesBookmarkAction *self);
- };
- 
-inline PlacesBookmarkAction*
-+extern inline PlacesBookmarkAction*
- places_bookmark_action_create(gchar *label);
- 
-inline void
-+extern inline void
- places_bookmark_action_destroy(PlacesBookmarkAction*);
- 
-inline void
-+extern inline void
- places_bookmark_action_call(PlacesBookmarkAction*);
- 
- /* Places Bookmark */
-@@ -70,10 +70,10 @@ struct _PlacesBookmark
-     void                 (*finalize) (PlacesBookmark *self);
- };
- 
-inline PlacesBookmark*
-+extern inline PlacesBookmark*
- places_bookmark_create(gchar *label);
- 
-inline void
-+extern inline void
- places_bookmark_destroy(PlacesBookmark *bookmark);
- 
- /* Places Bookmark Group */
-@@ -86,16 +86,16 @@ struct _PlacesBookmarkGroup
-     gpointer    priv;
- };
- 
-inline GList*
-+extern inline GList*
- places_bookmark_group_get_bookmarks(PlacesBookmarkGroup*);
- 
-inline gboolean
-+extern inline gboolean
- places_bookmark_group_changed(PlacesBookmarkGroup*);
- 
-inline PlacesBookmarkGroup*
-+extern inline PlacesBookmarkGroup*
- places_bookmark_group_create();
- 
-inline void
-+extern inline void
- places_bookmark_group_destroy(PlacesBookmarkGroup*);
- 
- #endif
--- a/debian/patches/series
+++ b/debian/patches/series
-fix-ftbfs-gcc5.patch
--- a/depcomp
+++ b/depcomp
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects

-scriptversion=2013-05-30.07; # UTC
+scriptversion=2018-03-07.03; # UTC

-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ scriptversion=2013-05-30.07; # UTC
 # GNU General Public License for more details.

 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -783,9 +783,9 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/install-sh
+++ b/install-sh
 #!/bin/sh
 # install - install a program, script, or datafile

-scriptversion=2011-11-20.07; # UTC
+scriptversion=2018-03-11.20; # UTC

 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
 # This script is compatible with the BSD install script, but was written
 # from scratch.

+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"

-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.

-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}

 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}

-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=

 # Desired mode of installed file.
@@ -97,7 +82,7 @@ dir_arg=
 dst_arg=

 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly

 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -143,8 +128,7 @@ while test $# -ne 0; do

    -m) mode=$2
        case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
            echo "$0: invalid mode: $mode" >&2
            exit 1;;
        esac
@@ -155,14 +139,16 @@ while test $# -ne 0; do

    -s) stripcmd=$stripprog;;

-    -t) dst_arg=$2
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
        # Protect names problematic for 'test' and other utilities.
        case $dst_arg in
          -* | [=\(\)!]) dst_arg=./$dst_arg;;
        esac
        shift;;

-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;

    --version) echo "$0 $scriptversion"; exit $?;;

@@ -177,6 +163,16 @@ while test $# -ne 0; do
  shift
 done

+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
@@ -207,6 +203,15 @@ if test $# -eq 0; then
  exit 0
 fi

+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
 if test -z "$dir_arg"; then
  do_exit='(exit $ret); exit $ret'
  trap "ret=129; $do_exit" 1
@@ -266,49 +271,31 @@ do
    fi
    dst=$dst_arg

-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
+    # If destination is a directory, append the input filename.
    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
+      if test "$is_target_a_directory" = never; then
        echo "$0: $dst_arg: Is a directory" >&2
        exit 1
      fi
      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
      dstdir_status=0
    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
      test -d "$dstdir"
      dstdir_status=$?
    fi
  fi

+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
  obsolete_mkdir_used=false

  if test $dstdir_status != 0; then
@@ -345,34 +332,43 @@ do
            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
            ;;
          *)
+            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
+            # here however when possible just to lower collision chance.
            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0

+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            # Because "mkdir -p" follows existing symlinks and we likely work
+            # directly in world-writeable /tmp, make sure that the '$tmpdir'
+            # directory is successfully created first before we actually test
+            # 'mkdir -p' feature.
            if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
            then
              if test -z "$dir_arg" || {
                   # Check for POSIX incompatibilities with -m.
                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
                   # other-writable bit of parent directory when it shouldn't.
                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
                   case $ls_ld_tmpdir in
                     d????-?r-*) different_mode=700;;
                     d????-?--*) different_mode=755;;
                     *) false;;
                   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
                   }
                 }
              then posix_mkdir=:
              fi
-	      rmdir "$tmpdir/d" "$tmpdir"
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
            else
              # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
            fi
            trap '' 0;;
        esac;;
@@ -396,14 +392,12 @@ do
        *)  prefix='';;
      esac

-      eval "$initialize_posix_glob"
-
      oIFS=$IFS
      IFS=/
-      $posix_glob set -f
+      set -f
      set fnord $dstdir
      shift
-      $posix_glob set +f
+      set +f
      IFS=$oIFS

      prefixes=
@@ -450,8 +444,8 @@ do
  else

    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_

    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@@ -474,13 +468,10 @@ do
    if $copy_on_change &&
       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       set -f &&
       set X $old && old=:$2:$4:$5:$6 &&
       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
       test "$old" = "$new" &&
       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
    then
@@ -519,9 +510,9 @@ do
 done

 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/ltmain.sh
+++ b/ltmain.sh