diff -pruN 2.1.47/debian/changelog 2.1.49/debian/changelog
--- 2.1.47/debian/changelog	2014-06-13 20:59:33.000000000 +0000
+++ 2.1.49/debian/changelog	2021-12-13 21:17:09.000000000 +0000
@@ -1,3 +1,38 @@
+menu (2.1.49) unstable; urgency=medium
+
+  * The "Oujda" release
+  * debian/control:
+    + Bump Standards-Version to 4.6.0.
+    + Build-Depends on debhelper-compat (= 13).
+  * debian/rules: add missing targets. Closes: #999049
+  * scripts/su-to-root: replace which by command -v
+  * doc/menu.direntry: replace tempfile by mktemp
+  * doc/su-to-root.1: fix typo
+
+ -- Bill Allombert <ballombe@debian.org>  Mon, 13 Dec 2021 22:17:09 +0100
+
+menu (2.1.48) unstable; urgency=low
+
+  * The "Talence" release
+  * debian/control:
+    + Bump Standards-Version to 4.5.0.
+    + Add Vcs-Git/Vcs-Browser fields
+    + Add Multi-Arch: same
+    + Build-Depends on debhelper-compat (= 12). Closes: #965717
+    + Replace Suggests: kde-runtime by kde-cli-tools. Closes: #950837
+  * debian/compat: removed
+  * debian/source/format: set to 3.0 (native)
+  * debian/copyright: update URL.
+  * po-su-to-root:
+    + ro.po: updated Romanian translation by Cristian Secară. Closes: #931443
+  * debian/rules:
+    + call configure with --host option. Closes: #837297
+  * scripts/su-to-root, doc/su-to-root:
+    - SU_TO_ROOT_X: new option sudo-askpass: use ssh-askpass via sudo --askpass.
+      Closes: #827914. Thanks Jordi Pujol Palomer.
+
+ -- Bill Allombert <ballombe@debian.org>  Wed, 30 Sep 2020 19:27:58 +0200
+
 menu (2.1.47) unstable; urgency=low
 
   * The "Tours" release
@@ -52,7 +87,7 @@ menu (2.1.46) unstable; urgency=low
 
 menu (2.1.45) unstable; urgency=low
 
-  * The "no ghost" release 
+  * The "no ghost" release
   * Handling of l10n by Christian Perrier:
     + Programs translations:
       - Danish updated. Closes: #609583
@@ -77,7 +112,7 @@ menu (2.1.44) unstable; urgency=low
       - Estonian added.
     + su-to-root translations:
       - Estonian added.
-  * debian/control: 
+  * debian/control:
     - Suggests menu-l10n.
     - Bump Standards-Version to 3.9.1.
   * Fix spelling error in /usr/share/menu/README.
@@ -94,7 +129,7 @@ menu (2.1.43) unstable; urgency=low
   * doc/menu.sgml:
     + Mention that the new menu structure was drafted by Linas Zvirblis.
   * install-menu/functions.cc, install-menu/install-menu.cc:
-    + Add support for translation of menu entries in gettext domain 
+    + Add support for translation of menu entries in gettext domain
      'menu-entries'. Translations will be provided by the menu-l10n package.
       Closes: #37716
   * update automake-related scripts.
@@ -121,8 +156,8 @@ menu (2.1.42) unstable; urgency=low
     - Depends: add ${misc:Depends}
     - Bump Standards-Version to 3.8.3.
 
-  * install-info transition: 
-    + doc/Makefile.am, doc/menu.direntry: 
+  * install-info transition:
+    + doc/Makefile.am, doc/menu.direntry:
       - Add @direntry to menu.info. Closes: #528892
     + debian/postinst, debian/prerm:
       - Remove call to install-info.
@@ -182,9 +217,9 @@ menu (2.1.40) unstable; urgency=low
 
   * debian/control:
     + Bump Standards-Version to 3.8.0.
-  
+
   * update-menus/update-menus.cc:
-    + Accept states triggers-awaited and triggers-pending as installed. 
+    + Accept states triggers-awaited and triggers-pending as installed.
       Thanks Joey Hess for his explanation. Closes: #489040
 
  -- Bill Allombert <ballombe@debian.org>  Thu, 24 Jul 2008 16:06:55 +0200
@@ -211,7 +246,7 @@ menu (2.1.39) unstable; urgency=low
   * Patches from Robert Luberda:
     - Fix diversion of output to /tmp/update-menus.XXX
     - Exit cleanly if the dpkg database is broken. Closes: #341701
-  
+
   * debian/control, doc/su-to-root.1, doc/su-to-root.fr.1, scripts/su-to-root:
     - Add support for ktsuss. Closes: #478841. Thanks Yves-Alexis Perez.
 
@@ -220,7 +255,7 @@ menu (2.1.39) unstable; urgency=low
      *Note* To allow partial upgrades, lenny packages should not assume
         menu support triggers.
       + this fix a rare race condition when upgrading. Closes: #473464.
- 
+
  -- Bill Allombert <ballombe@debian.org>  Mon, 12 May 2008 20:41:42 +0200
 
 menu (2.1.38) unstable; urgency=low
@@ -251,7 +286,7 @@ menu (2.1.38) unstable; urgency=low
   * debian/bug.presubj:
     - Remove color escape codes which are not displayed correctly by
       current reportbug. Thanks Dan Jacobson.
-  
+
   * su-to-root:
     - Fix support for sux.
     - Fix command quoting for sudo.  Closes: #465136. Thanks Daniel Hahler.
@@ -518,12 +553,12 @@ menu (2.1.29) unstable; urgency=low
 
 menu (2.1.28) unstable; urgency=low
 
-  * The "Happy birthday" release 
+  * The "Happy birthday" release
   * Morten Brix Pedersen:
-    - Actually write pid to update-menus.pid. 
+    - Actually write pid to update-menus.pid.
       Thanks to Pierre Thierry who discovered this bug.
   * Fix the menu.pot file. Closes: #343327. Thanks Thomas Huriaux.
-  * debian/rules: 
+  * debian/rules:
     + Undo incorrect change in 2.1.26 that caused update-menus to be shipped
       executable. Closes: #368814. Thanks Peter Chubb
   * Fix typos in su-to-root's French manpage. Thanks Filipus Klutiero.
@@ -531,7 +566,7 @@ menu (2.1.28) unstable; urgency=low
   * Improve menu.sgml following suggestions from Daniel Barclay, first stage,
     see bug #354403.
   * Update Greek menu sections translation. Thanks Konstantinos Margaritis.
-    Closes: #344587. 
+    Closes: #344587.
   * Update Galician menu sections translation. Thanks Jacobo Tarrio.
     Closes: #359074.
   * Add Nepali menu sections translation. Thanks, Shiva Pokharel
@@ -560,27 +595,27 @@ menu (2.1.27) unstable; urgency=low
 
 menu (2.1.26) unstable; urgency=low
 
-  * The "And no, I'm not accepting job offers (2)" release. 
+  * The "And no, I'm not accepting job offers (2)" release.
   * Menu-methods should now use #!/usr/bin/install-menu
-  * Fix update-menus counting of menuentries in verbose mode. 
+  * Fix update-menus counting of menuentries in verbose mode.
     Closes: #315304. Thanks Shlomi Fish.
   * Add Bulgarian menu sections translation. Thanks Yavor Doganov.
