diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-08-20 19:22:43 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-08-20 19:22:43 +0200 |
| commit | b7b80f792ce0e8b0934b92fb136e39416bd057f3 (patch) | |
| tree | 0fbb372fe41b42b505f9e65b7943c92898e3ffd7 | |
| parent | 305237b6dce1900a5a34a704c09cfdff81bb3cdb (diff) | |
use upstream manpage
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/manpages | 1 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 8777cfc..45afe5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,9 @@ 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. + * Remove man page from shotwell-common to prevent overlapping + file installation. -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 26 Jun 2016 11:15:06 +0200 diff --git a/debian/manpages b/debian/manpages deleted file mode 100644 index 97689e8..0000000 --- a/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -debian/shotwell.1 diff --git a/debian/rules b/debian/rules index dede84d..a1801d3 100755 --- a/debian/rules +++ b/debian/rules @@ -31,3 +31,7 @@ override_dh_strip: override_dh_compress: dh_compress -X.tar.xz + +override_dh_installman: + dh_installman + rm -fr debian/shotwell-common/usr/share/man |