Merge branch 'release/debian/0.30.10-1'debian/0.30.10-1

6 files changed, 19 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index afddc98..68a8032 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+shotwell (0.30.10-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Remove debian/patches/0115-fix_meson_build.patch.
+  * debian/shotwell.manpages:
+    - Install from debin/tmp to make dh_missing happy.
+  * debian/shotwell.install:
+    - Install from debin/tmp to make dh_missing happy.
+  * debian/control:
+    - Switch to debhelper-compat level 13.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Tue, 26 May 2020 11:50:55 +0200
+
 shotwell (0.30.8-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 572e2eb..989afd3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  appstream-util,
  cmake,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  desktop-file-utils,
  gnome-pkg-tools,
  itstool,
diff --git a/debian/patches/0115-fix_meson_build.patch b/debian/patches/0115-fix_meson_build.patch
deleted file mode 100644
index 0739a80..0000000
--- a/debian/patches/0115-fix_meson_build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Remove --fatal-warnings from build options
-Author: Jörg Frings-Fürst <debian@jff.email>
-Last-Update: 2019-10-07
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-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 7fbf718..cc67c77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0105-gitversion.patch
-0115-fix_meson_build.patch
diff --git a/debian/shotwell.install b/debian/shotwell.install
index 5c6836a..82e5fe8 100644
--- a/debian/shotwell.install
+++ b/debian/shotwell.install
@@ -2,3 +2,6 @@ usr/bin
 usr/lib
 usr/share/applications
 usr/share/metainfo
+usr/libexec/shotwell/shotwell-settings-migrator
+usr/libexec/shotwell/shotwell-video-thumbnailer 
+usr/share/apport/package-hooks/shotwell.py
diff --git a/debian/shotwell.manpages b/debian/shotwell.manpages
index 28d214f..b364be3 100644
--- a/debian/shotwell.manpages
+++ b/debian/shotwell.manpages
@@ -1 +1,2 @@
-help/shotwell.1
+usr/share/man/man1/shotwell.1
+