-    Closes: #315841. 
+    Closes: #315841.
   * Add Slovak menu sections translation. Thanks Peter Mann.
     Closes: #330182
   * Bump Standards-Version to 3.6.2.
   * debian/postinst, debian/prerm, debian/rules: Undivert update-menus.
   * scripts/wm-menu-config, doc/wm-menu-config.8: removed.
-  * install-menu and su-to-root are now in /usr/bin and symlinks in 
+  * install-menu and su-to-root are now in /usr/bin and symlinks in
     /usr/sbin.
   * debian/copyright: update FSF address and bump copyright date.
-  * debian/menu.sgml: Fix typos, thanks Francesco Poli and 
+  * debian/menu.sgml: Fix typos, thanks Francesco Poli and
     Miguel Gea Milvaques. Closes: #328947.
-  * debian/rules, debian/control, debian/conffiles: 
-    + Switch to debhelper v4. 
-    + Hack to prevent /etc/menu/README and /etc/menu-methods/README 
+  * debian/rules, debian/control, debian/conffiles:
+    + Switch to debhelper v4.
+    + Hack to prevent /etc/menu/README and /etc/menu-methods/README
       to be marked as conffiles.
-  * update-menus was segfaulting on non-readable directories. 
+  * update-menus was segfaulting on non-readable directories.
     Closes: #331247. Thanks Felipe Almeida Lessa.
   * The functions firstentry(), entryindex() and lastentry() did not work
     when sorting was used.  Closes: #231826. Thanks Jorgen Schäfer.
@@ -591,7 +626,7 @@ menu (2.1.26) unstable; urgency=low
 
 menu (2.1.25) unstable; urgency=low
 
-  * The "Welcome to Etch" release 
+  * The "Welcome to Etch" release
   * Documentation changes-only upload to transition from /usr/lib/menu
     to /usr/share/menu. Sarge menu support both locations already,
     /usr/lib/menu having higher priority than /usr/share/menu.
@@ -599,26 +634,26 @@ menu (2.1.25) unstable; urgency=low
   * debian/rules: Move README from /usr/lib/menu to /usr/share/menu.
   * debian/control: Rewrite package description.
   * Clean up manpages.
-  * Update Portuguese menu sections translation. 
+  * Update Portuguese menu sections translation.
     Thanks Miguel Figueiredo. Closes: #311308.
   * Remove gpm default menu entry. Closes: #187728.
   * Changes by Christian Perrier:
     - Correct extra space before exclamation mark before a program message
-    - Update german menu messages and sections translations. 
+    - Update german menu messages and sections translations.
       Thanks Jens Seidel. Closes: #312852
 
  -- Bill Allombert <ballombe@debian.org>  Sun, 12 Jun 2005 18:57:18 +0200
 
 menu (2.1.24) unstable; urgency=medium
 
-  * The "head or tail" release 
+  * The "head or tail" release
   * Fix .menus typo in menufile.5. Closes: #306564. Thanks Sean Finney.
   * Add Vietnamese menu messages and menu sections translations.
     Thanks Clytie Siddall. Closes: #307450, #308953.
   * Update Esperanto menu sections translation. Thanks MJ Ray.
   * Add Esperanto menu messages translation. Thanks MJ Ray.
   * Unfuzzy Norwegian Bokmål menu messages translation.
-  
+
  -- Bill Allombert <ballombe@debian.org>  Tue, 24 May 2005 10:34:47 +0200
 
 menu (2.1.23) unstable; urgency=low
@@ -633,20 +668,20 @@ menu (2.1.23) unstable; urgency=low
 
 menu (2.1.22) unstable; urgency=low
 
-  * The "Debian translators still rule" release 
-  * Add Basque menu sections translation. Thanks Piarres Beobide. 
+  * The "Debian translators still rule" release
+  * Add Basque menu sections translation. Thanks Piarres Beobide.
     Closes: #295598.
   * Update Russian menu sections translation. Thanks Nikolai Prokoschenko.
     Closes: #295607.
   * Add Galician menu messages and sections translation. Thanks Jacobo Tarrio.
     Closes: #295620, #295768.
-  * Add Traditional Chinese menu messages and sections translation. 
+  * Add Traditional Chinese menu messages and sections translation.
     Thanks Kanru Chen and Asho Yeh.  Closes: #295794, #295683.
   * Update Turkish menu messages translation. Thanks Recai Oktas.
     Closes: #295732.
   * Add Bahasa Indonesian menu sections translation. Thanks Arief S Fitrian.
     Closes: #295796.
-  * Add Greek menu messages translation. Thanks Konstantinos Margaritis. 
+  * Add Greek menu messages translation. Thanks Konstantinos Margaritis.
     Closes: #295987
   * Add Romanian menu sections translation. Thanks Sorin Batariuc.
     Closes: #296090.
@@ -654,7 +689,7 @@ menu (2.1.22) unstable; urgency=low
   * debian/bug.presubj: display "Reporting menu bugs" in red to stand out.
   * su-to-root: add support for sux and for a .su-to-rootrc config file.
     Closes: #272752. Thanks Fabian Franz.
-  * Morten Brix Pedersen: 
+  * Morten Brix Pedersen:
     - Fixed two typos in the Danish menu program translation.
     - Corrected the counting of menu entries in verbose output.
       Closes: #280081. Thanks Andrew Burton.
@@ -677,7 +712,7 @@ menu (2.1.21) unstable; urgency=low
 menu (2.1.20) unstable; urgency=low
 
   * The "deer Rudolf" release
-  * Call getpwuid() once and cache the value. This avoid stressing 
+  * Call getpwuid() once and cache the value. This avoid stressing
     needlessly NIS. Thanks to Steven R. Evatt.
   * Extend the documentation of onlyrunasuser.
 
@@ -703,17 +738,17 @@ menu (2.1.19) unstable; urgency=low
 
 menu (2.1.18) unstable; urgency=low
 
-  * The "Sarge is still warm" release 
+  * The "Sarge is still warm" release
   * Update Japanese menu message translation. Thanks Goto Masanori.
   * Update Finnish menu message translation. Thanks Tommi Vainikainen.
   * Update Brazillian menu message translation. Thanks André Luís Lopes.
-  * Update Dutch menu message translation. Thanks Tim Dijkstra. 
+  * Update Dutch menu message translation. Thanks Tim Dijkstra.
     Closes: #274355.
   * Update Norwegian Nynorsk menu message translation. Thanks Håvard Korsvoll.
   * Add file README.translations to document the way menu sections are
     translated.
-  * Document it is possible to add entries for menu sections. 
-  * Morten Brix Pedersen: 
+  * Document it is possible to add entries for menu sections.
+  * Morten Brix Pedersen:
     - Allow character classes in regular expressions. This fix the parsing
       of translate_menus. Closes: #271659. Thanks, Paul Seelig.
     - Only use letters and digits as possible shortcut keys. Closes: #259349
@@ -724,7 +759,7 @@ menu (2.1.17) unstable; urgency=medium
 
   * The "yellow pig" release
   * urgency medium: i18n-only release.
-  * Add Lithuanian menu section translation, by Kęstutis Biliūnas. 
+  * Add Lithuanian menu section translation, by Kęstutis Biliūnas.
     Closes: #266134
   * Add Croatian menu section translation by Krunoslav Gernhard.
     Closes: #268054
