summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2021-11-28 13:38:33 +0100
committerJörg Frings-Fürst <debian@jff.email>2021-11-28 13:38:33 +0100
commitf017d0e96d22cf8b70ec67cdaf818e62d8902b67 (patch)
tree3c9f675d395735f43dd08deae45dd0fd8b4dcf88 /debian
parent55d274a13c2524d55e07f2395316aa9d2cae912b (diff)
parentfd6e3971137d303c4c74bd7f63a3016bb87cc178 (diff)
Merge branch 'release/debian/0.30.14-2'debian/0.30.14-2
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
-rw-r--r--debian/control3
-rwxr-xr-xdebian/rules10
3 files changed, 23 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index e545ec8..fc31408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+shotwell (0.30.14-2) unstable; 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).
+ * Declare compliance with Debian Policy 4.6.0.1 (No changes needed).
+
+ -- Jörg Frings-Fürst <debian@jff.email> Sat, 27 Nov 2021 12:06:45 +0100
+
shotwell (0.30.14-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index bce2814..6fd47f7 100644
--- a/debian/control
+++ b/debian/control
@@ -27,12 +27,13 @@ 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,
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
diff --git a/debian/rules b/debian/rules
index 8eaecd6..a772218 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,19 @@ 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 $(APPORT)
+
override_dh_gnome_clean:
dh_gnome_clean --no-control