summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald van Dijk <truedfx@gentoo.org>2005-09-24 18:08:50 +0000
committerHarald van Dijk <truedfx@gentoo.org>2005-09-24 18:08:50 +0000
commit99074a182665504fba4b093093a187d1d659d9de (patch)
treed18e7a0a4e0a1ed59c490847996c5ffe64916d95 /app-i18n/man-pages-fr
parentversion bumped, tested and marked stable on x86 by me wrt security bug #106994 (diff)
downloadgentoo-2-99074a182665504fba4b093093a187d1d659d9de.tar.gz
gentoo-2-99074a182665504fba4b093093a187d1d659d9de.tar.bz2
gentoo-2-99074a182665504fba4b093093a187d1d659d9de.zip
Get rid of file collisions
(Portage version: 1.589-cvs)
Diffstat (limited to 'app-i18n/man-pages-fr')
-rw-r--r--app-i18n/man-pages-fr/ChangeLog6
-rw-r--r--app-i18n/man-pages-fr/Manifest10
-rw-r--r--app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild4
3 files changed, 13 insertions, 7 deletions
diff --git a/app-i18n/man-pages-fr/ChangeLog b/app-i18n/man-pages-fr/ChangeLog
index 70439dc4a978..e81c118f4196 100644
--- a/app-i18n/man-pages-fr/ChangeLog
+++ b/app-i18n/man-pages-fr/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-i18n/man-pages-fr
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-fr/ChangeLog,v 1.1 2005/09/02 04:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-fr/ChangeLog,v 1.2 2005/09/24 18:08:18 truedfx Exp $
+
+ 24 Sep 2005; Harald van Dijk <truedfx@gentoo.org>
+ man-pages-fr-1.64.0.ebuild:
+ Don't touch shadow's files
*manpages-fr-0.9.5-r1 (11 Jun 2005)
diff --git a/app-i18n/man-pages-fr/Manifest b/app-i18n/man-pages-fr/Manifest
index 9b8fd836e4f1..33fd73dae04d 100644
--- a/app-i18n/man-pages-fr/Manifest
+++ b/app-i18n/man-pages-fr/Manifest
@@ -1,14 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 b374b22dcc450df5f2216c7c4015aad8 man-pages-fr-1.64.0.ebuild 896
+MD5 ee863916bc5c271c5f8362b4bdd7871d ChangeLog 1153
MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 c720797fca10a9691f600821699a2f5c ChangeLog 1041
+MD5 1f446f1f920923c56a27bb816743a3d3 man-pages-fr-1.64.0.ebuild 963
MD5 71681a56780c0352afa1eefe5a53aa2f files/digest-man-pages-fr-1.64.0 72
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDF9UlgIKl8Uu19MoRAhqUAJ90sRVaOUXJTi0v+LFdeD84zeu0mACeNzo5
-9iPYhauikYVsBmLLXZni2oU=
-=RBqJ
+iD8DBQFDNYkFwnQyISwouHwRAnD9AJ4t4fA8tuf4PZH5N2tFZQNNHBZtkQCeKRfv
+UeolIyCAw6SzDedxiqMmsiw=
+=Vwbr
-----END PGP SIGNATURE-----
diff --git a/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild b/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild
index a8dd88cb628f..d00ef1b48015 100644
--- a/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild
+++ b/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild,v 1.1 2005/09/02 04:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-fr/man-pages-fr-1.64.0.ebuild,v 1.2 2005/09/24 18:08:18 truedfx Exp $
MY_P=${P/-pages/}
DESCRIPTION="A somewhat comprehensive collection of french Linux man pages"
@@ -21,6 +21,8 @@ src_unpack() {
cd "${S}"
# Don't trample on lilo's files, closes bug #91314
rm man8/lilo.8 man5/lilo.conf.5
+ # Also don't touch shadow's files
+ rm man1/{chsh,groups,passwd}.1
}
src_compile() { :; }