diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/0600-remove_wrong_marco.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/shotwell.manpages | 1 |
4 files changed, 24 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 45afe5b..c5acc59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,9 +27,11 @@ shotwell (0.23.5-1) unstable; urgency=medium - Add itstool to Build-Depends. * debian/shotwell.install: - Remove missing apport/shotwell.py. - * Remove debian/manpages to use the upstream man page. + * Move debian/manpages to debian/shotwell.manpages and use the + upstream man page. * Remove man page from shotwell-common to prevent overlapping file installation. + * New patches/0600-remove_wrong_marco.patch to remove the wrong macro 'R'. -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 26 Jun 2016 11:15:06 +0200 diff --git a/debian/patches/0600-remove_wrong_marco.patch b/debian/patches/0600-remove_wrong_marco.patch new file mode 100644 index 0000000..42ec942 --- /dev/null +++ b/debian/patches/0600-remove_wrong_marco.patch @@ -0,0 +1,19 @@ +Description: Remove wrong macro 'R' from manpage +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Last-Update: 2016-08-20 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/help/shotwell.1 +=================================================================== +--- trunk.orig/help/shotwell.1 ++++ trunk/help/shotwell.1 +@@ -13,7 +13,8 @@ import photos from disk or camera, organ + + .SH "OPTIONS" + .B \-h, \-\-help +-.R Show help options ++Show help options ++.RE + + .B \-d, \-\-datadir=DIRECTORY + .RS diff --git a/debian/patches/series b/debian/patches/series index 76c5bba..2962406 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,6 +5,7 @@ #0501-Dont-pack-webview-into-a-scrolled-window.patch #0502-Have-all-soup-sessions-validate-TLS-certificates.patch #0503-facebook-Dont-disable-XSS-auditor.patch +0600-remove_wrong_marco.patch 0100-ios8.patch #0510-Delay_size_request.patch #0515-Fix_background_color_drawing.patch diff --git a/debian/shotwell.manpages b/debian/shotwell.manpages new file mode 100644 index 0000000..28d214f --- /dev/null +++ b/debian/shotwell.manpages @@ -0,0 +1 @@ +help/shotwell.1 |