From 763f7b52370e2a45cecf65354792ab9fcc52aa44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Mon, 25 May 2020 20:20:47 +0200
Subject: New upstream release
---
debian/changelog | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index afddc98..5038301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+shotwell (0.30.10-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Mon, 25 May 2020 20:19:14 +0200
+
shotwell (0.30.8-1) unstable; urgency=medium
* New upstream release.
--
cgit v1.2.3
From 34a6e159502e168d92228e5e3b52b9923ad4aea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Mon, 25 May 2020 21:03:51 +0200
Subject: Remove d/p/0115-fix_meson_build.patch; Rewrite d/shotwell.manpages,
d/shotwell.install
---
debian/changelog | 5 +++++
debian/patches/0115-fix_meson_build.patch | 17 -----------------
debian/patches/series | 1 -
debian/shotwell.install | 3 +++
debian/shotwell.manpages | 3 ++-
5 files changed, 10 insertions(+), 19 deletions(-)
delete mode 100644 debian/patches/0115-fix_meson_build.patch
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index 5038301..71a5038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
shotwell (0.30.10-1) UNRELEASED; 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.
-- Jörg Frings-Fürst <debian@jff.email> Mon, 25 May 2020 20:19:14 +0200
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
+
--
cgit v1.2.3
From 439fca5f4351de5c1e61859deacc0bfb8ee3ffbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Mon, 25 May 2020 21:08:01 +0200
Subject: d/control: Switch to debhelper-compat level 13
---
debian/changelog | 2 ++
debian/control | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index 71a5038..4b2b7fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ shotwell (0.30.10-1) UNRELEASED; urgency=medium
- 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> Mon, 25 May 2020 20:19:14 +0200
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,
--
cgit v1.2.3
From a99b581716d7972a62ed6c227a807e304a98d6af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Tue, 26 May 2020 11:54:22 +0200
Subject: d/changelog: Change distribution to unstable, Change date and time
---
debian/changelog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index 4b2b7fd..68a8032 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-shotwell (0.30.10-1) UNRELEASED; urgency=medium
+shotwell (0.30.10-1) unstable; urgency=medium
* New upstream release.
- Remove debian/patches/0115-fix_meson_build.patch.
@@ -9,7 +9,7 @@ shotwell (0.30.10-1) UNRELEASED; urgency=medium
* debian/control:
- Switch to debhelper-compat level 13.
- -- Jörg Frings-Fürst <debian@jff.email> Mon, 25 May 2020 20:19:14 +0200
+ -- Jörg Frings-Fürst <debian@jff.email> Tue, 26 May 2020 11:50:55 +0200
shotwell (0.30.8-1) unstable; urgency=medium
--
cgit v1.2.3