From 13fc9b3d7074bcf4063065dcba4162a3a69b7343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 27 Nov 2021 10:47:25 +0100 Subject: Enable untiy support --- debian/changelog | 8 ++++++++ debian/control | 1 + debian/rules | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index e545ec8..cacfc36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +shotwell (0.30.14-2) UNRELEASED; urgency=medium + + * Enable untiy support (Closes: #1000528) + - debian/control: Add Build-Depends libunity-dev. + - debian/rules: Add override_dh_auto_configure. + + -- Jörg Frings-Fürst Sat, 27 Nov 2021 09:39:19 +0100 + shotwell (0.30.14-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index bce2814..d5f2797 100644 --- a/debian/control +++ b/debian/control @@ -27,6 +27,7 @@ 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, diff --git a/debian/rules b/debian/rules index 8eaecd6..acbfebd 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,11 @@ export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) %: dh $@ --buildsystem=meson --with gnome +override_dh_auto_configure: + dh_auto_configure -- \ + --libexec=/usr/libexec \ + -Dunity-support=true + override_dh_gnome_clean: dh_gnome_clean --no-control -- cgit v1.2.3 From e96790e6cdfed20e1fd3b77011c6e75e70cd4624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 27 Nov 2021 11:42:07 +0100 Subject: Enable the apport option on Ubuntu --- debian/changelog | 2 ++ debian/rules | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cacfc36..67639da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ shotwell (0.30.14-2) UNRELEASED; urgency=medium * Enable untiy support (Closes: #1000528) - debian/control: Add Build-Depends libunity-dev. - debian/rules: Add override_dh_auto_configure. + * debian/rules: + - enable the apport option on Ubuntu (Closes: #1000529). -- Jörg Frings-Fürst Sat, 27 Nov 2021 09:39:19 +0100 diff --git a/debian/rules b/debian/rules index acbfebd..a772218 100755 --- a/debian/rules +++ b/debian/rules @@ -4,13 +4,18 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all 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 +endif + %: dh $@ --buildsystem=meson --with gnome override_dh_auto_configure: dh_auto_configure -- \ --libexec=/usr/libexec \ - -Dunity-support=true + -Dunity-support=true $(APPORT) override_dh_gnome_clean: dh_gnome_clean --no-control -- cgit v1.2.3 From b6120bf9d6d3789bd3220a335a946e451cc60b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 27 Nov 2021 11:48:50 +0100 Subject: Declare compliance with Debian Policy 4.6.0.1 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 67639da..b21b27f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ shotwell (0.30.14-2) UNRELEASED; urgency=medium - debian/rules: Add override_dh_auto_configure. * debian/rules: - enable the apport option on Ubuntu (Closes: #1000529). + * Declare compliance with Debian Policy 4.6.0.1 (No changes needed). -- Jörg Frings-Fürst Sat, 27 Nov 2021 09:39:19 +0100 diff --git a/debian/control b/debian/control index d5f2797..6fd47f7 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,7 @@ Build-Depends: meson, ninja-build, valac (>= 0.46.0) -Standards-Version: 4.6.0 +Standards-Version: 4.6.0.1 Rules-Requires-Root: binary-targets Homepage: https://wiki.gnome.org/Apps/Shotwell Vcs-Git: git://jff.email/opt/git/shotwell.git -- cgit v1.2.3 From a00f31c7a875171cdbb1d18e6d820e2aeef073e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 27 Nov 2021 12:05:45 +0100 Subject: Add .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0ff0ae9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.pc +debian/files -- cgit v1.2.3 From fd6e3971137d303c4c74bd7f63a3016bb87cc178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 27 Nov 2021 12:09:18 +0100 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 b21b27f..fc31408 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -shotwell (0.30.14-2) UNRELEASED; urgency=medium +shotwell (0.30.14-2) unstable; urgency=medium * Enable untiy support (Closes: #1000528) - debian/control: Add Build-Depends libunity-dev. @@ -7,7 +7,7 @@ shotwell (0.30.14-2) UNRELEASED; urgency=medium - enable the apport option on Ubuntu (Closes: #1000529). * Declare compliance with Debian Policy 4.6.0.1 (No changes needed). - -- Jörg Frings-Fürst Sat, 27 Nov 2021 09:39:19 +0100 + -- Jörg Frings-Fürst Sat, 27 Nov 2021 12:06:45 +0100 shotwell (0.30.14-1) unstable; urgency=medium -- cgit v1.2.3