diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2020-05-25 21:03:51 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2020-05-25 21:03:51 +0200 |
| commit | 34a6e159502e168d92228e5e3b52b9923ad4aea0 (patch) | |
| tree | 44653389ad014c589d1e12051d6c12e47d358c98 /debian | |
| parent | 763f7b52370e2a45cecf65354792ab9fcc52aa44 (diff) | |
Remove d/p/0115-fix_meson_build.patch; Rewrite d/shotwell.manpages, d/shotwell.install
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/0115-fix_meson_build.patch | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/shotwell.install | 3 | ||||
| -rw-r--r-- | debian/shotwell.manpages | 3 |
5 files changed, 10 insertions, 19 deletions
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 + |