From 051153eb6a7d96ee4fc8e1ca7ad6f4af61141387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Mon, 7 Oct 2019 16:18:38 +0200
Subject: New upstream release; New d/p/0115-fix_meson_build.patch; d/control:
 Add cmake to Build-Depends;

---
 debian/changelog                          |  8 ++++++++
 debian/control                            |  3 ++-
 debian/patches/0115-fix_meson_build.patch | 12 ++++++++++++
 debian/patches/series                     |  1 +
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/0115-fix_meson_build.patch

diff --git a/debian/changelog b/debian/changelog
index 485e033..ddc1106 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shotwell (0.30.7-1) UNRELEASED; urgency=medium
+
+  * New upstream release:
+    - New debian/patches/0115-fix_meson_build.patch to fix FTBFS.
+    - debian/control: Add cmake to Build-Depends.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Thu, 03 Oct 2019 15:23:03 +0200
+
 shotwell (0.30.5-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 0691e8b..de71bfe 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  appstream-util,
+ cmake,
  debhelper (>= 12),
  desktop-file-utils,
  gnome-doc-utils,
@@ -31,7 +32,7 @@ Build-Depends:
  libxml2 (>= 2.6.32),
  meson,
  ninja-build,
- valac (>= 0.22.0)
+ valac (>= 0.46.0)
 Standards-Version: 4.4.0
 Homepage: https://wiki.gnome.org/Apps/Shotwell
 Vcs-Git: git://jff.email/opt/git/shotwell.git
diff --git a/debian/patches/0115-fix_meson_build.patch b/debian/patches/0115-fix_meson_build.patch
new file mode 100644
index 0000000..e8e51be
--- /dev/null
+++ b/debian/patches/0115-fix_meson_build.patch
@@ -0,0 +1,12 @@
+Index: trunk/meson.build
+===================================================================
+--- trunk.orig/meson.build
++++ trunk/meson.build
+@@ -25,7 +25,6 @@ add_global_arguments(['--target-glib=2.4
+                       '--vapidir=@0@'.format(join_paths(meson.current_source_dir(),
+                         'vapi')),
+                       '--enable-checking',
+-                      '--fatal-warnings',
+                       '--enable-experimental',
+                       '--enable-deprecated'], language : 'vala')
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0bf22a4..a13ba95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 #505-fix-viewer-desktop-file.patch
 0105-gitversion.patch
 #0110-fix_GoogleAuthenticator.patch
+0115-fix_meson_build.patch
-- 
cgit v1.2.3