Merge version 3.0.2-10+rpi1 and 3.0.4~dfsg-1 to produce 3.0.4~dfsg-1+rpi1

diff --cc debian/changelog
index f2ba155e0c3fbb338b20dc46ec54c6e6fb8b4ad9,099508617747e0a82c6bb0d8fa9d7a9b2e0306a2..4b4cc592d4af30f54373c94b6a713989eb67e53e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,48 +1,56 @@@
- abiword (3.0.2-10+rpi1) bullseye-staging; urgency=medium
++abiword (3.0.4~dfsg-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 3.0.2-8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 26 Jul 2019 19:02:13 +0000]
 +  * Move valgrind from build-depends to build-conflicts, raspbians valgrind
 +    is problematic.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Apr 2020 11:52:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Jun 2020 12:07:43 +0000
++
+ abiword (3.0.4~dfsg-1) unstable; urgency=medium
+ 
+   [ upstream ]
+   * new release(s)
+ 
+   [ Jonas Smedegaard ]
+   * watch: fix URL
+   * repackage source,
+     excluding potentially non-free linked binary code
+   * skip copyright scanning of some data files
+   * copyright: update coverage
+   * drop patches applied upstream
+   * unfuzz remaining patches
+   * declare compliance with Debian Policy 4.5.0
+   * set Rules-Requires-Root: no
+   * build-depend on autoconf-archive
+   * install AppStream metadata
+ 
+  -- Jonas Smedegaard <dr@jones.dk>  Sat, 06 Jun 2020 02:26:42 +0200
+ 
+ abiword (3.0.2-11) unstable; urgency=medium
+ 
+   * adopt package: add myself as Maintainer;
+     closes: bug#740678, thanks to Dmitry Smirnov for past work
+   * update git-buildpackage config:
+     + enable pristine-tar
+     + stop disable merge
+     + enable signed tags
+     + filter-out any .git* file
+     + use DEP14 branch naming scheme
+   * watch:
+     + track Github mirror
+     + rewrite usage comment
+   * use debhelper compatibility level 12 (not 9);
+     build-depend on debhelper-compat dh-sequence-gir
+     (not debhelper gobject-introspection)
+   * copyright:
+     + unfuzz copyright holders
+     + update and extend coverage
+   * tidy patch metadata
+   * add patch to use enchat2 instead of enchant;
+     build-depend on libenchant-2-dev (not libenchant-dev);
+     closes: bug#956710, thankt to Laurent Bigonville
+ 
+  -- Jonas Smedegaard <dr@jones.dk>  Fri, 05 Jun 2020 23:34:03 +0200
  
  abiword (3.0.2-10) unstable; urgency=medium
  

diff --cc debian/control
index ec43f2728d98dd9a14ec38d3c385a5e3c9369024,b23a114ae2bd7d64d187f880fbbf90e18e0222e4..eb8158b08d49c1252131959fdd879c4ca29bf0b8
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,47 -1,48 +1,49 @@@
  Source: abiword
  Section: gnome
  Priority: optional
- Maintainer: Debian QA Group <packages@qa.debian.org>
- Build-Depends: bison,
-                debhelper (>= 11),
-                flex,
-                gobject-introspection,
-                libaiksaurus-1.2-dev (>= 1.2.1+dev-0.12-6.3~),
-                libaiksaurusgtk-1.2-dev (>= 1.2.1+dev-0.12-6.3~),
-                libasio-dev,
-                libboost-dev,
-                libchamplain-gtk-0.12-dev,
-                libebook1.2-dev (>= 3.8.5),
-                libical-dev (>= 3.0),
-                libenchant-dev,
-                libfribidi-dev,
-                libgcrypt20-dev,
-                libgirepository1.0-dev,
-                libglib2.0-dev,
-                libgoffice-0.10-dev,
-                libgtk-3-dev,
-                libjpeg-dev,
-                liblink-grammar-dev,
-                libloudmouth1-dev,
-                libots-dev,
-                libpng-dev,
-                librdf0-dev,
-                libreadline-dev,
-                librevenge-dev,
-                librsvg2-dev,
-                libsoup2.4-dev,
-                libtelepathy-glib-dev,
-                libtidy-dev,
-                libtool-bin <!nocheck>,
-                libwmf-dev,
-                libwpd-dev (>= 0.10),
-                libwpg-dev (>= 0.3),
-                libwps-dev (>= 0.3),
-                libwv-dev,
-                libxslt-dev | libxslt1-dev
+ Maintainer: Jonas Smedegaard <dr@jones.dk>
+ Build-Depends:
+  autoconf-archive,
+  bison,
+  debhelper-compat (= 12),
+  dh-sequence-gir,
+  flex,
+  libaiksaurus-1.2-dev (>= 1.2.1+dev-0.12-6.3~),
+  libaiksaurusgtk-1.2-dev (>= 1.2.1+dev-0.12-6.3~),
+  libasio-dev,
+  libboost-dev,
+  libchamplain-gtk-0.12-dev,
+  libebook1.2-dev (>= 3.8.5),
+  libenchant-2-dev,
++ libical-dev (>= 3.0),
+  libfribidi-dev,
+  libgcrypt20-dev,
+  libgirepository1.0-dev,
+  libglib2.0-dev,
+  libgoffice-0.10-dev,
+  libgtk-3-dev,
 - libical-dev (>= 3.0),
+  libjpeg-dev,
+  liblink-grammar-dev,
+  libloudmouth1-dev,
+  libots-dev,
+  libpng-dev,
+  librdf0-dev,
+  libreadline-dev,
+  librevenge-dev,
+  librsvg2-dev,
+  libsoup2.4-dev,
+  libtelepathy-glib-dev,
+  libtidy-dev,
+  libtool-bin <!nocheck>,
+  libwmf-dev,
+  libwpd-dev (>= 0.10),
+  libwpg-dev (>= 0.3),
+  libwps-dev (>= 0.3),
+  libwv-dev,
+  libxslt-dev | libxslt1-dev,
 - valgrind [amd64 arm64 armhf i386 mips mips64el powerpc ppc64el s390x] <!nocheck>,
 +Build-Conflicts:
 +               valgrind
- Standards-Version: 4.2.1
+ Standards-Version: 4.5.0
  Homepage: http://www.abisource.com/
  Vcs-Browser: https://salsa.debian.org/debian/abiword
  Vcs-Git: https://salsa.debian.org/debian/abiword.git