Merge version 1.1.1+git20200624+ds2-4+rpi1 and 1.1.1+git20200624+ds2-5 to produce...

diff --cc debian/changelog
index 7da47eb99226d47cda55f48379dcc87aef1255da,eee8331dc179f4c45bebd7d829eb75d2c8ac4678..7620955431684b703f4c84568fd3ea561fcf9621
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,18 +1,25 @@@
- opencc (1.1.1+git20200624+ds2-4+rpi1) bullseye-staging; urgency=medium
++opencc (1.1.1+git20200624+ds2-5+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 1.1.1+git20200624+ds2-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 28 Jan 2021 14:32:01 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 28 Jan 2021 14:32:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Feb 2021 23:49:56 +0000
++
+ opencc (1.1.1+git20200624+ds2-5) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/rules: Rewrite to support <!nodoc> build profile.
+   * debian/rules: Enable dh_doxygen when building docs.
+   * Drop unnecessary build dependencies. (Closes: #981606)
+   * debian/control: Mark build-dependency doxygen as <!nodoc>.
+   * debian/control: Drop build-dependency on libjs-jquery. Let
+     doxygen handle it.
+   * debian/control: Drop build-dependency on graphviz. Doxyfile
+     did not enable HAVE_DOT.
+   * debian/control: Drop build-dependency on dartz. Currently opencc
+     uses its vendored copy.
+ 
+  -- Boyuan Yang <byang@debian.org>  Tue, 02 Feb 2021 11:58:39 -0500
  
  opencc (1.1.1+git20200624+ds2-4) unstable; urgency=medium