Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: 0ad

0ad (0.0.23.1-4ubuntu6) groovy; urgency=medium * No change rebuild against new gloox ABI. -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 27 Aug 2020 23:45:39 +0100 0ad (0.0.23.1-4ubuntu5) groovy; urgency=medium * Backport fix from upstream to fix compilation with gcc-10. -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Mon, 03 Aug 2020 14:07:38 +1200 0ad (0.0.23.1-4ubuntu4) groovy; urgency=medium * No-change rebuild against libicu67 -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 28 Jul 2020 16:10:25 +0000 0ad (0.0.23.1-4ubuntu3) focal; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Tue, 03 Mar 2020 21:31:13 +0100 0ad (0.0.23.1-4ubuntu2) focal; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Thu, 13 Feb 2020 08:36:22 +0100 0ad (0.0.23.1-4ubuntu1) focal; urgency=medium * Build-depend on python2. * Update cxxtestgen shebang. -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 06 Feb 2020 12:02:59 +0000 0ad (0.0.23.1-4build2) focal; urgency=medium * No change rebuild against new boost1.71 ABI -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 03 Feb 2020 19:49:57 +0000 0ad (0.0.23.1-4build1) eoan; urgency=medium * No-change upload with strops.h and sys/strops.h removed in glibc. -- Matthias Klose <doko@ubuntu.com> Thu, 05 Sep 2019 10:30:14 +0000

Modifications :
  1. Download patch debian/patches/series

    --- 0.0.23.1-4/debian/patches/series 2019-08-05 16:56:58.000000000 +0000 +++ 0.0.23.1-4ubuntu6/debian/patches/series 2020-08-03 02:02:58.000000000 +0000 @@ -1,2 +1,4 @@ allow-build-with-root.patch fix-bindir.patch +python2.patch +changeset_23794.diff
  2. Download patch debian/patches/python2.patch

    --- 0.0.23.1-4/debian/patches/python2.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.0.23.1-4ubuntu6/debian/patches/python2.patch 2020-02-06 12:02:59.000000000 +0000 @@ -0,0 +1,12 @@ +Description: Update cxxtestgen shebang. +Author: Dimitri John Ledkov <xnox@ubuntu.com> + + +--- 0ad-0.0.23.1.orig/libraries/source/cxxtest-4.4/bin/cxxtestgen ++++ 0ad-0.0.23.1/libraries/source/cxxtest-4.4/bin/cxxtestgen +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python2 + # + # The CxxTest driver script, which uses the cxxtest Python package. + #
  3. Download patch debian/patches/changeset_23794.diff

    --- 0.0.23.1-4/debian/patches/changeset_23794.diff 1970-01-01 00:00:00.000000000 +0000 +++ 0.0.23.1-4ubuntu6/debian/patches/changeset_23794.diff 2020-08-03 02:06:52.000000000 +0000 @@ -0,0 +1,101 @@ +--- a/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp ++++ b/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp +@@ -329,16 +329,3 @@ + FArchiveXML::LetWriteObject(physicsRigidBodyParameters->GetPhysicsShape(i), techniqueNode); + } + } +- +-template <class TYPE, int QUAL> +-xmlNode* FArchiveXML::AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value) +-{ +- xmlNode* paramNode = AddChild(parentNode, name); +- AddContent(paramNode, FUStringConversion::ToString((TYPE&) value)); +- if (value.IsAnimated()) +- { +- const FCDAnimated* animated = value.GetAnimated(); +- FArchiveXML::WriteAnimatedValue(animated, paramNode, name); +- } +- return paramNode; +-} +--- a/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h ++++ b/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h +@@ -553,7 +553,16 @@ + + static void WritePhysicsRigidBodyParameters(FCDPhysicsRigidBodyParameters* physicsRigidBodyParameters, xmlNode* techniqueNode); + template <class TYPE, int QUAL> +- static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value); ++ static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value) { ++ xmlNode* paramNode = AddChild(parentNode, name); ++ AddContent(paramNode, FUStringConversion::ToString((TYPE&) value)); ++ if (value.IsAnimated()) ++ { ++ const FCDAnimated* animated = value.GetAnimated(); ++ FArchiveXML::WriteAnimatedValue(animated, paramNode, name); ++ } ++ return paramNode; ++ } + + + // +--- a/source/simulation2/helpers/HierarchicalPathfinder.cpp ++++ b/source/simulation2/helpers/HierarchicalPathfinder.cpp +@@ -697,28 +697,6 @@ + jGoal = jBest; + } + +-void HierarchicalPathfinder::FindReachableRegions(RegionID from, std::set<RegionID>& reachable, pass_class_t passClass) +-{ +- // Flood-fill the region graph, starting at 'from', +- // collecting all the regions that are reachable via edges +- +- std::vector<RegionID> open; +- open.push_back(from); +- reachable.insert(from); +- +- while (!open.empty()) +- { +- RegionID curr = open.back(); +- open.pop_back(); +- +- for (const RegionID& region : m_Edges[passClass][curr]) +- // Add to the reachable set; if this is the first time we added +- // it then also add it to the open list +- if (reachable.insert(region).second) +- open.push_back(region); +- } +-} +- + void HierarchicalPathfinder::FindPassableRegions(std::set<RegionID>& regions, pass_class_t passClass) + { + // Construct a set of all regions of all chunks for this pass class +--- a/source/simulation2/helpers/HierarchicalPathfinder.h ++++ b/source/simulation2/helpers/HierarchicalPathfinder.h +@@ -148,7 +148,27 @@ + + void FindEdges(u8 ci, u8 cj, pass_class_t passClass, EdgesMap& edges); + +- void FindReachableRegions(RegionID from, std::set<RegionID>& reachable, pass_class_t passClass); ++ void FindReachableRegions(RegionID from, std::set<RegionID>& reachable, pass_class_t passClass) ++ { ++ // Flood-fill the region graph, starting at 'from', ++ // collecting all the regions that are reachable via edges ++ ++ std::vector<RegionID> open; ++ open.push_back(from); ++ reachable.insert(from); ++ ++ while (!open.empty()) ++ { ++ RegionID curr = open.back(); ++ open.pop_back(); ++ ++ for (const RegionID& region : m_Edges[passClass][curr]) ++ // Add to the reachable set; if this is the first time we added ++ // it then also add it to the open list ++ if (reachable.insert(region).second) ++ open.push_back(region); ++ } ++ } + + void FindPassableRegions(std::set<RegionID>& regions, pass_class_t passClass); +
  4. Download patch debian/control

    --- 0.0.23.1-4/debian/control 2019-08-05 16:56:58.000000000 +0000 +++ 0.0.23.1-4ubuntu6/debian/control 2020-02-06 12:02:49.000000000 +0000 @@ -1,7 +1,8 @@ Source: 0ad Section: games Priority: optional -Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org> Uploaders: Vincent Cheng <vcheng@debian.org>, Ludovic Rousseau <rousseau@debian.org> @@ -28,7 +29,7 @@ Build-Depends: libxcursor-dev, libxml2-dev, pkg-config, - python, + python2, python3, zlib1g-dev Standards-Version: 4.1.4
  1. 0ad