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

ebview (0.3.6.2-2ubuntu1) disco; urgency=medium * Merge from Debian unstable. Remaining changes: - debian/ebview.desktop: + Remove value "Application;GTK;" for key "Categories" in group "Desktop Entry" (deprecated). + Add value "Office;Utility;TextTools;" for key "Categories" in group "Desktop Entry" to match current desktop menu specification. -- Logan Rosen <logan@ubuntu.com> Tue, 27 Nov 2018 22:48:01 -0500

Modifications :
  1. Download patch debian/control

    --- 0.3.6.2-2/debian/control 2018-11-04 15:12:52.000000000 +0000 +++ 0.3.6.2-2ubuntu1/debian/control 2018-11-28 03:48:01.000000000 +0000 @@ -1,7 +1,8 @@ Source: ebview Section: text Priority: optional -Maintainer: Debian QA Group <packages@qa.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org> Build-Depends: debhelper (>= 10), docbook-to-man, libeb16-dev,
  2. Download patch debian/ebview.desktop

    --- 0.3.6.2-2/debian/ebview.desktop 2018-11-04 15:12:52.000000000 +0000 +++ 0.3.6.2-2ubuntu1/debian/ebview.desktop 2018-11-28 03:47:52.000000000 +0000 @@ -8,4 +8,4 @@ Exec=/usr/bin/ebview StartupNotify=true Terminal=false Type=Application -Categories=Application;GTK;Utility;Dictionary; +Categories=Office;Utility;TextTools;Dictionary;

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

Source: orthanc-webviewer

orthanc-webviewer (2.5-2ubuntu4) focal; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Thu, 05 Mar 2020 08:55:08 +0100 orthanc-webviewer (2.5-2ubuntu3) focal; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Tue, 03 Mar 2020 21:22:30 +0100 orthanc-webviewer (2.5-2ubuntu2) focal; urgency=medium * No-change rebuild against libboost-regex1.71.0-icu65 -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 13 Feb 2020 19:03:53 +0000 orthanc-webviewer (2.5-2ubuntu1) focal; urgency=medium * Use orthanc from the archive, rather than included copy of code. * Cherrypick ftbfs from bitbucket. -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 06 Feb 2020 02:03:32 +0000 orthanc-webviewer (2.5-2build1) focal; urgency=medium * No change rebuild against new boost1.71 ABI -- Dimitri John Ledkov <xnox@ubuntu.com> Sun, 02 Feb 2020 20:24:09 +0100

