Control: retitle -1 unblock: synaptic/0.84.6 Control: tags -1 - moreinfo X-Debbugs-CC: m...@debian.org
Michael Vogt(the synaptic maintainer) has merged my PR on github and
uploaded synaptic/0.84.6.
It has been built on all release architectures.
The full changelog is:
synaptic (0.84.6) unstable; urgency=medium
.
[ sajolida ]
* Give visual feedback while starting
.
[ Shengjing Zhu ]
* configure.in: Miss bumping version str to 0.84.5
* synaptic-pkexec: Do not use pkexec under Wayland; warn users instead
* gsynaptic: Show possible reason when failed to init gtk
.
[ Michael Vogt ]
* configure.in: Bump version to 0.84.6
In addition to my previous attached debdiff, there're two trivial new
lines in synaptic.desktop:
+StartupNotify=true
+StartupWMClass=synaptic
Full debdiff between 0.84.5 and 0.84.6 is:
diff -Nru synaptic-0.84.5/configure.in synaptic-0.84.6/configure.in
--- synaptic-0.84.5/configure.in 2018-11-08 15:50:31.000000000 +0800
+++ synaptic-0.84.6/configure.in 2019-04-15 15:39:32.000000000 +0800
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(synaptic, 0.84.5)
+AM_INIT_AUTOMAKE(synaptic, 0.84.6)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff -Nru synaptic-0.84.5/data/synaptic.desktop.in
synaptic-0.84.6/data/synaptic.desktop.in
--- synaptic-0.84.5/data/synaptic.desktop.in 2018-11-08 15:50:31.000000000
+0800
+++ synaptic-0.84.6/data/synaptic.desktop.in 2019-04-15 15:39:32.000000000
+0800
@@ -8,3 +8,5 @@
Type=Application
Categories=PackageManager;GTK;System;Settings;
X-Ubuntu-Gettext-Domain=synaptic
+StartupNotify=true
+StartupWMClass=synaptic
diff -Nru synaptic-0.84.5/debian/changelog synaptic-0.84.6/debian/changelog
--- synaptic-0.84.5/debian/changelog 2018-11-08 15:50:31.000000000 +0800
+++ synaptic-0.84.6/debian/changelog 2019-04-15 15:39:32.000000000 +0800
@@ -1,3 +1,18 @@
+synaptic (0.84.6) unstable; urgency=medium
+
+ [ sajolida ]
+ * Give visual feedback while starting
+
+ [ Shengjing Zhu ]
+ * configure.in: Miss bumping version str to 0.84.5
+ * synaptic-pkexec: Do not use pkexec under Wayland; warn users instead
+ * gsynaptic: Show possible reason when failed to init gtk
+
+ [ Michael Vogt ]
+ * configure.in: Bump version to 0.84.6
+
+ -- Michael Vogt <m...@debian.org> Mon, 15 Apr 2019 09:39:32 +0200
+
synaptic (0.84.5) unstable; urgency=medium
[ Jeremy Bicha ]
@@ -6,7 +21,7 @@
[ Guillem Jover ]
* Update sections and their descriptions (Closes: #880482)
- -- Michael Vogt <m...@ubuntu.com> Thu, 08 Nov 2018 08:50:31 +0100
+ -- Michael Vogt <m...@ubuntu.com> Mon, 15 Apr 2019 09:39:26 +0200
synaptic (0.84.4) unstable; urgency=medium
diff -Nru synaptic-0.84.5/debian/control synaptic-0.84.6/debian/control
--- synaptic-0.84.5/debian/control 2018-11-08 15:50:31.000000000 +0800
+++ synaptic-0.84.6/debian/control 2019-04-15 15:39:32.000000000 +0800
@@ -11,7 +11,7 @@
Package: synaptic
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, hicolor-icon-theme, policykit-1
+Depends: ${shlibs:Depends}, ${misc:Depends}, hicolor-icon-theme, policykit-1,
zenity
Conflicts: menu (<< 2.1.11)
Recommends: libgtk2-perl (>= 1:1.130), xdg-utils
Suggests: dwww, menu, deborphan, apt-xapian-index, tasksel,
software-properties-gtk
diff -Nru synaptic-0.84.5/debian/patches/00list
synaptic-0.84.6/debian/patches/00list
--- synaptic-0.84.5/debian/patches/00list 2018-11-08 15:50:31.000000000
+0800
+++ synaptic-0.84.6/debian/patches/00list 2019-04-15 15:39:32.000000000
+0800
@@ -1,3 +0,0 @@
-01_ubuntu_changelog
-#10_ubuntu_maintenance_gui
-
diff -Nru synaptic-0.84.5/debian/synaptic-pkexec
synaptic-0.84.6/debian/synaptic-pkexec
--- synaptic-0.84.5/debian/synaptic-pkexec 2018-11-08 15:50:31.000000000
+0800
+++ synaptic-0.84.6/debian/synaptic-pkexec 2019-04-15 15:39:32.000000000
+0800
@@ -1,2 +1,19 @@
#!/bin/sh
-pkexec "/usr/sbin/synaptic" "$@"
+
+USING_WAYLAND=0
+if [ ! "x${WAYLAND_DISPLAY}" = "x" ]; then
+ USING_WAYLAND=1
+fi
+if [ "x${XDG_SESSION_TYPE}" = "xwayland" ]; then
+ USING_WAYLAND=1
+fi
+
+if [ "x${USING_WAYLAND}" = "x1" ]; then
+ # Running wayland; start synaptic without pkexec
+ zenity --warning --width=500 --text \
+ "You are using Wayland environment, Synaptic will continue without
administrative privileges.\\n\
+To make Synaptic fully functional, please restart your session without
Wayland."
+ exec "/usr/sbin/synaptic" "$@"
+else
+ pkexec "/usr/sbin/synaptic" "$@"
+fi
diff -Nru synaptic-0.84.5/gtk/gsynaptic.cc synaptic-0.84.6/gtk/gsynaptic.cc
--- synaptic-0.84.5/gtk/gsynaptic.cc 2018-11-08 15:50:31.000000000 +0800
+++ synaptic-0.84.6/gtk/gsynaptic.cc 2019-04-15 15:39:32.000000000 +0800
@@ -409,7 +409,14 @@
#endif
#endif
- gtk_init(&argc, &argv);
+ if (!gtk_init_check(&argc, &argv)) {
+ std::cout <<
+ _("Failed to initialize GTK.\n") <<
+ "\n" <<
+ _("Probably you're running Synaptic on Wayland with root
permission.\n") <<
+ _("Please restart your session without Wayland, or run Synaptic
without root permission\n");
+ exit(1);
+ };
//XSynchronize(dpy, 1);
// read the cmdline
signature.asc
Description: PGP signature