@@ -743,18 +778,18 @@ menu (2.1.16) unstable; urgency=low
     relative path. Closes: #252637, #252891.
     - Revert change in 2.1.15: Don't let outputencoding default to LOCALE by
     default. This was causing too many problems. Closes: #258865.
-  * Update Polish menu message translation, thanks Marcin Owsiany. 
+  * Update Polish menu message translation, thanks Marcin Owsiany.
   * Add Italian menu message translation, by Stefano Canepa.
 
  -- Bill Allombert <ballombe@debian.org>  Sat,  7 Aug 2004 11:25:22 +0200
 
 menu (2.1.15) unstable; urgency=low
 
-  * The "spring clean up" release 
+  * The "spring clean up" release
   * Jens Arvidsson:
     - Update Swedish translation.
   * Update Italian menu-section translation. Thanks Stefano Canepa.
-  * Fix German menu-section translation. Closes: #254416. 
+  * Fix German menu-section translation. Closes: #254416.
     Thanks Eduard Bloch and Sebastian Rittau.
   * Update French translation of update-menus manpage. Closes: #256992.
     Thanks Sylvain Cherrier.
@@ -808,7 +843,7 @@ menu (2.1.13) unstable; urgency=low
   * Move wm-menu-config manpage to section 8 and insist it is deprecated.
   * Fix cppesc() to work correctly under non C locales.
   * Fix su-to-root to not change $HOME. This make sure xlib can find
-    the X session cookie. Thanks to isaac on IRC for testing the patch. 
+    the X session cookie. Thanks to isaac on IRC for testing the patch.
     Closes: #246886. This adresses the last case of #150314.
   * Add Ukrainian menu sections translation by Eugeniy Meshcheryakov.
     Closes: #244067.
@@ -822,15 +857,15 @@ menu (2.1.12) unstable; urgency=low
 
   * The "quickfix" release.
   * Jens Arvidsson:
-    - Updated Swedish menu messages translation. 
+    - Updated Swedish menu messages translation.
   * Morten Brix Pedersen:
     - Fix bug where section="/" failed when translations were enabled.
       Closes: #243531.
-    - Prevent infinite recursion in replace($s,$replace,$with) when $with 
+    - Prevent infinite recursion in replace($s,$replace,$with) when $with
       match $replace.
   * Fix typo in Chinese menu sections translation.  Closes: #242742. Thanks
     Carlos Z.F. Liu.
-  * Add Turkish translations of menu messages and menu sections. 
+  * Add Turkish translations of menu messages and menu sections.
     Closes: #243690. Thanks Cagatay Tengiz and Recai Oktas.
   * Update Catalan menu sections translation. Thanks Jordi Mallach.
   * Rename --menufiledir to --menufilesdir as documented. Update translations
@@ -841,12 +876,12 @@ menu (2.1.12) unstable; urgency=low
 
 menu (2.1.11) unstable; urgency=low
 
-  * The "Go bravely with Joey" release. 
+  * The "Go bravely with Joey" release.
   * Morten Brix Pedersen:
     - Only enable translated section names when both 'outputencoding' and
       'repeat_lang' has been set.
     - Set repeat_lang="LOCALE" per default. menu-methods now only need to set
-      outputencoding in order to enable translations. 
+      outputencoding in order to enable translations.
     - Update Danish menu translation.
     - Fixed some inconsistent behaviour with "substitute section->section"
       Closes: #216851. Thanks Jean-Philippe Guérard.
@@ -856,22 +891,22 @@ menu (2.1.11) unstable; urgency=low
       Closes: #166844. Thanks Jason Hildebrand.
     + Handle usage by root more sanely.
     + update manpage.
-  * debian/control: 
+  * debian/control:
     + Suggest gksu|kdebase-bin. Install one of those if su-to-root cannot
       access the X server. Closes: #150314. Thanks Raoul Borenius.
-  * Update Brazillian menu messages translation. Thanks André Luís Lopes. 
-  * Add Norwegian nynorsk menu messages and sections translations. 
+  * Update Brazillian menu messages translation. Thanks André Luís Lopes.
+  * Add Norwegian nynorsk menu messages and sections translations.
     Thanks Håvard Korsvoll.
   * Add Swedish menu messages and sections translation. Thanks Jens Arvidsson.
   * Update Spanish menu sections translation and add Spanish menu messages
     translation. Thanks Javier Fernandez-Sanguino Peña.
   * Update Japanese menu sections translation and add Japanese menu messages
     translation. Thanks Goto Masanori.
-  * Update Dutch menu messages translation. Closes: #239324. 
+  * Update Dutch menu messages translation. Closes: #239324.
     Thanks Tim Dijkstra.
   * Add French menu messages translation. Thanks Jean-Luc Coulon.
   * Jens Arvidsson:
-    - Add Swedish menu messages and sections translation. 
+    - Add Swedish menu messages and sections translation.
 
  -- Bill Allombert <ballombe@debian.org>  Tue,  6 Apr 2004 00:38:55 +0200
 
@@ -900,18 +935,18 @@ menu (2.1.10-1) unstable; urgency=low
 
 menu (2.1.9-5) unstable; urgency=low
 
-  * The "calc inflates severity" release. 
+  * The "calc inflates severity" release.
   * Add Polish menu message translation and update Polish menu section
     translation. Thanks Marcin Owsiany.
   * Update French menu section translation. Closes: #225716. Thanks
     Jean-Philippe Guérard.
   * Fix typos in error messages. Closes: #227070. Thanks Tommi Vainikainen.
   * Add Finnish translations. Closes: #227038. Thanks Tommi Vainikainen.
-  * Add Brazillian menu message translation. Closes: #227627. Thanks Gustavo 
-    Noronha Silva. 
+  * Add Brazillian menu message translation. Closes: #227627. Thanks Gustavo
+    Noronha Silva.
   * Add GPL boiler-plate to all C++ source files.
   * Add Dutch menu message translation. Closes: #228221. Thanks Tim Dijkstra.
-  * Remove documentation of non-existent function process_menudirs.  
+  * Remove documentation of non-existent function process_menudirs.
     Closes: #228448. Thanks Chris Cheney.
   * Fix userprefix() and rootprefix() functions. Closes: #228628. Thanks Chris
     Cheney.
@@ -924,7 +959,7 @@ menu (2.1.9-5) unstable; urgency=low
 
 menu (2.1.9-4) unstable; urgency=low
 
-  * The "Happy New Year" release. 
+  * The "Happy New Year" release.
   * Add Polish menu message translation and update menu section translation.
     Thanks Marcin Owsiany.
   * Add Dutch menu section translation. Closes: #224292. Thanks Tim Dijkstra.
@@ -936,7 +971,7 @@ menu (2.1.9-4) unstable; urgency=low
 
 menu (2.1.9-3) unstable; urgency=low
 
-  * The "i18n" release. 
+  * The "i18n" release.
   * Improved messages.
   * Menu will skip menu-method with no userprefix (resp. rootprefix) if run
     as user (resp. root). Closes: #81493.
@@ -948,7 +983,7 @@ menu (2.1.9-3) unstable; urgency=low
     + deprecate onlyrunasroot and onlyrunasuser.
     + deprecate wm-menu-config.
     + document proper postinst/postrm scripts.
