Control: tags 947326 + patch
Control: tags 947326 + pending
Control: tags 947479 + patch
Control: tags 947479 + pending
Dear maintainer,
I've prepared an NMU for antimony (versioned as 0.9.3-1.1) and
uploaded it to DELAYED/XX. Please feel free to tell me if I
should delay it longer.
Not sure how long it will be delayed
Regards.
Håvard
diff -Nru antimony-0.9.3/debian/changelog antimony-0.9.3/debian/changelog
--- antimony-0.9.3/debian/changelog 2018-08-28 01:20:45.0 +0200
+++ antimony-0.9.3/debian/changelog 2020-01-06 10:39:41.0 +0100
@@ -1,3 +1,25 @@
+antimony (0.9.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Ondřej Nový ]
+ * d/control: Set Vcs-* to salsa.debian.org
+
+ [ Tiago Bortoletto Vaz ]
+ * Add MPL-2.0 notice to debian/copyright.
+ * Add Boost license notice to debian/copyright.
+
+ [ Håvard Flaget Aasen ]
+ * Explicit build-dependency on dh-python. closes: #947326
+ * Use new CMake discovery for python and boost::python. closes: #947479
+- Patch from Ubuntu.
+ * This package embeds python3, and is only built against the default
+version. Change build-dependency to python3-dev.
+- Patch from Ubuntu.
+ * Remove duplicated header in debian/copyright
+
+ -- Håvard Flaget Aasen Mon, 06 Jan 2020 10:39:41
+0100
+
antimony (0.9.3-1) unstable; urgency=low
* Initial packaging. Based on Peter Felecan package work
diff -Nru antimony-0.9.3/debian/control antimony-0.9.3/debian/control
--- antimony-0.9.3/debian/control 2018-08-28 01:20:45.0 +0200
+++ antimony-0.9.3/debian/control 2020-01-06 09:29:43.0 +0100
@@ -5,8 +5,9 @@
Vcs-Git: https://salsa.debian.org/debian/antimony.git
Maintainer: Tiago Bortoletto Vaz
Build-Depends: debhelper (>= 9),
+ dh-python,
libpng-dev,
- python3-all-dev,
+ python3-dev,
libboost-all-dev,
libgl1-mesa-dev,
lemon,
diff -Nru antimony-0.9.3/debian/copyright antimony-0.9.3/debian/copyright
--- antimony-0.9.3/debian/copyright 2018-08-28 01:20:45.0 +0200
+++ antimony-0.9.3/debian/copyright 2020-01-06 09:30:54.0 +0100
@@ -44,7 +44,6 @@
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
.
-License: Boost-1.0
Boost Software License - Version 1.0 - August 17th, 2003
.
Permission is hereby granted, free of charge, to any person or organization
diff -Nru
antimony-0.9.3/debian/patches/0002-Use-new-CMake-Python-discovery-with-matching-Boost-P.patch
antimony-0.9.3/debian/patches/0002-Use-new-CMake-Python-discovery-with-matching-Boost-P.patch
---
antimony-0.9.3/debian/patches/0002-Use-new-CMake-Python-discovery-with-matching-Boost-P.patch
1970-01-01 01:00:00.0 +0100
+++
antimony-0.9.3/debian/patches/0002-Use-new-CMake-Python-discovery-with-matching-Boost-P.patch
2020-01-06 09:29:43.0 +0100
@@ -0,0 +1,128 @@
+From: Dimitri John Ledkov
+Date: Sun, 27 Oct 2019 14:42:04 +
+Subject: Use new CMake Python discovery, with matching Boost::Python abi.
+
+CMake has a new Python discovery module, that can also export
+major/minor version numbers. Switch to using it.
+
+Boost, has also moved on to standard pythonXY abi component name
+across all distributions/OS, thus use matching version ABI.
+
+If one wants to compile against much older Boost, I guess we could add
+fallback to search for Boost python3 component, but IMHO this should
+not be necessory.
+---
+ CMakeLists.txt | 20 ++--
+ app/CMakeLists.txt | 2 +-
+ lib/fab/CMakeLists.txt | 6 +++---
+ lib/graph/CMakeLists.txt | 6 +++---
+ 4 files changed, 9 insertions(+), 25 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a325f28..d6434e3 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -8,29 +8,13 @@ set(CMAKE_CXX_FLAGS_DEBUG"-O0")
+
+
+
+-find_package(PythonLibs 3.3 REQUIRED)
++find_package(Python 3.3 REQUIRED COMPONENTS Interpreter Development)
+
+ if (WIN32)
+ add_definitions("-DBOOST_PYTHON_STATIC_LIB")
+ endif()
+
+-if (WIN32)
+-find_package(Boost REQUIRED COMPONENTS python3)
+-elseif (APPLE)
+-foreach (PYTHON_NAME python3 python36 python37)
+-find_package(Boost QUIET COMPONENTS ${PYTHON_NAME})
+-if (${Boost_FOUND})
+-break()
+-endif()
+-endforeach()
+-elseif (UNIX)
+-foreach (PYTHON_NAME python3 python-py36 python-py35 python-py34)
+-find_package(Boost QUIET COMPONENTS ${PYTHON_NAME})
+-if (${Boost_FOUND})
+-break()
+-endif()
+-endforeach()
+-endif()
++find_package(Boost REQUIRED COMPONENTS
python${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
+
+ if (NOT ${Boost_FOUND})
+ message(FATAL_ERROR "Could not find boost::python3")
+diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
+index ebaff55..cf950d3 100644
+--- a/app/CMakeLists.txt
b/app/CMakeLists.txt
+@@ -175,7
