From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 22 Nov 2004 03:40:25 +0000 (+0000)
Subject: Make sure we update the rsync(1) manpage with the new .conf location too #71650 by... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba71fced8fd706ddff68ae00cc23dd46bd53d2da;p=gentoo.git

Make sure we update the rsync(1) manpage with the new .conf location too #71650 by Paul Oldham.
---

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index b8a7ca8e66f0..736be70ec914 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/rsync
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.70 2004/10/03 04:36:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.71 2004/11/22 03:40:25 vapier Exp $
+
+  21 Nov 2004; Mike Frysinger <vapier@gentoo.org> rsync-2.6.0-r3.ebuild,
+  rsync-2.6.3.ebuild:
+  Make sure we update the rsync(1) manpage with the new .conf location too
+  #71650 by Paul Oldham.
 
 *rsync-2.6.3 (03 Oct 2004)
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index ee69afe48caf..52f811c5ce6a 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,6 +1,9 @@
-MD5 50ebc04b156e05733d01facaeb3baa32 ChangeLog 9420
-MD5 a95d8e2c2241823e167d845d389efbb5 rsync-2.6.0-r3.ebuild 2588
-MD5 2904d493440f9f6c366209e72242dc44 rsync-2.6.3.ebuild 2049
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 75b9227c251bc023812f0052b255fd84 ChangeLog 9616
+MD5 08bbe6d869953b772b038a1e8f4acff0 rsync-2.6.0-r3.ebuild 2599
+MD5 1a4302789302a4333c1bf69c81298dd5 rsync-2.6.3.ebuild 2057
 MD5 9118ed78f07b5bae1f8daa09226771b0 files/2.6.0-sanitize.patch 5842
 MD5 c27421f44de2c0fa58f6d01a9cbdeeb5 files/rsyncd.conf 405
 MD5 39b5aab74752c74d7d600265dd32de05 files/rsyncd.conf.d 348
@@ -8,3 +11,10 @@ MD5 85d62854c15e2e275184c9af7e5d6d18 files/rsyncd.init.d 438
 MD5 e04533ca371c57d742250cc0622c005e files/digest-rsync-2.6.0-r3 204
 MD5 62972fab38bf033135efad0bd025f65b files/digest-rsync-2.6.3 63
 MD5 93a1334931329a901f4aa47d63a7ce70 files/rsync-pathsanitize.patch 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBoV/oHTu7gpaalycRAvZLAJ4j8baoFOHuEyjpfXhkU88obwHfPgCfX2/U
+RvDtvfA27SXO1U7pzTsy9ac=
+=2P01
+-----END PGP SIGNATURE-----
diff --git a/net-misc/rsync/rsync-2.6.0-r3.ebuild b/net-misc/rsync/rsync-2.6.0-r3.ebuild
index aa011c59f7c1..8353629fdaf1 100644
--- a/net-misc/rsync/rsync-2.6.0-r3.ebuild
+++ b/net-misc/rsync/rsync-2.6.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.0-r3.ebuild,v 1.8 2004/11/12 15:44:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.0-r3.ebuild,v 1.9 2004/11/22 03:40:25 vapier Exp $
 
 inherit eutils flag-o-matic gcc gnuconfig
 
@@ -35,8 +35,9 @@ src_unpack() {
 			|| die "sed rsync.h failed"
 	# yes, updating the man page is very important.
 	sed -i \
-		-e 's|/etc/rsyncd|/etc/rsync/rsyncd|g' rsyncd.conf.5 \
-			|| die "sed rsyncd.conf.5 failed"
+		-e 's|/etc/rsyncd|/etc/rsync/rsyncd|g' \
+		rsync.1 rsyncd.conf.5 \
+		|| die "sed rsyncd.conf.5 failed"
 
 	# apply security patch from bug #60309
 	epatch ${FILESDIR}/${PN}-pathsanitize.patch
diff --git a/net-misc/rsync/rsync-2.6.3.ebuild b/net-misc/rsync/rsync-2.6.3.ebuild
index 810f38cb0438..a98bdf5b0b6c 100644
--- a/net-misc/rsync/rsync-2.6.3.ebuild
+++ b/net-misc/rsync/rsync-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.3.ebuild,v 1.5 2004/11/12 15:44:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.3.ebuild,v 1.6 2004/11/22 03:40:25 vapier Exp $
 
 inherit eutils flag-o-matic gcc gnuconfig
 
@@ -35,7 +35,7 @@ src_unpack() {
 	# yes, updating the man page is very important.
 	sed -i \
 		-e 's|/etc/rsyncd|/etc/rsync/rsyncd|g' \
-		rsyncd.conf.5 \
+		rsync.1 rsyncd.conf.5 \
 		|| die "sed rsyncd.conf.5 failed"
 }