-  * Add unofficial but frequently used sections to po-sections. 
+  * Add unofficial but frequently used sections to po-sections.
   * Update french translation of menu sections. Closes: #200738. Thanks
     Jean-Philippe Guérard. I forgot it in the previous release.
   * Fix unicodification of this file.
@@ -957,7 +992,7 @@ menu (2.1.9-3) unstable; urgency=low
 
 menu (2.1.9-2) unstable; urgency=low
 
-  * The "long awaited" release. 
+  * The "long awaited" release.
   * Add Catalan translation of menu sections. Thanks Jordi Mallach.
   * Add Japanese translation of menu sections. Thanks GOTO Masanori.
   * Morten Brix Pedersen:
@@ -985,13 +1020,13 @@ menu (2.1.9-2) unstable; urgency=low
 
 menu (2.1.9-1) unstable; urgency=low
 
-  * The "And no, I'm not accepting job offers" release. 
+  * The "And no, I'm not accepting job offers" release.
   * Change contact address to `menu@packages.debian.org'.
   * doc/menufile.5: Update list of menu sections.
   * default/bash: removed. Thanks Matthias Klose.
   * debian/rules: do not create empty dir /usr/share/pixmaps.
     Closes: #196713. Thanks Ryan Murray.
-  * doc/menu.sgml: 
+  * doc/menu.sgml:
     + Fix capitalisation of `Debian'.
     + Improve section `How a user can override the menus'.
     + Move 'Variables and functions' to a new chapter and format it properly.
@@ -1006,7 +1041,7 @@ menu (2.1.9-1) unstable; urgency=low
 
 menu (2.1.8-2) unstable; urgency=low
 
-  * The "Thanks Joost, for the great Debian menu system" release.  
+  * The "Thanks Joost, for the great Debian menu system" release.
   * Set myself as maintainer since Joost has officially retired.
   * Add menu-one-file to doc, for building alioth doc.
   * Add Italian translation of menu sections. Thanks Stefano Canepa.
@@ -1027,7 +1062,7 @@ menu (2.1.8-2) unstable; urgency=low
 
 menu (2.1.8-1) unstable; urgency=low
 
-  * Put in CVS at alioth.debian.org 
+  * Put in CVS at alioth.debian.org
   * Hard code version in configure.in so that menu can be build without
     the debian directory.
   * Complete french translation of menu sections. Thanks Jean-Philippe
@@ -1054,7 +1089,7 @@ menu (2.1.8-1) unstable; urgency=low
 
 menu (2.1.7-3) unstable; urgency=low
 
-  * Fix es.trme translation. Closes: #144043.  
+  * Fix es.trme translation. Closes: #144043.
   * Apply patch from Morten Brix Pedersen to document how to put
     entries in the root menu. Closes: #41132
   * Document that !include menu.h is required in menu-method.
@@ -1096,14 +1131,14 @@ menu (2.1.7-2) unstable; urgency=low
   * Update Joey email address in menu.sgml.
   * Apply patch from Dagfinn Ilmari Mannsaker <ilmari@ping.uio.no>
     that make doc/Makefile.am more automake compliant. Closes: #182771
-  * Build-Depends on debiandoc-sgml (>= 1.1.74) to work around a bug in 
+  * Build-Depends on debiandoc-sgml (>= 1.1.74) to work around a bug in
     previous versions. Thanks Dagfinn Ilmari Mannsaker. Closes: #182778
   * Apply patch from Morten Brix Pedersen to get the list of installed
-    packages instead of the list of selected packages. 
+    packages instead of the list of selected packages.
     Closes: #62086, #166298, #182684
   * Add french translation of menu section (by myself).
   * Fix missing charset/encoding in other po files.
-  
+
  -- Bill Allombert <ballombe@debian.org>  Thu,  6 Mar 2003 18:02:41 +0100
 
 menu (2.1.7-1) unstable; urgency=low
@@ -1147,7 +1182,7 @@ menu (2.1.6-2) unstable; urgency=low
   * Better error message for autogen.sh. Closes: #178927
   * 'make install' now install install-menu in /usr/sbin. Closes: #178924
   * Remove obsolete menu-method directory
-  * Remove broken l10n support( intl and po directories.) 
+  * Remove broken l10n support( intl and po directories.)
     This should be redone properly.
   * Convert doc/Makefile to automake and fix it.
   * Now make install/uninstall should work even as non root.
@@ -1157,9 +1192,9 @@ menu (2.1.6-2) unstable; urgency=low
     /etc/passwd instead. Falls back to the HOME variable if this fails.
    - Removed gcc-2.7.2.1 work arounds.
    - 0 used instead of NULL (more correct in C++)
-   - map<String, String, less<String> > changed to map<String, String> - 
+   - map<String, String, less<String> > changed to map<String, String> -
    since less is the default sort anyway.
-   - changed some C header types to use the C++ equal one. e.g. cstdlib 
+   - changed some C header types to use the C++ equal one. e.g. cstdlib
    instead of stdlib.h
    - use empty() instead of checking on size() or length()
    - at some places, avoid calling new, just allocate object on the stack
@@ -1230,12 +1265,12 @@ menu (2.1.5-12) unstable; urgency=low
   * Add gettext to Build-Depends. Closes: #159629. Thanks, James Troup.
   * Change references to /usr/X11R6/include/X11/{bitmaps,pixmaps}
     to /usr/share/pixmaps. Closes: #102310. Thanks Henrique de Moraes Holschuh
-  * fix may->many typo in doc/README.package-menus. 
+  * fix may->many typo in doc/README.package-menus.
     Closes: #151979. Thanks Frederico Grau.
   * Acknowledge previous NMUs:
     Thanks Joey Hess (Closes: #84936, #127921)
     Thanks Julian Gilbey (Closes: #55603)
-  * Closes: #44714, #86260, #103059 which are `fixed' for ages. 
+  * Closes: #44714, #86260, #103059 which are `fixed' for ages.
     Thanks go to Colin Watson for spotting them.
 
  -- Bill Allombert <ballombe@debian.org>  Thu,  5 Sep 2002 11:09:07 +0200
@@ -1244,14 +1279,14 @@ menu (2.1.5-11) unstable; urgency=low
 
   * Add myself to Uploaders field.
   * Add Build-Depends. Closes: #95341,#95151
-  * Remove dangerous use of automake in debian/rules. 
+  * Remove dangerous use of automake in debian/rules.
     Closes: #133159 Thanks, Guido Guenther.
   * Add AM_MAINTAINER_MODE to configure.in, add file autogen.sh
   * Remove unused/dangerous files ltconfig,ltmain.sh
   * Fix various typo (reported by), thanks :
   s/menu's/menu/ in description. Closes: #79475 (Jonathan D. Amery)
   s/frontents/frontends/ in description. Closes: #125128 (Matt Zimmerman)
-  s/quite/quiet/ in update-menus.1. 
+  s/quite/quiet/ in update-menus.1.
     Closes: #96886 (Malcolm Parsons,Edward Betts)
   s/it's/its/ in update-menus.1. Closes: #129881 (Ken Shan)
   s/generate the/generation of/ in install-menu.1.
