6 files changed, 35 insertions, 33 deletions
diff --git a/debian/changelog b/debian/changelog
index 02ea115..1fd3aee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+shotwell (0.32.1-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #1034018, #1034011, #1034017):
+    - debian/rules:
+      + Replace unity-support with unity_support.
+    - debian/control: 
+      + Add libportal-gtk3-dev, libwebp-dev, and libsecret-1-dev to Build-Depends.
+      + Switch Build-Depends to libwebkit2gtk-4.1-dev.
+      + Add bump minimum release of libgexiv2-dev to >= 0.12.0-2~.
+    - Thanks to Jeremy Bícha <jeremy.bicha@canonical.com>.
+  * debian/control:
+    - Change to new repository.
+    - Move Build Depend webp-pixbuf-loader to Depends (Closes: #1034010)
+      + Thanks to Jeremy Bícha <jeremy.bicha@canonical.com>.
+  * debian/copyright:
+    - Add year 2023 to myself.
+    - Refresh for the new release.
+  * Declare compliance with Debian Policy 4.6.2.0 (No changes needed).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 16 Jun 2023 13:50:23 +0200
+
 shotwell (0.30.17-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 4a37625..c06501b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  libgcr-3-dev,
  libgdata-dev,
  libgee-0.8-dev (>= 0.10),
- libgexiv2-dev (>= 0.10.4),
+ libgexiv2-dev (>= 0.12.0-2~),
  libglib2.0-dev (>= 2.40),
  libgphoto2-dev (>= 2.5.4),
  libgstreamer-plugins-base1.0-dev (>= 1.0.0),
@@ -23,22 +23,24 @@ Build-Depends:
  libgudev-1.0-dev (>= 145),
  libicu-dev,
  libjson-glib-dev,
+ libportal-gtk3-dev,
  libraw-dev (>= 0.14),
  librest-dev (>= 0.7),
+ libsecret-1-dev,
  libsoup2.4-dev (>= 2.26.0),
  libsqlite3-dev (>= 3.5.9),
  libunity-dev,
- libwebkit2gtk-4.0-dev,
+ libwebkit2gtk-4.1-dev,
+ libwebp-dev,
  libxml2 (>= 2.6.32),
  meson,
  ninja-build,
- valac (>= 0.46.0),
- webp-pixbuf-loader
-Standards-Version: 4.6.1.0
+ valac (>= 0.46.0)
+Standards-Version: 4.6.2.0
 Rules-Requires-Root: binary-targets
 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-Git: git://git.jff.email/shotwell.git
+Vcs-Browser: https://git.jff.email/cgit/shotwell.git
 
 Package: shotwell
 Architecture: linux-any
@@ -48,7 +50,8 @@ Depends:
  shotwell-common (= ${source:Version}),
  dconf-cli,
  default-dbus-session-bus | dbus-session-bus,
- librsvg2-common
+ librsvg2-common,
+ webp-pixbuf-loader
 Replaces: shotwell-common (<< 0.26.2-1)
 Description: digital photo organizer
  Shotwell is a digital photo organizer designed for the GNOME desktop
diff --git a/debian/copyright b/debian/copyright
index c2b8612..7b7391c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ Copyright: 2009-2013 Yorba Foundation
            2010      Maxim Kartashev
            2013      Jens Bav
            2016-2019 Software Freedom Conservancy Inc.
-           2011-2022 the shotwell authors
+           2011-2023 the shotwell authors
 License: LGPL-2.1
 
 Files: plugins/shotwell-publishing/PhotosPublisher.vala
@@ -22,7 +22,7 @@ License: LGPL-2.1
 
 Files: debian/*
 Copyright: 2009-2011 Devid Antonio Filoni <d.filoni@ubuntu.com>
-           2014-2022 Jörg Frings-Fürst <debian@jff.email>
+           2014-2023 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+
 
 License: LGPL-2.1
diff --git a/debian/patches/0100-webp.patch b/debian/patches/0100-webp.patch
deleted file mode 100644
index 2686139..0000000
--- a/debian/patches/0100-webp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: data: Declare support for WebP and GIF in viewer
-Author: Jens Georg <mail@jensge.org>
-Origin: upstream, https://gitlab.gnome.org/GNOME/shotwell/-/commit/82c6707284bd590c5813691d602d87d8d237ac00
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1018025
-Forwarded: no
-Last-Update: 2022-10-02
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/misc/shotwell-viewer.desktop.in b/misc/shotwell-viewer.desktop.in
-index b5e41f3..20b2f6e 100644
---- a/misc/shotwell-viewer.desktop.in
-+++ b/misc/shotwell-viewer.desktop.in
-@@ -8,7 +8,7 @@ Icon=shotwell
- Terminal=false
- NoDisplay=true
- Type=Application
--MimeType=image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f;
-+MimeType=image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f;image/gif;image/webp
- Categories=Graphics;Viewer;Photography;GNOME;GTK;
- X-GIO-NoFuse=true
- X-GNOME-Gettext-Domain=shotwell
diff --git a/debian/patches/series b/debian/patches/series
index f7b4a86..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0100-webp.patch
diff --git a/debian/rules b/debian/rules
index e8ca0d5..38a3150 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ endif
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	    --libexec=/usr/libexec \
-	    -Dunity-support=true $(APPORT)
+	    -Dunity_support=true $(APPORT)
 
 override_dh_gnome_clean:
 	dh_gnome_clean --no-control