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: boost-defaults

boost-defaults (1.71.0.0ubuntu4) groovy; urgency=medium * Correctly drop tools-dev package from all-dev. -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 25 May 2020 19:46:23 +0100 boost-defaults (1.71.0.0ubuntu3) groovy; urgency=medium * Drop unused i386 libraries. -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 23 May 2020 05:37:56 +0100 boost-defaults (1.71.0.0ubuntu2) focal; urgency=medium * Enable boost-numpy on riscv64. -- William Grant <wgrant@ubuntu.com> Thu, 16 Apr 2020 13:36:12 +1000 boost-defaults (1.71.0.0ubuntu1) focal; urgency=medium [ Giovanni Mascellani ] * Update for boost 1.71.0. [ Dimitri John Ledkov ] * Port create-boost-defaults-control.py to python3. * Update boost-defaults with newly enabled arches. -- Giovanni Mascellani <gio@debian.org> Mon, 14 Oct 2019 09:20:42 +0200

Modifications :
  1. Download patch debian/control
  2. Download patch debian/create-boost-defaults-control.py

    --- 1.67.0.2/debian/create-boost-defaults-control.py 2019-08-06 14:38:06.000000000 +0000 +++ 1.71.0.0ubuntu4/debian/create-boost-defaults-control.py 2019-10-14 07:20:42.000000000 +0000 @@ -1,9 +1,9 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # # Script to create debian/control for package boost-defaults -from deb822 import Deb822 +from debian.deb822 import Deb822 import re, sys gBoostVersion = None @@ -48,7 +48,7 @@ def appendFirstLine(string, suffix): return '\n'.join(lines) def deleteKey(paragraph, key): - if paragraph.has_key(key): + if key in paragraph: del paragraph[key] def processSourceParagraph(p): @@ -110,7 +110,7 @@ def processPackageParagraph(p): def printParagraph(p): for key in p.keys(): - print "%s: %s" % (key, p[key]) + print("%s: %s" % (key, p[key])) def processControl(controlfile): firstParagraph = True @@ -123,7 +123,7 @@ def processControl(controlfile): firstParagraph = False else: if processPackageParagraph(paragraph): - print + print() printParagraph(paragraph)
  3. Download patch debian/source/format

    --- 1.67.0.2/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ 1.71.0.0ubuntu4/debian/source/format 2019-10-14 07:20:42.000000000 +0000 @@ -0,0 +1 @@ +3.0 (native)

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

Source: boost1.71

boost1.71 (1.71.0-6ubuntu8) groovy; urgency=medium * Correctly drop tools-dev package from all-dev. -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 25 May 2020 19:44:57 +0100 boost1.71 (1.71.0-6ubuntu7) groovy; urgency=medium * Drop more unused packages on i386. -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 20 May 2020 02:35:32 +0100 boost1.71 (1.71.0-6ubuntu6) focal; urgency=medium * Enable numpy properly on riscv64. -- William Grant <wgrant@ubuntu.com> Wed, 01 Apr 2020 18:48:27 +1100 boost1.71 (1.71.0-6ubuntu5) focal; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Wed, 04 Mar 2020 07:38:09 +0100 boost1.71 (1.71.0-6ubuntu4) focal; urgency=medium * Cherrypick additional s390x context bugfix. LP: #1864433 -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 27 Feb 2020 12:40:25 +0000 boost1.71 (1.71.0-6ubuntu3) focal; urgency=medium * Add s390x to deducible jam architectures. -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 18 Feb 2020 12:58:21 +0000 boost1.71 (1.71.0-6ubuntu2) focal; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Thu, 13 Feb 2020 08:50:03 +0100 boost1.71 (1.71.0-6ubuntu1) focal; urgency=medium * Do not build numpy on i386. -- Dimitri John Ledkov <xnox@ubuntu.com> Sun, 09 Feb 2020 08:31:04 +0000

