From 6aab164abce2b742792314e6a5819179817f8d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2023 16:04:43 +0200 Subject: d/r: Drop unnecessary libexec configure option --- debian/changelog | 7 +++++++ debian/rules | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1fd3aee..1b27dd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +shotwell (0.32.1-2) UNRELEASED; urgency=medium + + * debian/rules: + - Drop unnecessary libexec configure option. + + -- Jörg Frings-Fürst Sun, 09 Jul 2023 15:52:42 +0200 + shotwell (0.32.1-1) unstable; urgency=medium * New upstream release (Closes: #1034018, #1034011, #1034017): diff --git a/debian/rules b/debian/rules index 38a3150..e9b7aea 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: -- cgit v1.2.3 From f7727f8a6815f7447b2044502a74b10643555f44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2023 16:08:32 +0200 Subject: d/r: Update apport configuration option name --- debian/changelog | 1 + debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1b27dd4..66f45ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ shotwell (0.32.1-2) UNRELEASED; urgency=medium * debian/rules: - Drop unnecessary libexec configure option. + - Update apport configuration option name. -- Jörg Frings-Fürst Sun, 09 Jul 2023 15:52:42 +0200 diff --git a/debian/rules b/debian/rules index e9b7aea..f462a9d 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 %: @@ -14,7 +14,7 @@ endif override_dh_auto_configure: dh_auto_configure -- \ - -Dunity_support=true $(APPORT) + -Dunity_support-true $(APPORT) override_dh_gnome_clean: dh_gnome_clean --no-control -- cgit v1.2.3 From 2d62c02073da61c5718be46bc804d4c6b12636a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2023 16:12:09 +0200 Subject: d/r: Drop obsolete override_dh_install --- debian/changelog | 1 + debian/rules | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 66f45ed..4af2635 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ shotwell (0.32.1-2) UNRELEASED; urgency=medium * debian/rules: - Drop unnecessary libexec configure option. - Update apport configuration option name. + - Drop obsolete override_dh_install. -- Jörg Frings-Fürst Sun, 09 Jul 2023 15:52:42 +0200 diff --git a/debian/rules b/debian/rules index f462a9d..9eb330a 100755 --- a/debian/rules +++ b/debian/rules @@ -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 -- cgit v1.2.3 From 5b3508e2c8767d8bf1a5f0679924d702f93f7a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2023 16:19:40 +0200 Subject: Replace gnome-pkg-tools with dh-sequence-gnome --- debian/changelog | 5 +++++ debian/control | 2 +- debian/rules | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4af2635..cc649a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ shotwell (0.32.1-2) UNRELEASED; urgency=medium - 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. -- Jörg Frings-Fürst Sun, 09 Jul 2023 15:52:42 +0200 diff --git a/debian/control b/debian/control index c06501b..2ba57ab 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 9eb330a..39a3984 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 -- \ -- cgit v1.2.3 From 6bec6d68a219b64ce3a8a067c4d8fae80894f89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2023 16:44:29 +0200 Subject: Add Depend xdg-desktop-portal-backend --- debian/changelog | 5 ++++- debian/control | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc649a3..3278497 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ shotwell (0.32.1-2) UNRELEASED; urgency=medium - * debian/rules: + * debian/rules (Closes: #1039719): - Drop unnecessary libexec configure option. - Update apport configuration option name. - Drop obsolete override_dh_install. @@ -9,6 +9,9 @@ shotwell (0.32.1-2) UNRELEASED; urgency=medium + 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). -- Jörg Frings-Fürst Sun, 09 Jul 2023 15:52:42 +0200 diff --git a/debian/control b/debian/control index 2ba57ab..c569dde 100644 --- a/debian/control +++ b/debian/control @@ -51,7 +51,8 @@ Depends: dconf-cli, default-dbus-session-bus | dbus-session-bus, librsvg2-common, - webp-pixbuf-loader + webp-pixbuf-loader, + 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 -- cgit v1.2.3 From bcbbf4cf15c53062a178bcb8ca7b656f5d74b806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2023 16:45:27 +0200 Subject: Drop the Build-Depends libsoup2.4-dev --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index c569dde..24700e5 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,6 @@ Build-Depends: 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.1-dev, -- cgit v1.2.3 From 68b90f1d83d5484704e5d3b3ece51166f87cda56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2023 17:06:41 +0200 Subject: d/r: fix typo --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 39a3984..8d4b33c 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ endif override_dh_auto_configure: dh_auto_configure -- \ - -Dunity_support-true $(APPORT) + -Dunity_support=true $(APPORT) override_dh_gnome_clean: dh_gnome_clean --no-control -- cgit v1.2.3 From c9c4250dab63f03c47820170deb87593f9b34f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2023 17:08:46 +0200 Subject: d/contol: Fix Depends --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 24700e5..8933db1 100644 --- a/debian/control +++ b/debian/control @@ -51,7 +51,7 @@ Depends: default-dbus-session-bus | dbus-session-bus, librsvg2-common, webp-pixbuf-loader, - xdg-desktop-portal-backend + 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 -- cgit v1.2.3 From 7a34a08e4eb02888e3bbacd4eaaea7a7cef07192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2023 17:30:37 +0200 Subject: d/control: Drop unnecessary Build-Depends versioning --- debian/changelog | 3 ++- debian/control | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3278497..1e0c102 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ shotwell (0.32.1-2) UNRELEASED; urgency=medium * 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 Sun, 09 Jul 2023 15:52:42 +0200 @@ -20,7 +21,7 @@ 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 8933db1..bad9b18 100644 --- a/debian/control +++ b/debian/control @@ -10,31 +10,31 @@ Build-Depends: 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-de, + 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, - 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 -- cgit v1.2.3 From 38d9d8b06e163347112271cb249c91b1752e521f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2023 18:19:36 +0200 Subject: d/control: fix typo --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index bad9b18..cec14a7 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: libgee-0.8-dev, libgexiv2-dev, libglib2.0-dev, - libgphoto2-de, + libgphoto2-dev, libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev, libgtk-3-dev, -- cgit v1.2.3 From 55fd5cdf9100840c12017b0423e4b8806cc23e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jul 2023 18:24:37 +0200 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e0c102..5bda615 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -shotwell (0.32.1-2) UNRELEASED; urgency=medium +shotwell (0.32.1-2) unstable; urgency=medium * debian/rules (Closes: #1039719): - Drop unnecessary libexec configure option. @@ -14,7 +14,7 @@ shotwell (0.32.1-2) UNRELEASED; urgency=medium - Add Depend xdg-desktop-portal-backend (Closes: #1039716). - Drop unnecessary Build-Depends versioning. - -- Jörg Frings-Fürst Sun, 09 Jul 2023 15:52:42 +0200 + -- Jörg Frings-Fürst Sun, 09 Jul 2023 18:23:07 +0200 shotwell (0.32.1-1) unstable; urgency=medium -- cgit v1.2.3