Attached. Thank you, Jeremy Bícha
From badff566de2f31466e02a0d6aaf57809f33d85a5 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Wed, 28 Jun 2023 11:33:12 -0400 Subject: [PATCH 3/4] debian/rules: Drop unnecessary libexec configure option
It is now the default --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index 34864870..d144be86 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,6 @@ endif override_dh_auto_configure: dh_auto_configure -- \ - --libexec=/usr/libexec \ -Dunity_support=true $(APPORT) override_dh_gnome_clean: -- 2.39.2
From d9d2fa53aa8b36d5fdaaca19cf0181c60af0f488 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Wed, 28 Jun 2023 11:27:45 -0400 Subject: [PATCH 1/4] debian/rules: Update apport configuration option name --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 38a3150b..7072d0bb 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ 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 %: -- 2.39.2
From 2368eaeca2fadcc868a49128bf59999c3fc84e8a Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Wed, 28 Jun 2023 11:29:11 -0400 Subject: [PATCH 4/4] debian/rules: Drop obsolete lines We don't need to specify the meson buildsystem since it's the only buildsystem here. The meson build doesn't generate the .a and .la files Closes: #1039719 --- debian/rules | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index d144be86..8692eeb1 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) endif %: - dh $@ --buildsystem=meson + dh $@ override_dh_auto_configure: dh_auto_configure -- \ @@ -18,10 +18,3 @@ override_dh_auto_configure: 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 -- 2.39.2
From 973d27ebca6a8f741c6b628b2c0a3f97cab6ed88 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Wed, 28 Jun 2023 11:28:31 -0400 Subject: [PATCH 2/4] Build-Depend on dh-sequence-gnome instead of gnome-pkg-tools --- debian/control | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index c06501bb..2ba57ab4 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: cmake, debhelper-compat (= 13), desktop-file-utils, - gnome-pkg-tools, + dh-sequence-gnome, itstool, libappstream-glib-dev, libexif-dev (>= 0.6.16), diff --git a/debian/rules b/debian/rules index 7072d0bb..34864870 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) endif %: - dh $@ --buildsystem=meson --with gnome + dh $@ --buildsystem=meson override_dh_auto_configure: dh_auto_configure -- \ -- 2.39.2