Modifications :
  1. Download patch debian/rules

    --- 1.71.0-6/debian/rules 2020-02-04 21:08:14.000000000 +0000 +++ 1.71.0-6ubuntu8/debian/rules 2020-05-20 02:12:04.000000000 +0000 @@ -2,14 +2,28 @@ DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk + # Boost libraries for which we want separate packages # context is conditionally compiled because it is not supported yet on several architectures # coroutine, and fiber depend on context, so they are also conditionally compiled +ifeq ($(DEB_BUILD_ARCH), i386) +boost_libs := atomic chrono date-time filesystem \ + serialization system test thread +JAM_WITHOUT += --without-container --without-contract --without-exception \ + --without-graph --without-graph_parallel --without-iostreams \ + --without-locale --without-log --without-math --without-mpi \ + --without-program_options --without-random --without-regex \ + --without-stacktrace --without-timer --without-type_erasure \ + --without-wave +else boost_libs := atomic chrono container contract date-time exception filesystem \ graph graph-parallel iostreams locale log math mpi \ mpi-python program-options python random regex \ serialization stacktrace system test thread timer \ type-erasure wave +endif # these are special cases, where /usr/lib name differs from Boost library name boost_lib_log := log log_setup @@ -30,9 +44,6 @@ boost_suffixes_mpi-python := $(pyverids) # Files that are generated by filtering a template filtered_files = -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/default.mk - # set the number of build jobs ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) @@ -147,6 +158,7 @@ BUILD_CONTEXT = no else ifeq ($(DEB_BUILD_ARCH), i386) ifeq ($(DEB_VENDOR), Ubuntu) BUILD_NUMPY = no +BUILD_CONTEXT = no endif else ifeq ($(DEB_BUILD_ARCH), ia64) BUILD_CONTEXT = no @@ -208,10 +220,12 @@ endif override_dh_auto_build-common: $(b2) b2.1 bjam.1 $(JAM) $(JAM_WITHOUT) --without-python +ifneq ($(DEB_BUILD_ARCH), i386) set -e ; for pyver in $(pyversions); do \ echo "Building Boost.Python for python version $$pyver"; \ $(JAM) --build-dir=build-$$pyver --stagedir=stage-$$pyver --user-config=$(CURDIR)/user-config-$$pyver.jam --with-python --with-mpi python=$$pyver; \ done +endif cd $(bbv2dir) && ./bootstrap.sh --with-toolset=gcc cd tools/bcp && $(JAM) @@ -266,11 +280,13 @@ override_dh_install-arch: override_dh_in $(JAM) --prefix=$(CURDIR)/debian/tmp/usr $(JAM_WITHOUT) \ --libdir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) \ --without-python install +ifneq ($(DEB_BUILD_ARCH), i386) set -e ; for pyver in $(pyversions); do \ $(JAM) --build-dir=build-$$pyver --stagedir=stage-$$pyver --user-config=$(CURDIR)/user-config-$$pyver.jam --prefix=$(CURDIR)/debian/tmp/usr \ --libdir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) \ install --with-python --with-mpi python=$$pyver; \ done +endif find debian/tmp/usr/include debian/tmp/usr/share/boost-build -type f | xargs chmod 644 find debian/tmp -name .cvsignore | xargs rm -f @@ -335,11 +351,13 @@ override_dh_strip: override_dh_makeshlibs: dh_makeshlibs -plibboost-regex$(SOVERSION) -V '$(regexicuabi)' dh_makeshlibs --remaining-packages +ifneq ($(DEB_BUILD_ARCH), i386) sed -i -r 's/^(libboost_python([0-9]{2}) \S+ (\S+).*)$$/\1, \3-py\2/' debian/libboost-python$(SOVERSION)/DEBIAN/shlibs sed -i -r 's/^(libboost_mpi_python([0-9]{2}) \S+ (\S+).*)$$/\1, \3-py\2/' debian/libboost-mpi-python$(SOVERSION)/DEBIAN/shlibs ifeq ($(BUILD_NUMPY), yes) sed -i -r 's/^(libboost_numpy([0-9]{2}) \S+ (\S+).*)$$/\1, \3-py\2/' debian/libboost-numpy$(SOVERSION)/DEBIAN/shlibs endif +endif $(b2): cd tools/build && bison -y -d -o src/engine/jamgram.cpp src/engine/jamgram.y @@ -353,10 +371,12 @@ b2.1 bjam.1: $(b2) user-config.jam: echo $(TOOLSET_CONFIG) > $@ echo "using mpi ;" >> $@ +ifneq ($(DEB_BUILD_ARCH), i386) set -e ; for pyver in $(pyversions); do \ cp $@ user-config-$$pyver.jam; \ echo "using python : $$pyver : /usr ;" >> user-config-$$pyver.jam; \ done +endif echo "using boostbook ;" > user-config-doc.jam echo "using quickbook ;" >> user-config-doc.jam echo "using doxygen ;" >> user-config-doc.jam @@ -376,5 +396,7 @@ make-debhelper: clean-debhelper $(filter @echo usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Boost*-$(SOVERSION)* >> debian/libboost$(PKGVERSION)-dev.install @echo usr/lib/$(DEB_HOST_MULTIARCH)/cmake/boost_headers-$(SOVERSION)* >> debian/libboost$(PKGVERSION)-dev.install @$(call cp_debhelper,libboost-doc,libboost$(PKGVERSION)-doc) +ifneq ($(DEB_BUILD_ARCH), i386) @$(call cp_debhelper,libboost-python-dev,libboost-python$(PKGVERSION)-dev) @$(call cp_debhelper,libboost-mpi-python-dev,libboost-mpi-python$(PKGVERSION)-dev) +endif
  2. Download patch debian/control
  3. Download patch debian/patches/e0ba57928d681c9f8e0b28eef2a17973950b9e8b.patch
  4. Download patch debian/patches/series

    --- 1.71.0-6/debian/patches/series 2020-02-04 19:27:47.000000000 +0000 +++ 1.71.0-6ubuntu8/debian/patches/series 2020-05-20 01:06:15.000000000 +0000 @@ -15,3 +15,5 @@ fix-riscv64-non-pic.patch context-s390x.patch 36a81359f0af5607872d20d4fdc94e9bccdd0911.patch b90917eaedf5ef977dea8ab0f11a92e3e09a4cbb.patch +s390x-arch.patch +e0ba57928d681c9f8e0b28eef2a17973950b9e8b.patch
  5. Download patch debian/patches/s390x-arch.patch

    --- 1.71.0-6/debian/patches/s390x-arch.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.71.0-6ubuntu8/debian/patches/s390x-arch.patch 2020-05-20 01:06:15.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Add s390x to deducible jam architectures. +Author: Dimitri John Ledkov <xnox@ubuntu.com> + + +--- boost1.71-1.71.0.orig/boostcpp.jam ++++ boost1.71-1.71.0/boostcpp.jam +@@ -607,7 +607,7 @@ rule address-model ( ) + return <conditional>@boostcpp.deduce-address-model ; + } + +-local deducable-architectures = arm mips1 power sparc x86 combined ; ++local deducable-architectures = arm mips1 power sparc x86 s390x combined ; + feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ; + for a in $(deducable-architectures) + { +@@ -618,13 +618,14 @@ rule deduce-architecture ( properties * + { + local result ; + local filtered = [ toolset-properties $(properties) ] ; +- local names = arm mips1 power sparc x86 combined ; ++ local names = arm mips1 power sparc x86 s390x combined ; + local idx = [ configure.find-builds "default architecture" : $(filtered) + : /boost/architecture//arm + : /boost/architecture//mips1 + : /boost/architecture//power + : /boost/architecture//sparc + : /boost/architecture//x86 ++ : /boost/architecture//s390x + : /boost/architecture//combined ] ; + result = $(names[$(idx)]) ; +

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

Source: freeimage

freeimage (3.18.0+ds2-1ubuntu3) focal; urgency=medium * No-change rebuild for libgcc-s1 package name change. -- Matthias Klose <doko@ubuntu.com> Tue, 24 Mar 2020 15:03:52 +0100 freeimage (3.18.0+ds2-1ubuntu2) focal; urgency=medium * No-change rebuild against libilmbase24 and libopenexr24. -- Rik Mills <rikmills@kde.org> Mon, 02 Dec 2019 07:16:12 +0000 freeimage (3.18.0+ds2-1ubuntu1) disco; urgency=low * Merge from Debian unstable. Remaining changes: - debian/patches/Use-system-jpeg_read_icc_profile.patch: Use jpeg_read_icc_profile() from libjpeg. -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 31 Jan 2019 17:31:34 -0800

Modifications :
  1. Download patch debian/control

    --- 3.18.0+ds2-1/debian/control 2019-01-05 09:14:09.000000000 +0000 +++ 3.18.0+ds2-1ubuntu3/debian/control 2019-01-05 22:27:28.000000000 +0000 @@ -1,5 +1,6 @@ Source: freeimage -Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org> Uploaders: Anton Gladky <gladk@debian.org>, Ghislain Antony Vaillant <ghisvail@gmail.com> Section: libs
  2. Download patch debian/patches/series

    --- 3.18.0+ds2-1/debian/patches/series 2018-08-21 12:43:14.000000000 +0000 +++ 3.18.0+ds2-1ubuntu3/debian/patches/series 2019-01-05 22:27:28.000000000 +0000 @@ -7,3 +7,4 @@ Disable-testing-of-JPEG-transform.patch Disable-testing-of-JXR-MemIO.patch Fix-encoding-of-fi-header.patch Enable-substitution-of-pkg-config.patch +Use-system-jpeg_read_icc_profile.patch
  3. Download patch debian/patches/Use-system-jpeg_read_icc_profile.patch

    --- 3.18.0+ds2-1/debian/patches/Use-system-jpeg_read_icc_profile.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.18.0+ds2-1ubuntu3/debian/patches/Use-system-jpeg_read_icc_profile.patch 2018-11-15 05:03:26.000000000 +0000 @@ -0,0 +1,128 @@ +Description: Use jpeg_read_icc_profile() from libjpeg + Current version of libjpeg8-turbo provides jpeg_read_icc_profile(), which + means our static definition now conflicts with the system headers. Drop + the local implementation in favor of the (compatible) libjpeg one. +Author: Steve Langasek <steve.langasek@ubuntu.com> +Last-Modified: 2018-11-14 + +Index: freeimage-3.17.0+ds1/Source/FreeImage/PluginJPEG.cpp +=================================================================== +--- freeimage-3.17.0+ds1.orig/Source/FreeImage/PluginJPEG.cpp ++++ freeimage-3.17.0+ds1/Source/FreeImage/PluginJPEG.cpp +@@ -485,116 +485,6 @@ + } + + /** +- See if there was an ICC profile in the JPEG file being read; +- if so, reassemble and return the profile data. +- +- TRUE is returned if an ICC profile was found, FALSE if not. +- If TRUE is returned, *icc_data_ptr is set to point to the +- returned data, and *icc_data_len is set to its length. +- +- IMPORTANT: the data at **icc_data_ptr has been allocated with malloc() +- and must be freed by the caller with free() when the caller no longer +- needs it. (Alternatively, we could write this routine to use the +- IJG library's memory allocator, so that the data would be freed implicitly +- at jpeg_finish_decompress() time. But it seems likely that many apps +- will prefer to have the data stick around after decompression finishes.) +- +- NOTE: if the file contains invalid ICC APP2 markers, we just silently +- return FALSE. You might want to issue an error message instead. +-*/ +-static BOOL +-jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) { +- jpeg_saved_marker_ptr marker; +- int num_markers = 0; +- int seq_no; +- JOCTET *icc_data; +- unsigned total_length; +- +- const int MAX_SEQ_NO = 255; // sufficient since marker numbers are bytes +- BYTE marker_present[MAX_SEQ_NO+1]; // 1 if marker found +- unsigned data_length[MAX_SEQ_NO+1]; // size of profile data in marker +- unsigned data_offset[MAX_SEQ_NO+1]; // offset for data in marker +- +- *icc_data_ptr = NULL; // avoid confusion if FALSE return +- *icc_data_len = 0; +- +- /** +- this first pass over the saved markers discovers whether there are +- any ICC markers and verifies the consistency of the marker numbering. +- */ +- +- memset(marker_present, 0, (MAX_SEQ_NO + 1)); +- +- for(marker = cinfo->marker_list; marker != NULL; marker = marker->next) { +- if (marker_is_icc(marker)) { +- if (num_markers == 0) { +- // number of markers +- num_markers = GETJOCTET(marker->data[13]); +- } +- else if (num_markers != GETJOCTET(marker->data[13])) { +- return FALSE; // inconsistent num_markers fields +- } +- // sequence number +- seq_no = GETJOCTET(marker->data[12]); +- if (seq_no <= 0 || seq_no > num_markers) { +- return FALSE; // bogus sequence number +- } +- if (marker_present[seq_no]) { +- return FALSE; // duplicate sequence numbers +- } +- marker_present[seq_no] = 1; +- data_length[seq_no] = marker->data_length - ICC_HEADER_SIZE; +- } +- } +- +- if (num_markers == 0) +- return FALSE; +- +- /** +- check for missing markers, count total space needed, +- compute offset of each marker's part of the data. +- */ +- +- total_length = 0; +- for(seq_no = 1; seq_no <= num_markers; seq_no++) { +- if (marker_present[seq_no] == 0) { +- return FALSE; // missing sequence number +- } +- data_offset[seq_no] = total_length; +- total_length += data_length[seq_no]; +- } +- +- if (total_length <= 0) +- return FALSE; // found only empty markers ? +- +- // allocate space for assembled data +- icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET)); +- if (icc_data == NULL) +- return FALSE; // out of memory +- +- // and fill it in +- for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) { +- if (marker_is_icc(marker)) { +- JOCTET FAR *src_ptr; +- JOCTET *dst_ptr; +- unsigned length; +- seq_no = GETJOCTET(marker->data[12]); +- dst_ptr = icc_data + data_offset[seq_no]; +- src_ptr = marker->data + ICC_HEADER_SIZE; +- length = data_length[seq_no]; +- while (length--) { +- *dst_ptr++ = *src_ptr++; +- } +- } +- } +- +- *icc_data_ptr = icc_data; +- *icc_data_len = total_length; +- +- return TRUE; +-} +- +-/** + Read JPEG_APPD marker (IPTC or Adobe Photoshop profile) + */ + static BOOL
  1. boost-defaults
  2. boost1.71
  3. freeimage