Merge branch 'release/debian/0.32.1-2'debian/0.32.1-2

3 files changed, 38 insertions, 28 deletions

diff --git a/debian/changelog b/debian/changelog
index 1fd3aee..5bda615 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,27 @@
+shotwell (0.32.1-2) unstable; urgency=medium
+
+  * debian/rules (Closes: #1039719):
+    - Drop unnecessary libexec configure option.
+    - Update apport configuration option name.
+    - Drop obsolete override_dh_install.
+  * Replace Build-Depend gnome-pkg-tools with dh-sequence-gnome:
+    - debian/rules:
+      + Remove --with gnome.
+    - debian/control:
+      + Replace gnome-pkg-tools with dh-sequence-gnome.
+  * debian/control:
+    - Drop the Build-Depends libsoup2.4-dev (Closes: #1039715).
+    - Add Depend xdg-desktop-portal-backend (Closes: #1039716).
+    - Drop unnecessary Build-Depends versioning.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 09 Jul 2023 18:23:07 +0200
+
 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: 
+    - 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~.
diff --git a/debian/control b/debian/control
index c06501b..cec14a7 100644
--- a/debian/control
+++ b/debian/control
@@ -7,35 +7,34 @@ Build-Depends:
  cmake,
  debhelper-compat (= 13),
  desktop-file-utils,
- gnome-pkg-tools,
+ dh-sequence-gnome,
  itstool,
  libappstream-glib-dev,
- libexif-dev (>= 0.6.16),
+ libexif-dev,
  libgcr-3-dev,
  libgdata-dev,
- libgee-0.8-dev (>= 0.10),
- libgexiv2-dev (>= 0.12.0-2~),
- libglib2.0-dev (>= 2.40),
- libgphoto2-dev (>= 2.5.4),
- libgstreamer-plugins-base1.0-dev (>= 1.0.0),
- libgstreamer1.0-dev (>= 1.0.0),
- libgtk-3-dev (>= 3.14),
- libgudev-1.0-dev (>= 145),
+ libgee-0.8-dev,
+ libgexiv2-dev,
+ libglib2.0-dev,
+ libgphoto2-dev,
+ libgstreamer-plugins-base1.0-dev,
+ libgstreamer1.0-dev,
+ libgtk-3-dev,
+ libgudev-1.0-dev,
  libicu-dev,
  libjson-glib-dev,
  libportal-gtk3-dev,
- libraw-dev (>= 0.14),
- librest-dev (>= 0.7),
+ libraw-dev,
+ librest-dev,
  libsecret-1-dev,
- libsoup2.4-dev (>= 2.26.0),
- libsqlite3-dev (>= 3.5.9),
+ libsqlite3-dev,
  libunity-dev,
  libwebkit2gtk-4.1-dev,
  libwebp-dev,
- libxml2 (>= 2.6.32),
+ libxml2,
  meson,
  ninja-build,
- valac (>= 0.46.0)
+ valac
 Standards-Version: 4.6.2.0
 Rules-Requires-Root: binary-targets
 Homepage: https://wiki.gnome.org/Apps/Shotwell
@@ -51,7 +50,8 @@ Depends:
  dconf-cli,
  default-dbus-session-bus | dbus-session-bus,
  librsvg2-common,
- webp-pixbuf-loader
+ webp-pixbuf-loader,
+ xdg-desktop-portal-gnome | xdg-desktop-portal-backend
 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/rules b/debian/rules
index 38a3150..8d4b33c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,23 +6,15 @@ export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w))
 
 #Enable the apport option when building of Ubuntu
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
-                APPORT = -Dinstall-apport-hook=true
+		APPORT = -Dinstall_apport_hook=true
 endif
 
 %:
-	dh $@  --buildsystem=meson --with gnome
+	dh $@  --buildsystem=meson
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-	    --libexec=/usr/libexec \
 	    -Dunity_support=true $(APPORT)
 
 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