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: boost1.67

boost1.67 (1.67.0-13ubuntu2) focal; urgency=medium * No-change rebuild to build with python3.8. -- Matthias Klose <doko@ubuntu.com> Fri, 18 Oct 2019 18:37:33 +0000 boost1.67 (1.67.0-13ubuntu1) eoan; urgency=medium [ Dimitri John Ledkov ] * Remove myself from uploaders. * Provide and Encode icuabi in libboost-regex shlibdeps. [ Giovanni Mascellani ] * Add -contract as dependency of -dev-all. -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 12 Mar 2019 03:44:54 +0000

Modifications :
  1. Download patch debian/rules

    --- 1.67.0-13/debian/rules 2019-02-04 14:24:57.000000000 +0000 +++ 1.67.0-13ubuntu2/debian/rules 2019-03-12 03:44:54.000000000 +0000 @@ -53,6 +53,8 @@ version_major := $(shell echo $(version_ PKGVERSION = $(version_major) SOVERSION = $(version_upstream) +icuabi = $(shell apt show libicu-dev 2>/dev/null | sed -n 's/Depends: .*libicu\([0-9]*\) .*/\1/p') +regexicuabi = libboost-regex$(SOVERSION)-icu$(icuabi) # Function to map Boost component name to set of shared library names # Input: Boost component name @@ -285,6 +287,8 @@ override_dh_install-arch: override_dh_in echo 'boost:Provides=' $(foreach verid,$(pyverids),libboost-python$(SOVERSION)-py$(verid),) >> debian/libboost-python$(SOVERSION).substvars echo 'boost:Provides=' $(foreach verid,$(pyverids),libboost-mpi-python$(SOVERSION)-py$(verid),) >> debian/libboost-mpi-python$(SOVERSION).substvars echo 'boost:Provides=' $(foreach verid,$(pyverids),libboost-numpy$(SOVERSION)-py$(verid),) >> debian/libboost-numpy$(SOVERSION).substvars + # Write substvars for Regex (icu abi) + echo 'boost:Provides=$(regexicuabi)' >> debian/libboost-regex$(SOVERSION).substvars # package libboost$(PKGVERSION)-dev dh_install -plibboost$(PKGVERSION)-dev \ @@ -405,7 +409,7 @@ override_dh_strip: dh_strip --dbgsym-migration='libboost1.55-dbg, libboost1.58-dbg, libboost1.61-dbg' override_dh_makeshlibs: - dh_makeshlibs -plibboost-regex1.67.0 -V 'libboost-regex1.67.0 (>= 1.67.0-10)' + dh_makeshlibs -plibboost-regex$(SOVERSION) -V '$(regexicuabi)' dh_makeshlibs --remaining-packages $(bjam):
  2. Download patch debian/control

    --- 1.67.0-13/debian/control 2019-02-04 14:25:03.000000000 +0000 +++ 1.67.0-13ubuntu2/debian/control 2019-03-12 03:44:54.000000000 +0000 @@ -2,11 +2,11 @@ Source: boost1.67 Homepage: https://www.boost.org/ Section: libs Priority: optional -Maintainer: Debian Boost Team <team+boost@tracker.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Boost Team <team+boost@tracker.debian.org> Uploaders: Steve M. Robbins <smr@debian.org>, Giovanni Mascellani <gio@debian.org>, - Dimitri John Ledkov <xnox@ubuntu.com>, Anton Gladky <gladk@debian.org> Build-Depends: debhelper (>= 10~), dpkg-dev (>= 1.16.1~), dctrl-tools, chrpath, zlib1g-dev, libbz2-dev, libicu-dev (>= 63.1), mpi-default-dev, @@ -32,6 +32,7 @@ Suggests: libboost1.67-doc, libboost-chrono1.67-dev, libboost-container1.67-dev, libboost-context1.67-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel powerpc ppc64el], + libboost-contract1.67-dev, libboost-coroutine1.67-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel powerpc ppc64el], libboost-date-time1.67-dev, libboost-exception1.67-dev, @@ -1138,6 +1139,7 @@ Section: libs Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Breaks: ceph-common (= 12.2.8+dfsg1-1), ceph-common (= 12.2.8+dfsg1-2), nheko (= 0.6.1-1) +Provides: ${boost:Provides} Description: regular expression library for C++ This package forms part of the Boost C++ Libraries collection. .

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

Source: freeimage

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-1ubuntu1/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-1ubuntu1/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-1ubuntu1/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. boost1.67
  2. freeimage