@@ -1261,9 +1296,9 @@ menu (2.1.5-11) unstable; urgency=low
     (Stephen Stafford,Martin Quinson,André Dahlqvist)
   lots of typo in menu.sgml. Closes: #57832 (Christian T. Steigies)
   * Install and remove info file correctly in postinst/prerm.
-  * Rename menu info entry to "Debian menu". 
+  * Rename menu info entry to "Debian menu".
     Closes: #42333,#117236 Thanks David Coe, John Candlish.
-  * Add synopsis to su-to-root and its manpage. 
+  * Add synopsis to su-to-root and its manpage.
     Closes: #103039 Thanks, Galen Hancock.
   * Apply patch from Colin Watson to su-to-root. Closes: #103879
   * Policy compliant compiler options in debian/rules.
diff -pruN 2.1.47/debian/compat 2.1.49/debian/compat
--- 2.1.47/debian/compat	2014-05-31 22:28:01.000000000 +0000
+++ 2.1.49/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-5
diff -pruN 2.1.47/debian/control 2.1.49/debian/control
--- 2.1.47/debian/control	2014-06-04 13:19:53.000000000 +0000
+++ 2.1.49/debian/control	2021-12-12 22:48:17.000000000 +0000
@@ -2,13 +2,15 @@ Source: menu
 Section: admin
 Priority: optional
 Maintainer: Bill Allombert <ballombe@debian.org>
-Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 5), texinfo, debiandoc-sgml, gettext
+Standards-Version: 4.6.0
+Build-Depends: debhelper-compat (= 13), texinfo, debiandoc-sgml, gettext
+Vcs-Browser: https://salsa.debian.org/debian-menu-team/menu
+Vcs-Git: https://salsa.debian.org/debian-menu-team/menu.git
 
 Package: menu
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: menu-l10n, gksu|kde-runtime|ktsuss
+Suggests: menu-l10n, gksu|kde-cli-tools|ktsuss
 Multi-Arch: foreign
 Description: generates programs menu for all menu-aware applications
  Debian menu keeps transparently the menus in the different
diff -pruN 2.1.47/debian/copyright 2.1.49/debian/copyright
--- 2.1.47/debian/copyright	2014-05-31 22:28:01.000000000 +0000
+++ 2.1.49/debian/copyright	2020-09-27 21:00:02.000000000 +0000
@@ -5,14 +5,14 @@ The Debian menu system is now maintained
 Pedersen.
 
 The original source can always be found at:
-	ftp://ftp.debian.org/dists/unstable/main/source/
+	http://ftp.debian.org/debian/pool/main/m/menu/
 
 This software is developed at: 
-        http://alioth.debian.org/projects/menu
+        https://salsa.debian.org/debian-menu-team/menu
 
 Copyright (C) 1996-2003  Joost Witteveen, 
 Modifications:
-Copyright (C) 2002-2005  Bill Allombert and Morten Brix Pedersen.
+Copyright (C) 2002-2020  Bill Allombert and Morten Brix Pedersen.
 
   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
diff -pruN 2.1.47/debian/rules 2.1.49/debian/rules
--- 2.1.47/debian/rules	2014-06-13 19:15:35.000000000 +0000
+++ 2.1.49/debian/rules	2021-12-13 21:08:59.000000000 +0000
@@ -8,6 +8,11 @@
 
 arch    := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+DEB_HOST_GNU_CPU    ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 CXXFLAGS = -g -Wall
 CFLAGS = -g -Wall
 LDFLAGS = -Wl,-z,relro
@@ -20,10 +25,14 @@ CXXFLAGS += -O2
 CFLAGS += -O2
 endif
 
-build: build-stamp
+build-indep:
+build-arch: build-stamp
+build: build-indep build-arch
 build-stamp:
 	dh_testdir
-	./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man
+	./configure --host=$(DEB_HOST_GNU_TYPE) --target=$(DEB_HOST_GNU_TYPE) \
+                    --build=$(DEB_BUILD_GNU_TYPE) \
+                    --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man
 	$(MAKE) CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" "LDFLAGS=$(LDFLAGS)"
 	touch build-stamp
 
@@ -48,7 +57,7 @@ install-stamp: build-stamp
 		   usr/share/menu \
 		   usr/share/man/man1 \
 		   usr/share/bug/menu
-		   
+
 
 	# Add here commands to install the package into debian/menu.
 	$(MAKE) install DESTDIR=`pwd`/debian/menu/
@@ -75,14 +84,15 @@ install-stamp: build-stamp
 	touch install-stamp
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-indep install
 # We have nothing to do here, no architecture independant packages here.
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
+	dh_installexamples
 	dh_installman doc/update-menus.fr.1 doc/su-to-root.fr.1 \
 	              doc/menufile.fr.5
 	dh_installinfo doc/menu.info.gz
@@ -103,4 +113,4 @@ binary-arch: build install
 
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build build-indep build-arch clean binary-indep binary-arch binary
diff -pruN 2.1.47/debian/source/format 2.1.49/debian/source/format
--- 2.1.47/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.49/debian/source/format	2020-09-27 21:00:02.000000000 +0000
@@ -0,0 +1 @@
+3.0 (native)
diff -pruN 2.1.47/doc/menu.direntry 2.1.49/doc/menu.direntry
--- 2.1.47/doc/menu.direntry	2014-05-31 22:28:01.000000000 +0000
+++ 2.1.49/doc/menu.direntry	2021-11-20 11:27:48.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-sedscript=`tempfile`
+sedscript=`mktemp`
 cat <<'EOF' > $sedscript
 /@c %\*\*add dircategory and direntry here/a\
 @dircategory Information\
diff -pruN 2.1.47/doc/menu.html/ch1.html 2.1.49/doc/menu.html/ch1.html
--- 2.1.47/doc/menu.html/ch1.html	2014-06-04 12:05:22.000000000 +0000
+++ 2.1.49/doc/menu.html/ch1.html	2015-05-31 20:08:33.000000000 +0000
@@ -191,7 +191,7 @@ Debian Menu System
 </p>
 
 <address>
-version 1.4, 4 June 2014<br>
+version 1.4, 31 May 2015<br>
 <br>
 Joost Witteveen <code><a href="mailto:joostje@debian.org">mailto:joostje@debian.org</a></code><br>
 Joey Hess <code><a href="mailto:joeyh@debian.org">mailto:joeyh@debian.org</a></code><br>
diff -pruN 2.1.47/doc/menu.html/ch2.html 2.1.49/doc/menu.html/ch2.html
--- 2.1.47/doc/menu.html/ch2.html	2014-06-04 12:05:22.000000000 +0000
+++ 2.1.49/doc/menu.html/ch2.html	2015-05-31 20:08:33.000000000 +0000
@@ -176,7 +176,7 @@ Debian Menu System
 </p>
 
 <address>
-version 1.4, 4 June 2014<br>
+version 1.4, 31 May 2015<br>
 <br>
 Joost Witteveen <code><a href="mailto:joostje@debian.org">mailto:joostje@debian.org</a></code><br>
 Joey Hess <code><a href="mailto:joeyh@debian.org">mailto:joeyh@debian.org</a></code><br>
