Merge version 1.1.6+ds1-1+rpi1 and 1.1.7+ds1-1 to produce 1.1.7+ds1-1+rpi1

diff --cc debian/changelog
index db4ed8ec038ebc611abd376b469b61303600204f,286ac1ed01fda6540d9c94e8c4c3e53554857680..ca21eb0840328751c9af04d61f5e03168cae70ec
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- opencc (1.1.6+ds1-1+rpi1) bookworm-staging; urgency=medium
++opencc (1.1.7+ds1-1+rpi1) trixie-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 13 Dec 2022 22:01:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 27 Oct 2023 03:47:10 +0000
++
+ opencc (1.1.7+ds1-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 1.1.7+ds1
+   * debian/libopencc-dev.install:
+     - Install CMake config modules
+ 
+  -- Gunnar Hjalmarsson <gunnarhj@debian.org>  Sat, 21 Oct 2023 21:22:49 +0200
+ 
+ opencc (1.1.6+ds1-2) unstable; urgency=medium
+ 
+   [ Helmut Grohne ]
+   * Fix FTCBFS: Add B-D: opencc <cross> for opencc_dict. (Closes: #1051036)
+ 
+  -- Boyuan Yang <byang@debian.org>  Fri, 01 Sep 2023 12:00:26 -0400
  
  opencc (1.1.6+ds1-1) unstable; urgency=medium