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: xdmf

xdmf (3.0+git20190531-4ubuntu2) focal; urgency=medium * Drop force appending 'm' to PY3 version in debian/rules. -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 28 Jan 2020 13:49:50 +0000 xdmf (3.0+git20190531-4ubuntu1) focal; urgency=medium * Use new CMake Python module. -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 28 Jan 2020 12:42:59 +0000 xdmf (3.0+git20190531-4build1) focal; urgency=medium * No-change rebuild to build with python3.8. -- Matthias Klose <doko@ubuntu.com> Sat, 25 Jan 2020 04:41:25 +0000

Modifications :
  1. Download patch debian/rules

    --- 3.0+git20190531-4/debian/rules 2019-11-27 14:21:03.000000000 +0000 +++ 3.0+git20190531-4ubuntu2/debian/rules 2020-01-28 13:47:06.000000000 +0000 @@ -13,7 +13,7 @@ MPI:=$(ARCH_DEFAULT_MPI_IMPL) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) TMPDIR=$(CURDIR)/debian/tmp LIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} -PY3:=$(shell py3versions -d)m +PY3:=$(shell py3versions -d) CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -fPIC @@ -28,8 +28,6 @@ CMAKE_FLAGS:= -DXDMF_SYSTEM_ZLIB=ON \ -DXDMF_USE_GZIP=ON \ -DXDMF_BUILD_FORTRAN=ON \ -DXDMF_SWIG_FLAGS=-py3 \ - -DPYTHON_INCLUDE_PATH=/usr/include/$(PY3) \ - -DPYTHON_LIBRARY=$(LIBDIR)/lib$(PY3).so \ -DXDMF_SYSTEM_HDF5=ON \ -DCMAKE_SKIP_RPATH=ON \ -DXDMF_BUILD_UTILS=ON \
  2. Download patch debian/patches/cmake-new-python-module.patch

    --- 3.0+git20190531-4/debian/patches/cmake-new-python-module.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0+git20190531-4ubuntu2/debian/patches/cmake-new-python-module.patch 2020-01-28 12:42:51.000000000 +0000 @@ -0,0 +1,57 @@ +Description: Use new cmake Python module +Author: Dimitri John Ledkov <xnox@ubuntu.com> + + +--- xdmf-3.0+git20190531.orig/CMakeLists.txt ++++ xdmf-3.0+git20190531/CMakeLists.txt +@@ -92,8 +92,7 @@ endif() + + # If we are wrapping python, let's include it in the top level + if(XDMF_WRAP_PYTHON) +- find_package(PythonInterp ${REQUESTED_PYTHON_VERSION} REQUIRED) +- find_package(PythonLibs ${REQUESTED_PYTHON_VERSION} REQUIRED) ++ find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) + if (XDMF_BUILD_DSM) + find_package (MPI4PY REQUIRED) + if (MPI4PY_FOUND) +@@ -101,9 +100,9 @@ if(XDMF_WRAP_PYTHON) + set(PYTHON_INCLUDE_MPI4PY_DIR ${MPI4PY_INCLUDE_DIR}) + endif () + endif () +- include_directories(${PYTHON_INCLUDE_DIRS} ${MPI_CXX_INCLUDE_PATH} ${PYTHON_INCLUDE_MPI4PY_DIR}) ++ include_directories(${Python_INCLUDE_DIR} ${MPI_CXX_INCLUDE_PATH} ${PYTHON_INCLUDE_MPI4PY_DIR}) + else () +- include_directories(${PYTHON_INCLUDE_DIRS}) ++ include_directories(${Python_INCLUDE_DIR}) + endif () + + # A macro to swig and create the python files +@@ -134,7 +133,7 @@ if(XDMF_WRAP_PYTHON) + swig_add_library(${python_name}Python LANGUAGE python SOURCES ${python_name}.i) + + if (NOT APPLE) +- swig_link_libraries(${python_name}Python ${python_name} ${PYTHON_LIBRARIES}) ++ swig_link_libraries(${python_name}Python ${python_name} ${Python_LIBRARIES}) + else () + swig_link_libraries(${python_name}Python ${python_name}) + endif () +--- xdmf-3.0+git20190531.orig/core/dsm/CMakeLists.txt ++++ xdmf-3.0+git20190531/core/dsm/CMakeLists.txt +@@ -86,7 +86,7 @@ set(XdmfDSM_INCLUDE_DIRS + ${HDF5_INCLUDE_DIR} + ${H5FDdsm_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} +- ${PYTHON_INCLUDE_DIRS} ++ ${Python_INCLUDE_DIR} + CACHE INTERNAL "") + else() + set(XdmfDSM_INCLUDE_DIRS +@@ -94,7 +94,7 @@ set(XdmfDSM_INCLUDE_DIRS + ${CMAKE_CURRENT_SOURCE_DIR} + ${HDF5_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} +- ${PYTHON_INCLUDE_DIRS} ++ ${Python_INCLUDE_DIR} + CACHE INTERNAL "") + endif() +
  3. Download patch debian/control

    --- 3.0+git20190531-4/debian/control 2019-11-27 14:21:03.000000000 +0000 +++ 3.0+git20190531-4ubuntu2/debian/control 2020-01-28 12:43:15.000000000 +0000 @@ -1,7 +1,8 @@ Source: xdmf Section: science Priority: optional -Maintainer: Alastair McKinstry <mckinstry@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Alastair McKinstry <mckinstry@debian.org> Build-Depends: debhelper-compat (= 12), cmake(>= 2.4.0), libhdf5-serial-dev, libhdf5-mpi-dev, @@ -14,8 +15,7 @@ Build-Depends: debhelper-compat (= 12), bzip2, libbz2-dev, libgzstream-dev, libmetis-dev -Build-Conflicts: libxdmf-dev, - libpython2.7-dev +Build-Conflicts: libxdmf-dev Standards-Version: 4.4.1.0 Homepage: http://www.xdmf.org/ Vcs-Browser: https://salsa.debian.org/science-team/xdmf
  4. Download patch debian/patches/series

    --- 3.0+git20190531-4/debian/patches/series 2019-11-27 14:21:03.000000000 +0000 +++ 3.0+git20190531-4ubuntu2/debian/patches/series 2020-01-28 12:42:25.000000000 +0000 @@ -2,3 +2,4 @@ exodus.patch swig-library.patch swig-py3.patch +cmake-new-python-module.patch
  1. xdmf