Control: tags -1 +patch  +pending

Dear maintainer,

I've prepared an NMU for gnome-subtitles (versioned as 1.6-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards,
Boyuan Yang

diff -Nru gnome-subtitles-1.6/debian/changelog
gnome-subtitles-1.6/debian/changelog
--- gnome-subtitles-1.6/debian/changelog    2020-03-14 20:08:38.000000000 +0000
+++ gnome-subtitles-1.6/debian/changelog    2020-04-18 04:22:24.000000000 +0000
@@ -1,3 +1,17 @@
+gnome-subtitles (1.6-2.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * debian/control:
+    + Migrate build-dependency to enchant-2.
+    + Update debhelper minimal version to 9+ for consistency
+      with debian/compat.
+    + Replace obsolete build-dependency gnome-doc-utils with
+      yelp-tools. (Closes: #956725)
+  * debian/patches: Add patch to migrate the package to use
+    enchant-2. (Closes: #948437)
+
+ -- Boyuan Yang <by...@debian.org>  Sat, 18 Apr 2020 04:22:24 +0000
+
 gnome-subtitles (1.6-2) unstable; urgency=medium

   * Minor fixes on debian/copyright and debian/control files.
diff -Nru gnome-subtitles-1.6/debian/control gnome-subtitles-1.6/debian/control
--- gnome-subtitles-1.6/debian/control    2020-03-14 20:07:18.000000000 +0000
+++ gnome-subtitles-1.6/debian/control    2020-04-18 04:22:22.000000000 +0000
@@ -4,19 +4,19 @@
 Maintainer: Debian CLI Applications Team
<pkg-cli-apps-t...@lists.alioth.debian.org>
 Uploaders: Tiago Bortoletto Vaz <ti...@debian.org>, Mirco Bauer
<mee...@debian.org>
 Build-Depends: cli-common-dev (>= 0.8),
- debhelper (>= 7),
+ debhelper (>= 9),
  autotools-dev,
  mono-devel (>= 4.0),
  libgtk-3-dev (>= 3.12),
  gtk-sharp3 (>= 2.99.2),
- libenchant-dev,
+ libenchant-2-dev,
  libgtkspell3-3-dev,
  libgstreamer1.0-dev,
  libgstreamer-plugins-base1.0-dev,
  docbook-xml <!nocheck>,
- gnome-doc-utils (>= 0.3.2),
  itstool,
- intltool (>= 0.50)
+ intltool (>= 0.50),
+ yelp-tools,
 Standards-Version: 4.5.0
 Homepage: http://gnomesubtitles.org
 Vcs-Git: https://salsa.debian.org/dotnet-team/gnome-subtitles.git
@@ -36,7 +36,7 @@
  gstreamer1.0-plugins-good,
  gstreamer1.0-libav,
  libgtkspell3-3-0 (>= 3.0),
- enchant (>= 1.6)
+ enchant-2,
 Recommends: gstreamer0.10-ffmpeg
 Description: Subtitle editor for the GNOME Desktop environment
  Gnome Subtitles is a subtitle editor for the GNOME desktop.
diff -Nru gnome-subtitles-1.6/debian/patches/0001-Migrate-to-enchant-2.patch
gnome-subtitles-1.6/debian/patches/0001-Migrate-to-enchant-2.patch
--- gnome-subtitles-1.6/debian/patches/0001-Migrate-to-enchant-2.patch
   1970-01-01 00:00:00.000000000 +0000
+++ gnome-subtitles-1.6/debian/patches/0001-Migrate-to-enchant-2.patch
   2020-04-18 04:14:42.000000000 +0000
@@ -0,0 +1,23 @@
+From: Boyuan Yang <by...@debian.org>
+Date: Sat, 18 Apr 2020 04:13:07 +0000
+Subject: Migrate to enchant-2
+
+Patch picked from https://bugs.debian.org/953379 . This is
+provided by the upstream.
+
+Bug-Debian: https://bugs.debian.org/948437
+---
+ src/GnomeSubtitles/Execution/gnome-subtitles.exe.config | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/GnomeSubtitles/Execution/gnome-subtitles.exe.config
b/src/GnomeSubtitles/Execution/gnome-subtitles.exe.config
+index fa663ae..4777925 100644
+--- a/src/GnomeSubtitles/Execution/gnome-subtitles.exe.config
++++ b/src/GnomeSubtitles/Execution/gnome-subtitles.exe.config
+@@ -1,5 +1,5 @@
+ <configuration>
+     <dllmap dll="libgtk" target="libgtk-3.so.0" />
+-    <dllmap dll="libenchant" target="libenchant.so.1" />
++    <dllmap dll="libenchant" target="libenchant-2.so.2" />
+     <dllmap dll="libgtkspell" target="libgtkspell3-3.so.0" />
+ </configuration>
diff -Nru gnome-subtitles-1.6/debian/patches/series
gnome-subtitles-1.6/debian/patches/series
--- gnome-subtitles-1.6/debian/patches/series    1970-01-01
00:00:00.000000000 +0000
+++ gnome-subtitles-1.6/debian/patches/series    2020-04-18
04:14:42.000000000 +0000
@@ -0,0 +1 @@
+0001-Migrate-to-enchant-2.patch

Reply via email to