diff -pruN 2.1.47/doc/menu.html/ch3.html 2.1.49/doc/menu.html/ch3.html
--- 2.1.47/doc/menu.html/ch3.html	2014-06-04 12:05:22.000000000 +0000
+++ 2.1.49/doc/menu.html/ch3.html	2015-05-31 20:08:33.000000000 +0000
@@ -1233,7 +1233,7 @@ Debian Menu System
 </p>
 
 <address>
-version 1.4, 4 June 2014<br>
+version 1.4, 31 May 2015<br>
 <br>
 Joost Witteveen <code><a href="mailto:joostje@debian.org">mailto:joostje@debian.org</a></code><br>
 Joey Hess <code><a href="mailto:joeyh@debian.org">mailto:joeyh@debian.org</a></code><br>
diff -pruN 2.1.47/doc/menu.html/ch4.html 2.1.49/doc/menu.html/ch4.html
--- 2.1.47/doc/menu.html/ch4.html	2014-06-04 12:05:22.000000000 +0000
+++ 2.1.49/doc/menu.html/ch4.html	2015-05-31 20:08:33.000000000 +0000
@@ -129,7 +129,7 @@ Debian Menu System
 </p>
 
 <address>
-version 1.4, 4 June 2014<br>
+version 1.4, 31 May 2015<br>
 <br>
 Joost Witteveen <code><a href="mailto:joostje@debian.org">mailto:joostje@debian.org</a></code><br>
 Joey Hess <code><a href="mailto:joeyh@debian.org">mailto:joeyh@debian.org</a></code><br>
diff -pruN 2.1.47/doc/menu.html/ch5.html 2.1.49/doc/menu.html/ch5.html
--- 2.1.47/doc/menu.html/ch5.html	2014-06-04 12:05:22.000000000 +0000
+++ 2.1.49/doc/menu.html/ch5.html	2015-05-31 20:08:33.000000000 +0000
@@ -210,7 +210,7 @@ Debian Menu System
 </p>
 
 <address>
-version 1.4, 4 June 2014<br>
+version 1.4, 31 May 2015<br>
 <br>
 Joost Witteveen <code><a href="mailto:joostje@debian.org">mailto:joostje@debian.org</a></code><br>
 Joey Hess <code><a href="mailto:joeyh@debian.org">mailto:joeyh@debian.org</a></code><br>
diff -pruN 2.1.47/doc/menu.html/ch6.html 2.1.49/doc/menu.html/ch6.html
--- 2.1.47/doc/menu.html/ch6.html	2014-06-04 12:05:22.000000000 +0000
+++ 2.1.49/doc/menu.html/ch6.html	2015-05-31 20:08:33.000000000 +0000
@@ -208,7 +208,7 @@ Debian Menu System
 </p>
 
 <address>
-version 1.4, 4 June 2014<br>
+version 1.4, 31 May 2015<br>
 <br>
 Joost Witteveen <code><a href="mailto:joostje@debian.org">mailto:joostje@debian.org</a></code><br>
 Joey Hess <code><a href="mailto:joeyh@debian.org">mailto:joeyh@debian.org</a></code><br>
diff -pruN 2.1.47/doc/menu.html/ch7.html 2.1.49/doc/menu.html/ch7.html
--- 2.1.47/doc/menu.html/ch7.html	2014-06-04 12:05:22.000000000 +0000
+++ 2.1.49/doc/menu.html/ch7.html	2015-05-31 20:08:33.000000000 +0000
@@ -805,7 +805,7 @@ Debian Menu System
 </p>
 
 <address>
-version 1.4, 4 June 2014<br>
+version 1.4, 31 May 2015<br>
 <br>
 Joost Witteveen <code><a href="mailto:joostje@debian.org">mailto:joostje@debian.org</a></code><br>
 Joey Hess <code><a href="mailto:joeyh@debian.org">mailto:joeyh@debian.org</a></code><br>
diff -pruN 2.1.47/doc/menu.html/ch8.html 2.1.49/doc/menu.html/ch8.html
--- 2.1.47/doc/menu.html/ch8.html	2014-06-04 12:05:22.000000000 +0000
+++ 2.1.49/doc/menu.html/ch8.html	2015-05-31 20:08:33.000000000 +0000
@@ -649,7 +649,7 @@ Debian Menu System
 </p>
 
 <address>
-version 1.4, 4 June 2014<br>
+version 1.4, 31 May 2015<br>
 <br>
 Joost Witteveen <code><a href="mailto:joostje@debian.org">mailto:joostje@debian.org</a></code><br>
 Joey Hess <code><a href="mailto:joeyh@debian.org">mailto:joeyh@debian.org</a></code><br>
diff -pruN 2.1.47/doc/menu.html/index.html 2.1.49/doc/menu.html/index.html
--- 2.1.47/doc/menu.html/index.html	2014-06-04 12:05:22.000000000 +0000
+++ 2.1.49/doc/menu.html/index.html	2015-05-31 20:08:33.000000000 +0000
@@ -192,7 +192,7 @@ Debian Menu System
 </p>
 
 <address>
-version 1.4, 4 June 2014<br>
+version 1.4, 31 May 2015<br>
 <br>
 Joost Witteveen <code><a href="mailto:joostje@debian.org">mailto:joostje@debian.org</a></code><br>
 Joey Hess <code><a href="mailto:joeyh@debian.org">mailto:joeyh@debian.org</a></code><br>
Binary files 2.1.47/doc/menu.info.gz and 2.1.49/doc/menu.info.gz differ
Binary files 2.1.47/doc/menu.txt.gz and 2.1.49/doc/menu.txt.gz differ
diff -pruN 2.1.47/doc/su-to-root.1 2.1.49/doc/su-to-root.1
--- 2.1.47/doc/su-to-root.1	2014-05-31 22:28:01.000000000 +0000
+++ 2.1.49/doc/su-to-root.1	2021-11-27 19:24:07.000000000 +0000
@@ -24,13 +24,14 @@ This is to be used with menu entries tha
 .IP SU_TO_ROOT_X
 Select the su-like program called by \fIsu\-to\-root \-X\fP.
 Supported values are \fIgksu\fP, \fIkdesu\fP, \fIkde4su\fP, \fIktsuss\fP,
- \fIsux\fP, \fIgksudo\fP and \fIkdesudo\fP.
+ \fIsux\fP, \fIsudo-askpass\fP, \fIgksudo\fP and \fIkdesudo\fP.
 \fIkde4su\fP denotes the KDE4 version of \fBkdesu\fP.
+\fIsudo-askpass\fP require \fBssh-askpass\fP to be installed.
 .IP
 When this variable is not set \fBsu\-to\-root\fP will currently try to use
 \fIgksu\fP, \fIkdesu\fP, \fIkde4su\fP, \fIktsuss\fP, \fIsux\fP and the built-in
 code, in that order with the exception that under a KDE session, \fIkdesu\fP
-and \fIkde4su\fP are prefered over \fIgksu\fP.
+and \fIkde4su\fP are preferred over \fIgksu\fP.
 .IP
 The exact set of programs to try and their order is subject to change without
 notice.
diff -pruN 2.1.47/install-menu/install-menu.cc 2.1.49/install-menu/install-menu.cc
--- 2.1.47/install-menu/install-menu.cc	2014-05-31 22:28:01.000000000 +0000
+++ 2.1.49/install-menu/install-menu.cc	2020-09-28 06:31:54.000000000 +0000
@@ -302,7 +302,7 @@ cat_str::cat_str(parsestream &i)
 	throw char_unexpected(&i, buf);
       }
     }
