From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 16 Mar 2021 18:19:50 +0000 (+0000)
Subject: Merge version 1.1.1+git20200624+ds2-5+rpi1 and 1.1.1+git20200624+ds2-10 to produce... 
X-Git-Tag: raspbian/1.1.1+git20200624+ds2-10+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=75e5659a1ad6f97aba639ec6c60794b101a54aff;p=opencc.git

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

79d5b03950f2f19e54de833082254ad533a0fd8d
diff --cc debian/changelog
index 7620955,69db793..d4dd99d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,47 +1,54 @@@
- opencc (1.1.1+git20200624+ds2-5+rpi1) bullseye-staging; urgency=medium
++opencc (1.1.1+git20200624+ds2-10+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Feb 2021 23:49:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 16 Mar 2021 18:19:50 +0000
++
+ opencc (1.1.1+git20200624+ds2-10) unstable; urgency=medium
+ 
+   * Team upload.
+   * Upload to unstable.
+   * Backport patch to fix performance regression again.
+     Add
+     + 0006-Fix-a-bug-in-the-calculation-of-DictGroup-keyMaxLeng.patch
+     + 0007-Fix-a-severe-performance-bug-in-Conversion-Convert-t.patch
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Sun, 07 Mar 2021 14:20:40 +0800
+ 
+ opencc (1.1.1+git20200624+ds2-9) experimental; urgency=medium
+ 
+   * Team upload.
+   * Remove unused command from autopkgtest scripts
+   * Add build-essential to autopkgtest
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Sun, 07 Mar 2021 00:54:22 +0800
+ 
+ opencc (1.1.1+git20200624+ds2-8) experimental; urgency=medium
+ 
+   * Team upload.
+   * Enable test when building
+   * Add autopkgtest
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Sat, 06 Mar 2021 17:57:00 +0800
+ 
+ opencc (1.1.1+git20200624+ds2-7) unstable; urgency=high
+ 
+   * Team upload.
+   * Drop debian/patches/0005 for now due to regression reported.
+     See also https://github.com/fcitx/fcitx5/issues/238 .
+ 
+  -- Boyuan Yang <byang@debian.org>  Fri, 05 Mar 2021 09:37:48 -0500
+ 
+ opencc (1.1.1+git20200624+ds2-6) unstable; urgency=high
+ 
+   * Team upload.
+   * debian/patches/0005: Add upstream patch to fix severe performance
+     regression in `Conversion::Convert` that caused O(N^2) complexity.
+   * debian/rules: Disable parallel build to workaround some random
+     build error for now.
+ 
+  -- Boyuan Yang <byang@debian.org>  Sun, 28 Feb 2021 19:48:01 -0500
  
  opencc (1.1.1+git20200624+ds2-5) unstable; urgency=medium