From 7c6511ed3a51cf5943a25013425e60c67184133f Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Sun, 29 Jan 2012 21:20:51 +0000 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Mageia. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r2856 | dmorgan | 2012-01-29 21:20:51 +0000 (Sun, 29 Jan 2012) | 1 line Import setup ------------------------------------------------------------------------ In addition to the above commits, the following cleaning work has been recorded: - Replace "Mandriva" with "Mageia" in 'fprintf (stderr, "Mageia Linux run-parts program, version " VERSION "\n" ' in file utils/run-parts.c - License is 'public domain' according to the relevant rpm spec file which is written by Mandriva (no explicit COPYING or LICENSE files) - run-parts is GPLv2+ according to the copyright headers (Debian) --- Makefile | 2 +- inputrc | 3 ++- protocols | 2 +- services | 2 +- utils/run-parts.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 02945fe..c27ebce 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PACKAGE = setup VERSION = 2.7.18 -SVNPATH = svn+ssh://svn.mandriva.com/svn/soft/$(PACKAGE) +SVNPATH = svn+ssh://svn.mageia.org/soft/$(PACKAGE) LIST = csh.cshrc csh.login host.conf hosts.allow hosts.deny inputrc \ motd printcap protocols securetty services shells profile \ diff --git a/inputrc b/inputrc index 29ec92b..4113588 100644 --- a/inputrc +++ b/inputrc @@ -1,5 +1,6 @@ -## Mandriva Linux Configuration +## Mageia Linux Configuration # (c) Mandriva 1999-2005 +# (c) Mageia 2011-2012 # Chmouel Boudjnah, Pablo Saratxaga # $Id: inputrc 105875 2005-12-07 06:56:46Z flepied $ diff --git a/protocols b/protocols index a79cd35..2d6a5af 100644 --- a/protocols +++ b/protocols @@ -1,4 +1,4 @@ -# $Id$ +# $Id: protocols 264343 2009-12-31 18:08:15Z guillomovitch $ # # Internet (IP) protocols # diff --git a/services b/services index 59e09bd..25962e2 100644 --- a/services +++ b/services @@ -1,4 +1,4 @@ -# $Id$ +# $Id: services 264343 2009-12-31 18:08:15Z guillomovitch $ # # Network services, Internet style # diff --git a/utils/run-parts.c b/utils/run-parts.c index 5e3f20f..db6193e 100644 --- a/utils/run-parts.c +++ b/utils/run-parts.c @@ -53,7 +53,7 @@ void error (char *format,...) static void version (void) { - fprintf (stderr, "Mandriva Linux run-parts program, version " VERSION "\n" + fprintf (stderr, "Mageia run-parts program, version " VERSION "\n" "Copyright (C) 1994 Ian Jackson, Copyright (C) 1996 Jeff Noxon.\n" "Copyright (C) 1996,1997,1998,1999 Guy Maor\n" "This is free software; see the GNU General Public License version 2\n" -- cgit v1.2.1