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

shotwell (0.30.10-0ubuntu1) groovy; urgency=medium * New upstream version -- Sebastien Bacher <seb128@ubuntu.com> Tue, 09 Jun 2020 17:36:30 +0200 shotwell (0.30.9-0ubuntu1) groovy; urgency=medium * New upstream version * debian/patches/git_warnings_build.patch: - removed, included in the new version -- Sebastien Bacher <seb128@ubuntu.com> Wed, 06 May 2020 21:28:58 +0200 shotwell (0.30.8-0ubuntu2) focal; urgency=medium * debian/patches/git_warnings_build.patch: - backport an upstream patch to not fail the build on warning, fixes the build with the new vala serie -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 Mar 2020 12:30:37 +0100 shotwell (0.30.8-0ubuntu1) focal; urgency=medium * New upstream version -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 Mar 2020 11:37:00 +0100 shotwell (0.30.7-0ubuntu1) eoan; urgency=medium * New upstream version -- Sebastien Bacher <seb128@ubuntu.com> Wed, 21 Aug 2019 12:37:09 +0200 shotwell (0.30.6-0ubuntu1) eoan; urgency=medium * New upstream version -- Sebastien Bacher <seb128@ubuntu.com> Tue, 20 Aug 2019 16:02:36 +0200 shotwell (0.30.5-0ubuntu1) eoan; urgency=medium * New upstream version * Drop upstreamed patch: debian/patches/git_glib_bindingflags.patch -- Olivier Tilloy <olivier.tilloy@canonical.com> Wed, 14 Aug 2019 13:48:18 +0200 shotwell (0.30.2-0ubuntu2) disco; urgency=medium * debian/patches/git_glib_bindingflags.patch - Fix references to GLib.BindingFlags (LP: #1823437) -- Ken VanDine <ken.vandine@canonical.com> Tue, 09 Apr 2019 10:11:48 -0400 shotwell (0.30.2-0ubuntu1) disco; urgency=medium * New upstream version - Fix issues with google and flickr not being able to log in (lp: #1620336) * debian/patches/git_notification_segfault.patch: - removed, that change is in the new version -- Sebastien Bacher <seb128@ubuntu.com> Wed, 20 Feb 2019 17:25:41 +0100 shotwell (0.30.1-0ubuntu5) disco; urgency=medium * No-change rebuild against latest libraw -- Jeremy Bicha <jbicha@ubuntu.com> Fri, 09 Nov 2018 16:37:50 -0500 shotwell (0.30.1-0ubuntu4) disco; urgency=medium * debian/patches/git_notification_segfault.patch: - direct: Fix crash when dismissing modifications (lp: #1723181) -- Sebastien Bacher <seb128@ubuntu.com> Wed, 07 Nov 2018 15:39:16 +0100 shotwell (0.30.1-0ubuntu2) cosmic; urgency=medium * No change rebuild for launchpad import -- Sebastien Bacher <seb128@ubuntu.com> Tue, 09 Oct 2018 11:26:09 +0200 shotwell (0.30.1-0ubuntu1) cosmic; urgency=medium * New bugfixes version -- Sebastien Bacher <seb128@ubuntu.com> Wed, 03 Oct 2018 17:19:08 +0200 shotwell (0.30.0-0ubuntu1) cosmic; urgency=medium * New upstream version -- Sebastien Bacher <seb128@ubuntu.com> Mon, 17 Sep 2018 11:35:07 +0200 shotwell (0.29.91-0ubuntu1) cosmic; urgency=medium * New upstream version (lp: #1787022): - Fix Slideshow settings dialog (lp: #1772878) * debian/control: updated gtk requirement * debian/patches/0105-gitversion.patch: - remove buggy debian change, the define is correct * debian/shotwell.docs: - updated for the new version -- Sebastien Bacher <seb128@ubuntu.com> Thu, 23 Aug 2018 11:03:07 +0200 shotwell (0.28.4-1ubuntu1) cosmic; urgency=medium * Sync with Debian. Remaining changes: - Don't clutter up debian/ with old, disabled patches - Clean up rules - Install Appstream metadata - Build with meson - Build with gnome-pkg-tools - Build with Unity support - clean out thumbnailer hacks: that's not user friendly and not something we should recommend -- Jeremy Bicha <jbicha@debian.org> Tue, 14 Aug 2018 15:52:14 -0400

Modifications :
  1. Download patch debian/shotwell.README.Debian

    --- 0.30.10-1/debian/shotwell.README.Debian 2015-04-06 04:27:22.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/shotwell.README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -TROUBLESHOOTING ---------------- - -- video-thumbnailer - - On problems with the shotwell-video-thumbnailer you can - switch to the ffmpegthumnailer. Please run as root: - - 1. Backup /usr/lib/shotwell-video-thumbnailer: - * mv /usr/lib/shotwell-video-thumbnailer /usr/lib/shotwell-video-thumbnailer.org - - 2. Install ffmpegthumbnailer: - * apt-get install ffmpegthumbnailer - - 3. Create a new executable file: - * touch /usr/lib/shotwell-video-thumbnailer - * chmod --reference=/usr/lib/shotwell-video-thumbnailer.org /usr/lib/shotwell-video-thumbnailer - - 4. Write into the new file: - * echo "#! /bin/bash" >/usr/lib/shotwell-video-thumbnailer - * echo "ffmpegthumnailer -i \"$1\" -o -b -c png >>/usr/lib/shotwell-video-thumbnailer - - Or you can use the file replace_thumbnail.sh from the examples directory. - - Thanks to Teo Romera <teoromera@gmail.com>
  2. Download patch debian/shotwell-common.postrm

    --- 0.30.10-1/debian/shotwell-common.postrm 2016-08-20 21:08:13.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/shotwell-common.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - - -case "$1" in - purge|remove) - - # - # rebuild icon cache - # - if [ -x gtk-update-icon-cache ] ; then - gtk-update-icon-cache /usr/share/icons/hicolor - fi - -esac - -#DEBHELPER#
  3. Download patch debian/rules

    --- 0.30.10-1/debian/rules 2019-10-07 14:14:43.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/rules 2020-06-09 15:36:10.000000000 +0000 @@ -2,17 +2,14 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) - %: - dh $@ --buildsystem=meson --with gnome + dh $@ --with gnome --buildsystem=meson + +override_dh_auto_configure: + dh_auto_configure -- \ + --libexec=/usr/lib \ + -Denable-unity-support=true \ + -Dinstall-apport-hook=true override_dh_gnome_clean: dh_gnome_clean --no-control - -override_dh_install: - dh_install - # Remove unwanted la files - rm -f debian/shotwell/usr/lib/*/shotwell/plugins/builtin/*.la - rm -f debian/shotwell/usr/lib/*/*shotwell*.a - rm -f debian/shotwell/usr/lib/*/*shotwell*.la
  4. Download patch debian/dirs

    --- 0.30.10-1/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/dirs 2020-06-09 15:36:10.000000000 +0000 @@ -0,0 +1,6 @@ +/usr +/usr/bin +/usr/lib/shotwell/plugins/builtin +/usr/share/applications +/usr/share/locale-langpack +/usr/share/gnome/help/shotwell
  5. Download patch debian/compat

    --- 0.30.10-1/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/compat 2020-06-09 15:36:10.000000000 +0000 @@ -0,0 +1 @@ +11
  6. Download patch debian/control

    --- 0.30.10-1/debian/control 2020-05-25 19:04:45.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/control 2020-06-09 15:36:10.000000000 +0000 @@ -1,11 +1,11 @@ Source: shotwell Section: gnome Priority: optional -Maintainer: Jörg Frings-Fürst <debian@jff.email> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Jörg Frings-Fürst <debian@jff.email> Build-Depends: appstream-util, - cmake, - debhelper-compat (= 13), + debhelper (>= 11.1.3), desktop-file-utils, gnome-pkg-tools, itstool, @@ -19,7 +19,7 @@ Build-Depends: libgphoto2-dev (>= 2.5.4), libgstreamer-plugins-base1.0-dev (>= 1.0.0), libgstreamer1.0-dev (>= 1.0.0), - libgtk-3-dev (>= 3.14), + libgtk-3-dev (>= 3.22), libgudev-1.0-dev (>= 145), libicu-dev, libjson-glib-dev, @@ -27,16 +27,17 @@ Build-Depends: librest-dev (>= 0.7), libsoup2.4-dev (>= 2.26.0), libsqlite3-dev (>= 3.5.9), + libunity-dev, libwebkit2gtk-4.0-dev, libxml2 (>= 2.6.32), meson, - ninja-build, - valac (>= 0.46.0) -Standards-Version: 4.5.0 -Rules-Requires-Root: binary-targets + valac (>= 0.22.0) +Standards-Version: 4.1.5 Homepage: https://wiki.gnome.org/Apps/Shotwell -Vcs-Git: git://jff.email/opt/git/shotwell.git -Vcs-Browser: https://jff.email/cgit/shotwell.git +Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/ubuntu/+source/shotwell/+git/shotwell +Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/shotwell +XS-Debian-Vcs-Git: git://jff.email/opt/git/shotwell.git +XS-Debian-Vcs-Browser: https://jff.email/cgit/shotwell.git Package: shotwell Architecture: linux-any
  7. Download patch debian/menu

    --- 0.30.10-1/debian/menu 1970-01-01 00:00:00.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/menu 2020-06-09 15:36:10.000000000 +0000 @@ -0,0 +1,2 @@ +?package(shotwell):needs="X11" section="Applications/Viewers"\ + title="Shotwell" command="/usr/bin/shotwell"
  8. Download patch debian/shotwell.examples

    --- 0.30.10-1/debian/shotwell.examples 2015-01-22 18:12:37.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/shotwell.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/replace_thumbnailer.sh
  9. Download patch debian/shotwell.docs

    --- 0.30.10-1/debian/shotwell.docs 2018-10-01 05:17:17.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/shotwell.docs 2020-06-09 15:36:10.000000000 +0000 @@ -1,3 +1,3 @@ -README.md THANKS NEWS +
  10. Download patch debian/shotwell.manpages

    --- 0.30.10-1/debian/shotwell.manpages 2020-05-25 18:40:18.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/shotwell.manpages 2020-06-09 15:36:10.000000000 +0000 @@ -1,2 +1 @@ -usr/share/man/man1/shotwell.1 - +help/shotwell.1
  11. Download patch debian/patches/0100-ios8.patch

    --- 0.30.10-1/debian/patches/0100-ios8.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/patches/0100-ios8.patch 2020-06-09 15:36:10.000000000 +0000 @@ -0,0 +1,103 @@ +Description: Reset iOS 8 devices to download files +Origin: https://bugzilla.gnome.org/show_bug.cgi?id=742295#c22 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=742295 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792016 +Last-Update: 2016-11-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/camera/ImportPage.vala +=================================================================== +--- trunk.orig/src/camera/ImportPage.vala ++++ trunk/src/camera/ImportPage.vala +@@ -773,6 +773,15 @@ public class ImportPage : CheckerboardPa + ~ImportPage() { + LibraryPhoto.global.contents_altered.disconnect(on_media_added_removed); + Video.global.contents_altered.disconnect(on_media_added_removed); ++ ++ // iOS 8 issue. Release the camera here ++ if (camera != null) { ++ GPhoto.Result res = camera.exit(spin_idle_context.context); ++ if (res != GPhoto.Result.OK) { ++ // log but don't fail ++ warning("ImportPage destructor: Unable to unlock camera: %s", res.to_full_string()); ++ } ++ } + } + + public override Gtk.Toolbar get_toolbar() { +@@ -1162,11 +1171,14 @@ public class ImportPage : CheckerboardPa + update_status(busy, false); + + refresh_error = null; +- refresh_result = camera.init(spin_idle_context.context); +- if (refresh_result != GPhoto.Result.OK) { +- warning("Unable to initialize camera: %s", refresh_result.to_full_string()); +- +- return (refresh_result == GPhoto.Result.IO_LOCK) ? RefreshResult.LOCKED : RefreshResult.LIBRARY_ERROR; ++ // iOS 8 issue ++ if (camera == null) { ++ refresh_result = camera.init(spin_idle_context.context); ++ if (refresh_result != GPhoto.Result.OK) { ++ warning("Unable to initialize camera: %s", refresh_result.to_full_string()); ++ ++ return (refresh_result == GPhoto.Result.IO_LOCK) ? RefreshResult.LOCKED : RefreshResult.LIBRARY_ERROR; ++ } + } + + update_status(true, refreshed); +@@ -1271,13 +1283,15 @@ public class ImportPage : CheckerboardPa + progress_bar.set_ellipsize(Pango.EllipsizeMode.NONE); + progress_bar.set_text(""); + progress_bar.set_fraction(0.0); +- ++ ++#if 0 + GPhoto.Result res = camera.exit(spin_idle_context.context); + if (res != GPhoto.Result.OK) { + // log but don't fail + warning("Unable to unlock camera: %s", res.to_full_string()); + } +- ++#endif ++ + if (refresh_result == GPhoto.Result.OK) { + if (import_sources.get_count () == 0) { + this.set_page_message (this.get_view_empty_message ()); +@@ -1646,11 +1660,15 @@ public class ImportPage : CheckerboardPa + } + + private void import(Gee.Iterable<DataObject> items) { +- GPhoto.Result res = camera.init(spin_idle_context.context); +- if (res != GPhoto.Result.OK) { +- AppWindow.error_message(_("Unable to lock camera: %s").printf(res.to_full_string())); +- +- return; ++ // We now keep the camera open as long as we can to ++ // work around the iOS 8 directory name shuffling issue. ++ if (camera == null) { ++ GPhoto.Result res = camera.init(spin_idle_context.context); ++ if (res != GPhoto.Result.OK) { ++ AppWindow.error_message(_("Unable to lock camera: %s").printf(res.to_full_string())); ++ ++ return; ++ } + } + + update_status(true, refreshed); +@@ -1786,12 +1804,15 @@ public class ImportPage : CheckerboardPa + } + + private void close_import() { ++// iOS 8 issue ++#if 0 + GPhoto.Result res = camera.exit(spin_idle_context.context); + if (res != GPhoto.Result.OK) { + // log but don't fail + message("Unable to unlock camera: %s", res.to_full_string()); + } +- ++#endif ++ + update_status(false, refreshed); + + on_view_changed();
  12. Download patch debian/patches/series

    --- 0.30.10-1/debian/patches/series 2020-05-25 18:54:53.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/patches/series 2020-06-09 15:36:10.000000000 +0000 @@ -1 +1,3 @@ -0105-gitversion.patch +# Rebase or drop this patch +# 0100-ios8.patch +
  13. Download patch debian/shotwell.install

    --- 0.30.10-1/debian/shotwell.install 2020-05-25 18:33:47.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/shotwell.install 2020-06-09 15:36:10.000000000 +0000 @@ -2,6 +2,3 @@ usr/bin usr/lib usr/share/applications usr/share/metainfo -usr/libexec/shotwell/shotwell-settings-migrator -usr/libexec/shotwell/shotwell-video-thumbnailer -usr/share/apport/package-hooks/shotwell.py
  14. Download patch debian/replace_thumbnailer.sh

    --- 0.30.10-1/debian/replace_thumbnailer.sh 2015-01-22 18:05:02.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/replace_thumbnailer.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#! /bin/bash - -if [ -e /usr/lib/shotwell-video-thumbnailer.org ] ; then - echo ' /usr/lib/shotwell-video-thumbnailer.org exists!' - echo ' break' - exit 1 -fi - -echo '**** backup ****' -mv /usr/lib/shotwell-video-thumbnailer /usr/lib/shotwell-video-thumbnailer.org - -echo '**** install ffmpegthumbnailer ****' -apt-get install ffmpegthumbnailer -y - -echo '**** install new file ****' -touch /usr/lib/shotwell-video-thumbnailer -chmod --reference=/usr/lib/shotwell-video-thumbnailer.org /usr/lib/shotwell-video-thumbnailer - -echo '#! /bin/bash' >/usr/lib/shotwell-video-thumbnailer -echo '' >>/usr/lib/shotwell-video-thumbnailer -echo 'ffmpegthumbnailer -i "$1" -o - -c png' >>/usr/lib/shotwell-video-thumbnailer
  15. Download patch debian/docs

    --- 0.30.10-1/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/docs 2020-06-09 15:36:10.000000000 +0000 @@ -0,0 +1,3 @@ +NEWS +README +THANKS
  16. Download patch debian/shotwell.postrm

    --- 0.30.10-1/debian/shotwell.postrm 2016-06-05 12:30:38.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/shotwell.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = purge ]; then - - # - # remove backup files - # - if [ -e /usr/lib/shotwell-video-thumbnailer.org ] ; then - rm -f /usr/lib/shotwell-video-thumbnailer.org - fi -fi - -#DEBHELPER#
  17. Download patch debian/patches/0105-gitversion.patch

    --- 0.30.10-1/debian/patches/0105-gitversion.patch 2018-07-09 10:10:39.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/patches/0105-gitversion.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Description: Typo in git version macro -Author: Jörg Fringy-Fürst <debian@jff.email> -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=795719 -Last-Update: 2018-05-01 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/Resources.vala -=================================================================== ---- trunk.orig/src/Resources.vala -+++ trunk/src/Resources.vala -@@ -18,7 +18,7 @@ namespace Resources { - public const string APP_DIRECT_ROLE = _("Photo Viewer"); - public const string APP_VERSION = _VERSION; - --#if _GITVERSION -+#if _GIT_VERSION - public const string? GIT_VERSION = _GIT_VERSION; - #else - public const string? GIT_VERSION = null;
  18. Download patch debian/gbp.conf

    --- 0.30.10-1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/gbp.conf 2020-06-09 15:36:10.000000000 +0000 @@ -0,0 +1,5 @@ +[DEFAULT] +pristine-tar = True +debian-branch = ubuntu/master +debian-tag = ubuntu/%(version)s +upstream-branch = upstream
  19. Download patch debian/copyright
  20. Download patch debian/shotwell-common.README.Debian

    --- 0.30.10-1/debian/shotwell-common.README.Debian 2015-04-06 04:27:22.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/shotwell-common.README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -TROUBLESHOOTING ---------------- - -- video-thumbnailer - - On problems with the shotwell-video-thumbnailer you can - switch to the ffmpegthumnailer. Please run as root: - - 1. Backup /usr/lib/shotwell-video-thumbnailer: - * mv /usr/lib/shotwell-video-thumbnailer /usr/lib/shotwell-video-thumbnailer.org - - 2. Install ffmpegthumbnailer: - * apt-get install ffmpegthumbnailer - - 3. Create a new executable file: - * touch /usr/lib/shotwell-video-thumbnailer - * chmod --reference=/usr/lib/shotwell-video-thumbnailer.org /usr/lib/shotwell-video-thumbnailer - - 4. Write into the new file: - * echo "#! /bin/bash" >/usr/lib/shotwell-video-thumbnailer - * echo "ffmpegthumnailer -i \"$1\" -o -b -c png >>/usr/lib/shotwell-video-thumbnailer - - Or you can use the file replace_thumbnail.sh from the examples directory. - - Thanks to Teo Romera <teoromera@gmail.com>
  21. Download patch debian/shotwell.lintian-overrides

    --- 0.30.10-1/debian/shotwell.lintian-overrides 2019-07-12 14:16:34.000000000 +0000 +++ 0.30.10-0ubuntu1/debian/shotwell.lintian-overrides 2020-06-09 15:36:10.000000000 +0000 @@ -1,2 +1 @@ non-dev-pkg-with-shlib-symlink -package-name-doesnt-match-sonames libshotwell-authenticator0 libshotwell-plugin-common0 libshotwell-plugin-dev-1.0-0
  1. shotwell