summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Schiffbauer <mschiff@gentoo.org>2012-10-11 08:25:40 +0000
committerMarc Schiffbauer <mschiff@gentoo.org>2012-10-11 08:25:40 +0000
commit43eec818a2cddb1c333dc126b299b628bee040cf (patch)
tree026e7e57a15a3f585a1f01c634e319d102651271 /app-backup
parentstable ppc, bug #433287 (diff)
downloadgentoo-2-43eec818a2cddb1c333dc126b299b628bee040cf.tar.gz
gentoo-2-43eec818a2cddb1c333dc126b299b628bee040cf.tar.bz2
gentoo-2-43eec818a2cddb1c333dc126b299b628bee040cf.zip
Add patch for man page to add missing description of 'diff' subcommand
(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)
Diffstat (limited to 'app-backup')
-rw-r--r--app-backup/obnam/ChangeLog6
-rw-r--r--app-backup/obnam/files/obnam-1.2_man_diff_fix.patch18
-rw-r--r--app-backup/obnam/obnam-1.2-r1.ebuild3
3 files changed, 25 insertions, 2 deletions
diff --git a/app-backup/obnam/ChangeLog b/app-backup/obnam/ChangeLog
index 8f5757362b1f..098f22d97a77 100644
--- a/app-backup/obnam/ChangeLog
+++ b/app-backup/obnam/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/obnam
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.6 2012/10/11 08:11:12 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.7 2012/10/11 08:25:40 mschiff Exp $
+
+ 11 Oct 2012; Marc Schiffbauer <mschiff@gentoo.org> obnam-1.2-r1.ebuild,
+ +files/obnam-1.2_man_diff_fix.patch:
+ Add patch to add missing description of 'diff' subcommand to man-page.
*obnam-1.2-r1 (11 Oct 2012)
diff --git a/app-backup/obnam/files/obnam-1.2_man_diff_fix.patch b/app-backup/obnam/files/obnam-1.2_man_diff_fix.patch
new file mode 100644
index 000000000000..b2045c1e56cd
--- /dev/null
+++ b/app-backup/obnam/files/obnam-1.2_man_diff_fix.patch
@@ -0,0 +1,18 @@
+diff -urN obnam-1.2.orig/obnam.1.in obnam-1.2/obnam.1.in
+--- obnam-1.2.orig/obnam.1.in 2012-10-06 18:45:31.000000000 +0200
++++ obnam-1.2/obnam.1.in 2012-10-11 10:18:55.991780255 +0200
+@@ -59,6 +59,14 @@
+ lists every backup generation for a given client,
+ plus some metadata about the generation.
+ .IP \(bu
++.B diff
++compares two generations and lists files differing between them. Every output
++line will be prefixed either by a plus sign (+) for files that were added, a
++minus sign (-) for files that have been removed or an asterisk (*) for files
++that have changed. If only one generation ID is specified on the command line
++that generation will be compared with its direct predecessor. If two IDs have
++been specified, all changes between those two generations will be listed.
++.IP \(bu
+ .B genids
+ lists the identifier for every backup generation for a given client.
+ No other information is shown.
diff --git a/app-backup/obnam/obnam-1.2-r1.ebuild b/app-backup/obnam/obnam-1.2-r1.ebuild
index 0afaac05332e..09997351004e 100644
--- a/app-backup/obnam/obnam-1.2-r1.ebuild
+++ b/app-backup/obnam/obnam-1.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.2-r1.ebuild,v 1.1 2012/10/11 08:11:12 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.2-r1.ebuild,v 1.2 2012/10/11 08:25:40 mschiff Exp $
EAPI=4
@@ -32,6 +32,7 @@ RDEPEND="${DEPEND}"
src_prepare() {
distutils_src_prepare
epatch "${FILESDIR}/${P}_diff_fix.patch"
+ epatch "${FILESDIR}/${P}_man_diff_fix.patch"
}
src_install() {