Your message dated Thu, 21 Mar 2019 13:09:07 +0000
with message-id <[email protected]>
and subject line unblock inkscape
has caused the Debian Bug report #925183,
regarding unblock: inkscape/0.92.4-3
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
925183: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925183
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
User: [email protected]
Usertags: unblock
Hi RT!
I just uploaded an inkscpe fixing a couple of annoyances that I think
would be best if it could be in buster.
tiny debdiff attached, please consider it for unblocking.
unblock inkscape/0.92.4-3
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for inkscape-0.92.4 inkscape-0.92.4
changelog | 9 +
control | 4
patches/series | 1
patches/upstream/0008-Show-helpful-message-if-tutorials-are-not-installed.patch | 59 ++++++++++
4 files changed, 71 insertions(+), 2 deletions(-)
diff -Nru inkscape-0.92.4/debian/changelog inkscape-0.92.4/debian/changelog
--- inkscape-0.92.4/debian/changelog 2019-01-24 19:29:41.000000000 +0100
+++ inkscape-0.92.4/debian/changelog 2019-03-20 21:54:39.000000000 +0100
@@ -1,3 +1,12 @@
+inkscape (0.92.4-3) unstable; urgency=medium
+
+ * Add patch from upstream master branch to output a useful error if the
+ tutorials aren't installed. LP: #1803021
+ * d/control: switch Recommends from non-existent transfig to fig2dev.
+ Closes: #925171
+
+ -- Mattia Rizzolo <[email protected]> Wed, 20 Mar 2019 21:54:39 +0100
+
inkscape (0.92.4-2) unstable; urgency=medium
[ Matteo F. Vescovi ]
diff -Nru inkscape-0.92.4/debian/control inkscape-0.92.4/debian/control
--- inkscape-0.92.4/debian/control 2019-01-24 19:25:45.000000000 +0100
+++ inkscape-0.92.4/debian/control 2019-03-20 21:44:41.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Multimedia Maintainers <[email protected]>
Uploaders:
- Mattia Rizzolo <[email protected]>
+ Mattia Rizzolo <[email protected]>,
Build-Depends:
bash-completion (>= 1:2.1-4.2),
cmake,
@@ -57,13 +57,13 @@
${shlibs:Depends},
Recommends:
aspell,
+ fig2dev,
imagemagick,
libimage-magick-perl,
libwmf-bin,
python-lxml,
python-numpy,
python-scour,
- transfig,
Suggests:
dia,
inkscape-tutorials,
diff -Nru inkscape-0.92.4/debian/patches/series inkscape-0.92.4/debian/patches/series
--- inkscape-0.92.4/debian/patches/series 2019-01-24 19:28:14.000000000 +0100
+++ inkscape-0.92.4/debian/patches/series 2019-02-17 16:16:58.000000000 +0100
@@ -5,3 +5,4 @@
upstream/0005-Make-the-command-line-PDF-output-reproducible.patch
upstream/0006-Fix-typo-s-Distrubute-Distribute.patch
upstream/0007-Update-the-appstream-metadata-file-from-the-upstream.patch
+upstream/0008-Show-helpful-message-if-tutorials-are-not-installed.patch
diff -Nru inkscape-0.92.4/debian/patches/upstream/0008-Show-helpful-message-if-tutorials-are-not-installed.patch inkscape-0.92.4/debian/patches/upstream/0008-Show-helpful-message-if-tutorials-are-not-installed.patch
--- inkscape-0.92.4/debian/patches/upstream/0008-Show-helpful-message-if-tutorials-are-not-installed.patch 1970-01-01 01:00:00.000000000 +0100
+++ inkscape-0.92.4/debian/patches/upstream/0008-Show-helpful-message-if-tutorials-are-not-installed.patch 2019-02-17 16:16:58.000000000 +0100
@@ -0,0 +1,59 @@
+From: Max Gaukler <[email protected]>
+Date: Sun, 10 Feb 2019 15:47:44 +0100
+Subject: Show helpful message if tutorials are not installed
+
+Fixes https://bugs.launchpad.net/ubuntu/+source/inkscape/+bug/1803021 (for 1.0-alpha)
+
+LP: #1803021
+Signed-off-by: Mattia Rizzolo <[email protected]>
+---
+ po/POTFILES.in | 1 +
+ src/help.cpp | 11 ++++++++++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 9e305f8..7142d3d 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -110,6 +110,7 @@ src/file.cpp
+ src/filter-enums.cpp
+ src/gradient-chemistry.cpp
+ src/gradient-drag.cpp
++src/help.cpp
+ src/inkscape.cpp
+ src/knot.cpp
+ src/knotholder.cpp
+diff --git a/src/help.cpp b/src/help.cpp
+index 643945a..50d3696 100644
+--- a/src/help.cpp
++++ b/src/help.cpp
+@@ -16,11 +16,14 @@
+ #endif
+
+ #include <glibmm.h>
++#include <glibmm/i18n.h>
+
+ #include "file.h"
+ #include "help.h"
++#include "io/sys.h"
+ #include "path-prefix.h"
+ #include "ui/dialog/aboutbox.h"
++#include "ui/interface.h"
+
+ void sp_help_about()
+ {
+@@ -31,7 +34,13 @@ void sp_help_open_tutorial(GtkMenuItem *, void* data)
+ {
+ gchar const *name = static_cast<gchar const *>(data);
+ gchar *c = g_build_filename(INKSCAPE_TUTORIALSDIR, name, NULL);
+- sp_file_open(c, NULL, false, false);
++ if (Inkscape::IO::file_test(c, G_FILE_TEST_EXISTS)) {
++ sp_file_open(c, NULL, false, false);
++ } else {
++ sp_ui_error_dialog(_("The tutorial files are not installed.\nFor Linux, you may need to install "
++ "'inkscape-tutorials'; for Windows, please re-run the setup and select 'Tutorials'.\nThe "
++ "tutorials can also be found online at https://inkscape.org/learn/tutorials/";));
++ }
+ g_free(c);
+ }
+
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
Unblocked.
--- End Message ---