-  } catch(endofline p) { }
+  } catch(const endofline &p) { }
 }
 
 var_str::var_str(parsestream &i)
@@ -453,7 +453,7 @@ supportedinfo::supportedinfo(parsestream
       supported[name] = info;
       i.skip_line();   //read away the final newline
     }
-    catch (endofline d) { }
+    catch (const endofline &d) { }
   }
 }
 
@@ -509,7 +509,7 @@ void read_forcetree(parsestream &i)
       root_menu.add_entry_ptr(sections, entry);
       i.skip_line();
     }
-    catch(endofline d) { }
+    catch(const endofline &d) { }
   }
 
 }
@@ -649,7 +649,7 @@ methodinfo::methodinfo(parsestream &i)
 
       i.skip_line(); //read away final newline
     }
-  } catch (endoffile) { }
+  } catch (const endoffile &) { }
 
   if (outputenc == "LOCALE")
       outputenc = nl_langinfo(CODESET);
@@ -757,7 +757,7 @@ map<string, string> read_vars(parsestrea
       m[name] = val;
     } 
   }
-  catch (endofline p) { }
+  catch (const endofline &p) { }
   return m;
 }
 
@@ -801,7 +801,7 @@ void read_input(parsestream &i)
       i.skip_line();  // read away the final newline
     }
   }
-  catch(endoffile p) { }
+  catch(const endoffile &p) { }
 }
 
 
diff -pruN 2.1.47/po-su-to-root/ro.po 2.1.49/po-su-to-root/ro.po
--- 2.1.47/po-su-to-root/ro.po	2014-05-31 22:28:01.000000000 +0000
+++ 2.1.49/po-su-to-root/ro.po	2020-09-29 15:39:07.000000000 +0000
@@ -2,19 +2,22 @@
 # This file is distributed under the same license as the menu package.
 #
 # Bill Allombert <ballombe@debian.org>, 2007.
-# stan ioan-eugen <stan.ieugen@gmail.com>, 2008.
+# stan ioan-eugen <stan.ieugen AT gmail DOT com>, 2008.
+# Cristian Secară <cristi AT secarica DOT ro>, 2019.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: su-to-root\n"
 "Report-Msgid-Bugs-To: menu@packages.debian.org\n"
 "POT-Creation-Date: 2007-06-05 21:25+0200\n"
-"PO-Revision-Date: 2008-02-14 23:39+0200\n"
-"Last-Translator: stan ioan-eugen <stan.ieugen@gmail.com>\n"
+"PO-Revision-Date: 2019-07-03 22:21+0200\n"
+"Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: romanian <debian-l10n-romanian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Poedit 1.6.11\n"
+"Language: ro\n"
 
 #: ../scripts/su-to-root:31
 msgid ""
@@ -30,11 +33,11 @@ msgstr ""
 
 #: ../scripts/su-to-root:62
 msgid "About to execute %s.\\n"
-msgstr "Se pregătește rularea %s.\\n"
+msgstr "Se pregătește executarea %s.\\n"
 
 #: ../scripts/su-to-root:63
 msgid "This command needs %s privileges to be executed.\\n"
-msgstr "Această comandă necestită privilegii %s pentru a fi executată.\\n"
+msgstr "Această comandă necesită privilegii de %s pentru a fi executată.\\n"
 
 #: ../scripts/su-to-root:72
 msgid "Using %s...\\n"
@@ -42,8 +45,8 @@ msgstr "Se utilizează %s...\\n"
 
 #: ../scripts/su-to-root:73
 msgid "Enter %s password at prompt.\\n"
-msgstr "Introduceți parola %s la prompter.\\n"
+msgstr "Introduceți parola pentru %s.\\n"
 
 #: ../scripts/su-to-root:76
 msgid "Incorrect password or command failed. Try again? (y/N)"
-msgstr "Parolă incorectă sau comanda a eșuat. Mai încercați o dată? (d/N)"
+msgstr "Parola este incorectă sau comanda a eșuat. Încercați din nou? (d/N)"
diff -pruN 2.1.47/scripts/su-to-root 2.1.49/scripts/su-to-root
--- 2.1.47/scripts/su-to-root	2014-05-31 22:36:53.000000000 +0000
+++ 2.1.49/scripts/su-to-root	2021-11-20 11:29:18.000000000 +0000
@@ -12,12 +12,12 @@ PRIV=root
 COMMAND=
 NEEDS=text
 
-gettext=$(which gettext 2>/dev/null)
+gettext=$(command -v gettext 2>/dev/null)
 
 transl() {
   txt="$1";
   shift;
-  if [ -n "$gettext" ]; then 
+  if [ -n "$gettext" ]; then
     txt="$(gettext su-to-root "$txt")";
   fi
   printf "$txt" "$@"
@@ -41,7 +41,7 @@ for i in "$@"; do
        PRIV="$i";;
      -c)
        COMMAND="$i";;
-     -X) 
+     -X)
        NEEDS="X11";;
    esac
    prev="$i"
@@ -81,22 +81,22 @@ else
     done;;
   X11)
     if test -z "$SU_TO_ROOT_X"; then
-      if which gksu >/dev/null 2>&1 ; then
+      if command -v gksu >/dev/null 2>&1 ; then
         SU_TO_ROOT_X=gksu
         if test "X$KDE_FULL_SESSION" = "Xtrue" ; then
-          if which kdesu >/dev/null 2>&1 ; then
+          if command -v kdesu >/dev/null 2>&1 ; then
             SU_TO_ROOT_X=kdesu
           elif test -x /usr/lib/kde4/libexec/kdesu ; then
             SU_TO_ROOT_X=kde4su
           fi;
         fi;
-      elif which kdesu >/dev/null 2>&1 ; then 
+      elif command -v kdesu >/dev/null 2>&1 ; then
         SU_TO_ROOT_X=kdesu
       elif test -x /usr/lib/kde4/libexec/kdesu ; then
         SU_TO_ROOT_X=kde4su
-      elif which ktsuss >/dev/null 2>&1 ; then
+      elif command -v ktsuss >/dev/null 2>&1 ; then
         SU_TO_ROOT_X=ktsuss
-      elif which sux >/dev/null 2>&1 ; then 
+      elif command -v sux >/dev/null 2>&1 ; then
         SU_TO_ROOT_X=sux
       else
         SU_TO_ROOT_X=su-to-root
@@ -111,6 +111,8 @@ else
       ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
       sux) env SU_TO_ROOT_SU=sux \
         x-terminal-emulator -e su-to-root -p "$PRIV" -c "$COMMAND";;
+      sudo-askpass) env SUDO_ASKPASS=/usr/bin/ssh-askpass \
+        sudo -u "$PRIV" --askpass sh -c "$COMMAND";;
   # As a last resort, open a new x-terminal-emulator and prompt for the password
   # Do not use -X here!
       *) x-terminal-emulator -e su-to-root -p "$PRIV" -c "$COMMAND";;
diff -pruN 2.1.47/update-menus/parsestream.cc 2.1.49/update-menus/parsestream.cc
--- 2.1.47/update-menus/parsestream.cc	2014-05-31 22:28:01.000000000 +0000
+++ 2.1.49/update-menus/parsestream.cc	2020-09-28 06:31:54.000000000 +0000
@@ -152,7 +152,7 @@ void parsestream::init(std::istream *in,
   filenames.push_back(name);
   try {
     new_line();
-  } catch (endoffile) { }
+  } catch (const endoffile &) { }
 }
 
 void parsestream::close_file()
