From: Peter Michael Green <plugwash@raspbian.org>
Date: Sun, 29 Mar 2020 05:18:10 +0000 (+0000)
Subject: Manual merge of version 5.3.0-10+rpi1 and 5.3.0-13 to produce 5.3.0-13+rpi1
X-Git-Tag: archive/raspbian/5.3.0-13+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fc2a40f8b00b08999768aa753b852f76c64ce0d3;p=gringo.git

Manual merge of version 5.3.0-10+rpi1 and 5.3.0-13 to produce 5.3.0-13+rpi1

Drop libatomic change, keep symbols change.
---

fc2a40f8b00b08999768aa753b852f76c64ce0d3
diff --cc debian/changelog
index a3926c1,a5eef12..7492808
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,39 +1,46 @@@
- gringo (5.3.0-10+rpi1) buster-staging; urgency=medium
++gringo (5.3.0-13+rpi1) bullseye-staging; urgency=medium
 +
-   * Use libatomic on armhf too.
++  [changes brought forward from 5.3.0-10+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 14 Mar 2019 17:34:56 +0000]
 +  * Update symbols for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 14 Mar 2019 17:34:56 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 29 Mar 2020 05:17:25 +0000
++
+ gringo (5.3.0-13) unstable; urgency=medium
+ 
+   * Upload to unstable
+   * debian/symbols: fix symbols for g++-9 >= 9.2.0 on armel and powerpc
+ 
+  -- Thomas Krennwallner <tkren@kr.tuwien.ac.at>  Wed, 11 Mar 2020 20:57:01 -0400
+ 
+ gringo (5.3.0-12) experimental; urgency=medium
+ 
+   * debian/symbols: fix symbols for g++-9 >= 9.2.0
+   * debian/{rules,install}: drop libatomic hacks, stop confusing build
+     target with build directory
+   * debian/patches: refresh python3.8-compat and gringo-python37-async
+   * link-libatomic-check.patch: add libatomic checks to CMakeLists.txt
+ 
+  -- Thomas Krennwallner <tkren@kr.tuwien.ac.at>  Wed, 11 Mar 2020 07:31:40 -0400
+ 
+ gringo (5.3.0-11) experimental; urgency=medium
+ 
+   * add support for python3.8, thanks to Steve Langasek
+   * compile with gcc-9 and g++-9
+   * debian/control: bump Standards-Version to 4.5.0 (no changes required)
+   * renamed debian/{NEWS,TODO}.Debian to debian/{NEWS,TODO}
+     Lintian tag incorrect-packaging-filename
+   * setup debhelper-compat 12.
+     Lintian tag package-uses-old-debhelper-compat-version
+   * debian/control: set Rules-Requires-Root to no
+   * debian/symbols: fix symbols for g++-9 >= 9.2.0
+   * Bug fix: "gringo needs a new upstream, and fixes for python3.8",
+     thanks to Matthias Klose (Closes: #951842).
+   * Bug fix: "gringo ftbfs with Python 3.8", thanks to Matthias Klose
+     (Closes: #951707).
+   * Bug fix: "non-standard gcc/g++ used for build (gcc-8)", thanks to
+     Matthias Klose (Closes: #944178).
+ 
+  -- Thomas Krennwallner <tkren@kr.tuwien.ac.at>  Mon, 09 Mar 2020 13:31:25 +0100
  
  gringo (5.3.0-10) unstable; urgency=medium