Modifications :
  1. Download patch debian/rules

    --- 2.5-2/debian/rules 2019-11-14 11:09:58.000000000 +0000 +++ 2.5-2ubuntu4/debian/rules 2020-02-06 02:03:32.000000000 +0000 @@ -13,6 +13,9 @@ export DEB_BUILD_MAINT_OPTIONS := harden export DEB_CFLAGS_MAINT_APPEND=-DNDEBUG export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG +MIRROR=$(shell sed -n 's|.* \(http://[a-z./]*\) .*|\1|p' /etc/apt/sources.list | head -n1) +FILENAME=$(shell apt-cache show orthanc | grep Filename | cut -d\ -f2 | head -n1 | sed 's|_[a-z0-9]*.deb|.dsc|') + %: dh $@ --builddirectory=Build @@ -20,13 +23,16 @@ CMAKE_EXTRA_FLAGS += \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DSTATIC_BUILD:BOOL=OFF \ -DSTANDALONE_BUILD:BOOL=ON \ + -DORTHANC_FRAMEWORK_SOURCE=path \ + -DORTHANC_FRAMEWORK_ROOT=$(CURDIR)/ThirdPartyDownloads/orthanc \ -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE:BOOL=ON \ -DCMAKE_BUILD_TYPE=None # The build type must be set to None, see #711515 override_dh_auto_configure: # Put 3rd party packages where the cmake build system expects them mkdir -p ThirdPartyDownloads - ( cd ThirdPartyDownloads; cp ../debian/ThirdPartyDownloads/Orthanc-1.5.5.tar.gz . ) + ( cd ThirdPartyDownloads ; \ + apt-get source orthanc || HOME=$(CURDIR)/ThirdPartyDownloads dget --allow-unauthenticated $(MIRROR)/$(FILENAME) ; mv orthanc-* orthanc ) # Place the third-party JavaScript libraries at the location # expected by CMake
  2. Download patch debian/control

    --- 2.5-2/debian/control 2019-11-14 11:10:53.000000000 +0000 +++ 2.5-2ubuntu4/debian/control 2020-02-06 02:01:31.000000000 +0000 @@ -1,10 +1,13 @@ Source: orthanc-webviewer -Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org> Uploaders: Sebastien Jodogne <s.jodogne@gmail.com> Section: science Priority: optional Build-Depends: cmake, debhelper (>= 10), + devscripts, + curl, libboost-all-dev, libgdcm-dev, libgtest-dev,
  3. Download patch debian/patches/ftbfs.patch

    --- 2.5-2/debian/patches/ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.5-2ubuntu4/debian/patches/ftbfs.patch 2020-01-31 16:41:47.000000000 +0000 @@ -0,0 +1,19 @@ +# HG changeset patch +# User Sebastien Jodogne <s.jodogne@gmail.com> +# Date 1574949932 -3600 +# Node ID 3aae28985514f10192874b242dcdeb1ba8a68228 +# Parent 5d15a86bad2695ca820c980db46ad645c9e1913c +missing include + +diff --git a/Plugin/Cache/CacheManager.h b/Plugin/Cache/CacheManager.h +--- a/Plugin/Cache/CacheManager.h ++++ b/Plugin/Cache/CacheManager.h +@@ -26,6 +26,8 @@ + + #include <orthanc/OrthancCPlugin.h> + ++#include <boost/shared_ptr.hpp> ++ + namespace OrthancPlugins + { + enum CacheProperty
  4. Download patch debian/patches/series

    --- 2.5-2/debian/patches/series 2019-11-14 11:09:58.000000000 +0000 +++ 2.5-2ubuntu4/debian/patches/series 2020-02-06 02:03:32.000000000 +0000 @@ -1 +1,3 @@ cmake +ftbfs.patch +ftbfs-jpeg.patch
  5. Download patch debian/patches/ftbfs-jpeg.patch

    --- 2.5-2/debian/patches/ftbfs-jpeg.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.5-2ubuntu4/debian/patches/ftbfs-jpeg.patch 2020-01-31 16:41:47.000000000 +0000 @@ -0,0 +1,43 @@ +# HG changeset patch +# User Sebastien Jodogne <s.jodogne@gmail.com> +# Date 1553247251 -3600 +# Node ID 47d52db10369cf5b81fe4af626aa1923511c0ca7 +# Parent c2d729329fc7d9186681e2a2a177161acc4bed19 +fix + +diff --git a/Plugin/DecodedImageAdapter.cpp b/Plugin/DecodedImageAdapter.cpp +--- a/Plugin/DecodedImageAdapter.cpp ++++ b/Plugin/DecodedImageAdapter.cpp +@@ -28,7 +28,6 @@ + #include <Core/OrthancException.h> + #include <Core/Toolbox.h> + #include <Plugins/Samples/GdcmDecoder/OrthancImageWrapper.h> +-#include <Resources/ThirdParty/base64/base64.h> + + #include <boost/lexical_cast.hpp> + #include <boost/algorithm/string/predicate.hpp> +@@ -363,8 +362,10 @@ + + std::string z; + CompressUsingDeflate(z, image.GetContext(), converted.GetConstBuffer(), converted.GetSize()); +- +- result["Orthanc"]["PixelData"] = base64_encode(z); ++ ++ std::string s; ++ Orthanc::Toolbox::EncodeBase64(s, z); ++ result["Orthanc"]["PixelData"] = s; + + return true; + } +@@ -484,7 +485,10 @@ + std::string jpeg; + WriteJpegToMemory(jpeg, image.GetContext(), converted, quality); + +- result["Orthanc"]["PixelData"] = base64_encode(jpeg); ++ std::string s; ++ Orthanc::Toolbox::EncodeBase64(s, jpeg); ++ result["Orthanc"]["PixelData"] = s; ++ + return true; + } + }
  6. Download patch debian/source/include-binaries

    --- 2.5-2/debian/source/include-binaries 2019-11-14 11:09:58.000000000 +0000 +++ 2.5-2ubuntu4/debian/source/include-binaries 2020-02-06 02:00:48.000000000 +0000 @@ -15,4 +15,3 @@ debian/JS/jsPanel-2.3.3/images/icon-spri debian/JS/jsPanel-2.3.3/images/icon-sprite-32x32.jpg debian/JS/jsPanel-2.3.3/images/resize-handle.png debian/JS/jsPanel-2.3.3/images/ui-icons_454545_256x240.png -debian/ThirdPartyDownloads/Orthanc-1.5.5.tar.gz Binary files 2.5-2/debian/ThirdPartyDownloads/Orthanc-1.5.5.tar.gz and 2.5-2ubuntu4/debian/ThirdPartyDownloads/Orthanc-1.5.5.tar.gz differ
  1. ebview
  2. orthanc-webviewer