@@ -185,7 +185,7 @@ void parsestream::new_line()
       set_linenumber(linenumber()+1);
       try {
         preprocess(buffer);
-      } catch (unknown_compat p) { p.report(); }
+      } catch (unknown_compat &p) { p.report(); }
       buffer = rmtrailingspace(buffer);
     }
     while (current_istr()->good() &&
@@ -258,7 +258,7 @@ string parsestream::get_line()
   buffer.erase();
   try {
     skip_line();
-  } catch (endoffile) { }
+  } catch (const endoffile &) { }
   return s;
 }
 
@@ -273,7 +273,7 @@ string parsestream::get_name()
       s+=c;
     if(c)
       put_back(c);
-  } catch (endofline d) { }
+  } catch (const endofline &d) { }
   return s;
 }
 
@@ -293,7 +293,7 @@ string parsestream::get_name(const Regex
     }
     if (c)
       put_back(c);
-  } catch (endofline) { }
+  } catch (const endofline &) { }
   return s;
 }
 
@@ -328,7 +328,7 @@ string parsestream::get_stringconst()
       while ((c = get_char()) && !isspace(c))
           s += c;
     }
-  } catch (endofline p) { }
+  } catch (const endofline &p) { }
 
   return s;
 }
@@ -372,7 +372,7 @@ int parsestream::get_integer()
     skip_space();
     while((c=get_char())&&((isdigit(c)||(c=='-'))))
       s += c;
-  } catch (endofline d) { }
+  } catch (const endofline &d) { }
 
   return atoi(s.c_str());
 }
@@ -396,7 +396,7 @@ double parsestream::get_double()
     while ((c=get_char()) &&
         (isdigit(c) || (c=='.')||(c=='E')||(c=='e')||(c=='+')||(c=='-')))
       s += c;
-  } catch (endofline d) { }
+  } catch (const endofline &d) { }
 
   return atof(s.c_str());
 }
@@ -416,7 +416,7 @@ void parsestream::skip_line()
   buffer.erase();
   try {
     new_line();
-  } catch (endoffile d) { }
+  } catch (const endoffile &d) { }
 }
 
 void parsestream::skip_space()
diff -pruN 2.1.47/update-menus/update-menus.cc 2.1.49/update-menus/update-menus.cc
--- 2.1.47/update-menus/update-menus.cc	2014-06-03 18:56:53.000000000 +0000
+++ 2.1.49/update-menus/update-menus.cc	2020-09-28 06:31:54.000000000 +0000
@@ -203,7 +203,7 @@ void menuentry::read_menuentry(parsestre
       i.put_back(c);
     } while(c);
   }
-  catch (endofline) { }
+  catch (const endofline &) { }
   i.skip_line();
 }
 
@@ -274,7 +274,7 @@ void configinfo::parse_config(const std:
       else if(facility=="authuser")   syslog_facility=LOG_USER;
       else if(facility=="authuucp")   syslog_facility=LOG_UUCP;
 
-           if(priority=="emerg")      syslog_priority=LOG_EMERG;
+      if     (priority=="emerg")      syslog_priority=LOG_EMERG;
       else if(priority=="alert")      syslog_priority=LOG_ALERT;
       else if(priority=="crit")       syslog_priority=LOG_CRIT;
       else if(priority=="err")        syslog_priority=LOG_ERR;
@@ -408,7 +408,7 @@ translateinfo::translateinfo(const std::
         i->skip_line();
       }
     }
-  } catch(endoffile p) { }
+  } catch(const endoffile &p) { }
   delete i;
 }
 
@@ -494,7 +494,7 @@ int read_menufile(const string &filename
 
       try {
         ps = new parsestream(*sstream);
-      } catch (endoffile d) {
+      } catch (const endoffile &d) {
         if (status || sstream->str().size())
           cerr << String::compose(_("Execution of %1 generated no output or returned an error.\n"), filename);
         throw endoffile(d);
@@ -502,7 +502,7 @@ int read_menufile(const string &filename
     } else {
       ps = new parsestream(filename);
     }
-  } catch (endoffile p) {
+  } catch (const endoffile &p) {
     delete sstream;
     return menuentries;
   }
@@ -530,10 +530,10 @@ int read_menufile(const string &filename
           linenr = ps->linenumber();
         }
       }
-      catch (cond_inst_false) { }
+      catch (const cond_inst_false &) { }
     }
   } 
-  catch (endoffile p) { }
+  catch (const endoffile &p) { }
   catch (missing_tag& exc) {
     std::cerr << exc.message() << std::endl;
     std::cerr << _("Skipping file because of errors...\n");
@@ -579,12 +579,12 @@ void read_menufilesdir(vector<string> &m
                 if ((!r) && (S_ISREG(st.st_mode)||S_ISLNK(st.st_mode)))
                     menuentries += read_menufile(name,entry->d_name, menudata);
               }
-              catch (endofline p) {
+              catch (const endofline &p) {
                 cerr << String::compose(_("Error reading %1.\n"), name);
               }
             }
       }
-    } catch (dir_error_read p) { }
+    } catch (const dir_error_read &p) { }
     total_menuentries += menuentries;
     config.report(String::compose(_("%1 menu entries found (%2 total)."), menuentries, total_menuentries), configinfo::report_verbose);
   }
@@ -944,7 +944,7 @@ void parse_params(int argc, char **argv)
       config.trigger = true;
       break;
     case 'V':
-      cout << "update-menus "VERSION << std::endl;
+      cout << "update-menus " VERSION << std::endl;
       exit(0);
     case 'h':
       usage(cout);
@@ -962,7 +962,7 @@ void read_userconfiginfo()
   if (!is_root) {
     try {
       config.read_file(string(home_dir)+"/"+USERCONFIG);
-    } catch(ferror_open d) { };
+    } catch(const ferror_open &d) { };
   }
 }
 
@@ -972,7 +972,7 @@ void read_rootconfiginfo()
   if(!transinfo){
     try {
       config.read_file(CONFIG_FILE);
-    } catch (ferror_open d){};
+    } catch (const ferror_open &d){};
   }
 }
 
@@ -982,7 +982,7 @@ void read_usertranslateinfo()
   if (!is_root) {
     try {
       transinfo = new translateinfo(string(home_dir)+"/"+USERTRANSLATE);
-    } catch(ferror_open d) { };
+    } catch(const ferror_open &d) { };
   }
 }
 
@@ -992,7 +992,7 @@ void read_roottranslateinfo()
   if (!transinfo) {
     try {
       transinfo = new translateinfo(TRANSLATE_FILE);
-    } catch (ferror_open d) { };
+    } catch (const ferror_open &d) { };
   }
 }
 
@@ -1021,7 +1021,7 @@ void run_methods(vector<string> &menudat
     try {
       run_menumethoddir(string(home_dir)+"/"+USERMETHODS, menudata);
     }
-    catch(dir_error_read d) {
+    catch(const dir_error_read &d) {
       run_menumethoddir(MENUMETHODS, menudata);
     }
   } else