diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-03-06 14:27:29 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-03-06 14:27:29 +0000 |
| commit | 735f8a67a20ee17c42bdfe0c3b349446ba07221b (patch) | |
| tree | fc5ab03d1fcf1d9e0d8bf0fa14a3e686dd8a949c /mdk-stage1 | |
| parent | be596278cce4c2be258dfb4b9a67ba45eecb6257 (diff) | |
| download | drakx-backup-do-not-use-735f8a67a20ee17c42bdfe0c3b349446ba07221b.tar drakx-backup-do-not-use-735f8a67a20ee17c42bdfe0c3b349446ba07221b.tar.gz drakx-backup-do-not-use-735f8a67a20ee17c42bdfe0c3b349446ba07221b.tar.bz2 drakx-backup-do-not-use-735f8a67a20ee17c42bdfe0c3b349446ba07221b.tar.xz drakx-backup-do-not-use-735f8a67a20ee17c42bdfe0c3b349446ba07221b.zip | |
mandrake is now mandriva
Diffstat (limited to 'mdk-stage1')
69 files changed, 144 insertions, 144 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 5f174b417..e7c2a7e82 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -4,9 +4,9 @@ # # $Id$ # - # Pixel (pixel@mandrakesoft.com) (mostly done by Guillaume Cottenceau) + # Pixel (pixel@mandriva.com) (mostly done by Guillaume Cottenceau) # - # Copyright 2000-2004 Mandrakesoft + # Copyright 2000-2004 Mandriva # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common index f5209a58e..fc4372851 100644 --- a/mdk-stage1/Makefile.common +++ b/mdk-stage1/Makefile.common @@ -1,9 +1,9 @@ # -*- makefile -*- #****************************************************************************** # - # Guillaume Cottenceau (gc@mandrakesoft.com) + # Guillaume Cottenceau (gc@mandriva.com) # - # Copyright 2000 Mandrakesoft + # Copyright 2000 Mandriva # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/adsl.c b/mdk-stage1/adsl.c index 03eeeb9a9..831d83993 100644 --- a/mdk-stage1/adsl.c +++ b/mdk-stage1/adsl.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/adsl.h b/mdk-stage1/adsl.h index fb0baf327..be84ee568 100644 --- a/mdk-stage1/adsl.h +++ b/mdk-stage1/adsl.h @@ -1,9 +1,9 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * - * View the homepage: http://us.mandrakesoft.com/~gc/html/stage1.html + * View the homepage: http://us.mandriva.com/~gc/html/stage1.html * * * This software may be freely redistributed under the terms of the GNU diff --git a/mdk-stage1/automatic.c b/mdk-stage1/automatic.c index e5c909624..561aa62d9 100644 --- a/mdk-stage1/automatic.c +++ b/mdk-stage1/automatic.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/automatic.h b/mdk-stage1/automatic.h index a5bfe212b..8eeb586cc 100644 --- a/mdk-stage1/automatic.h +++ b/mdk-stage1/automatic.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/bootsplash.c b/mdk-stage1/bootsplash.c index d51deb543..194df1cec 100644 --- a/mdk-stage1/bootsplash.c +++ b/mdk-stage1/bootsplash.c @@ -1,7 +1,7 @@ /* - * Pixel (pixel@mandrakesoft.com) + * Pixel (pixel@mandriva.com) * - * Copyright 2004 Mandrakesoft + * Copyright 2004 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/bootsplash.h b/mdk-stage1/bootsplash.h index 7d1c8403c..4696ce09a 100644 --- a/mdk-stage1/bootsplash.h +++ b/mdk-stage1/bootsplash.h @@ -1,7 +1,7 @@ /* - * Pixel (pixel@mandrakesoft.com) + * Pixel (pixel@mandriva.com) * - * Copyright 2004 Mandrakesoft + * Copyright 2004 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c index f87307499..eea54594c 100644 --- a/mdk-stage1/cdrom.c +++ b/mdk-stage1/cdrom.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/cdrom.h b/mdk-stage1/cdrom.h index c9ebc78aa..cbfe92bea 100644 --- a/mdk-stage1/cdrom.h +++ b/mdk-stage1/cdrom.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h index f668a465b..8e2a8be8b 100644 --- a/mdk-stage1/config-stage1.h +++ b/mdk-stage1/config-stage1.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/dhcp.c b/mdk-stage1/dhcp.c index fccb400e1..7daedcea5 100644 --- a/mdk-stage1/dhcp.c +++ b/mdk-stage1/dhcp.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/dhcp.h b/mdk-stage1/dhcp.h index d1ad8ae9e..62d8c109c 100644 --- a/mdk-stage1/dhcp.h +++ b/mdk-stage1/dhcp.h @@ -1,9 +1,9 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * - * View the homepage: http://us.mandrakesoft.com/~gc/html/stage1.html + * View the homepage: http://us.mandriva.com/~gc/html/stage1.html * * * This software may be freely redistributed under the terms of the GNU diff --git a/mdk-stage1/directory.c b/mdk-stage1/directory.c index 21d9fc1a1..d98360b61 100644 --- a/mdk-stage1/directory.c +++ b/mdk-stage1/directory.c @@ -1,8 +1,8 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) - * Olivier Blin (oblin@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) + * Olivier Blin (oblin@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/directory.h b/mdk-stage1/directory.h index eb744520b..47becc111 100644 --- a/mdk-stage1/directory.h +++ b/mdk-stage1/directory.h @@ -1,8 +1,8 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) - * Olivier Blin (oblin@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) + * Olivier Blin (oblin@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c index d8f26d3a6..b1de270d4 100644 --- a/mdk-stage1/disk.c +++ b/mdk-stage1/disk.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/disk.h b/mdk-stage1/disk.h index fae890894..6e856c4c5 100644 --- a/mdk-stage1/disk.h +++ b/mdk-stage1/disk.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/dns.c b/mdk-stage1/dns.c index 1d7d2d6c8..32de36a25 100644 --- a/mdk-stage1/dns.c +++ b/mdk-stage1/dns.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/dns.h b/mdk-stage1/dns.h index 21d0c63ac..d1d551b5e 100644 --- a/mdk-stage1/dns.h +++ b/mdk-stage1/dns.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/doc/README b/mdk-stage1/doc/README index 6a1d92bf9..65e0174b4 100644 --- a/mdk-stage1/doc/README +++ b/mdk-stage1/doc/README @@ -1,16 +1,16 @@ ------------------------------------------------------- -* Stage1 of the Mandrakelinux installation program * +* Stage1 of the Mandriva Linux installation program * ------------------------------------------------------- [ Author ] - Guillaume Cottenceau (gc at mandrakesoft.com) + Guillaume Cottenceau (gc at mandriva.com) [ Copyright ] - Copyright 2000, 2001, 2002 Mandrakesoft + Copyright 2000, 2001, 2002 Mandriva Partially inspired by Redhat stuff (install from 5.x and 7.x) copyright Red Hat Software, and Debian stuff (boot-floppies) copyright by their @@ -42,7 +42,7 @@ [ Online ] - http://people.mandrakesoft.com/~gc/html/stage1.html + http://people.mandriva.com/~gc/html/stage1.html [ Purpose ] @@ -60,9 +60,9 @@ -=-=-- Okay, now, more details --=-=- - [ Installing Mandrakelinux ] + [ Installing Mandriva Linux ] -Per default, just insert your Mandrakelinux Installation CD into your +Per default, just insert your Mandriva Linux Installation CD into your CDROM tray, be sure your system BIOS is configured to boot on your CDROM, and that's all. @@ -153,7 +153,7 @@ it's more basic but still usable :-). (#2) A shell is provided on second console in some cases (you need to compile it with -DSPAWN_SHELL and you need to provide a valid shell in the -initrd) and of course it's not in, in image files of Mandrakelinux +initrd) and of course it's not in, in image files of Mandriva Linux releases because it's too much diskspace. (#3) The log is printed out on the third console. This is the location @@ -176,7 +176,7 @@ feature. It's implemented with a fork and a Unix pipe. [ Rescueing a system ] -Since Mandrakelinux 7.1, we provide a rescue system through each of the +Since Mandriva Linux 7.1, we provide a rescue system through each of the previously described methods. You don't need a special "rescue.img" file. Just hit "F1" at boot time, type in "rescue", and follow the first steps of the installation according to the method you chose (choose diff --git a/mdk-stage1/doc/TECH-INFOS b/mdk-stage1/doc/TECH-INFOS index 67151410e..49c9c59b8 100644 --- a/mdk-stage1/doc/TECH-INFOS +++ b/mdk-stage1/doc/TECH-INFOS @@ -8,7 +8,7 @@ the following genres: automatic=method:nfs,network:static,ip:192.168.1.24,server:192.168.1.7,directory:/stable/i586 - automatic=method:ftp,network:dhcp,server:ftp.ciril.fr,directory:/pub/linux/mandrake-devel/cooker + automatic=method:ftp,network:dhcp,server:ftp.ciril.fr,directory:/pub/linux/mandriva-devel/cooker automatic=method:ftp,network:dhcp,server:companyserver,directory:/mdkinst,user:XXX,pass:XXX diff --git a/mdk-stage1/doc/documented..frontend.h b/mdk-stage1/doc/documented..frontend.h index 0e666d534..a1cf88a77 100644 --- a/mdk-stage1/doc/documented..frontend.h +++ b/mdk-stage1/doc/documented..frontend.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/frontend-common.c b/mdk-stage1/frontend-common.c index 6ea2984cd..63ca082bf 100644 --- a/mdk-stage1/frontend-common.c +++ b/mdk-stage1/frontend-common.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/frontend.h b/mdk-stage1/frontend.h index 4c2558b4a..2d0869720 100644 --- a/mdk-stage1/frontend.h +++ b/mdk-stage1/frontend.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index 51fef09b4..a74a703d2 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/ka.c b/mdk-stage1/ka.c index 7d8325084..59fc93e24 100644 --- a/mdk-stage1/ka.c +++ b/mdk-stage1/ka.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Mandrakesoft + * Copyright 2005 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/ka.h b/mdk-stage1/ka.h index 3c083af4f..44d6244f9 100644 --- a/mdk-stage1/ka.h +++ b/mdk-stage1/ka.h @@ -1,5 +1,5 @@ /* - * Copyright 2005 Mandrakesoft + * Copyright 2005 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/log.c b/mdk-stage1/log.c index a8406f6b2..8e4ae76f8 100644 --- a/mdk-stage1/log.c +++ b/mdk-stage1/log.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/log.h b/mdk-stage1/log.h index 6a30fea8f..1ecb519ac 100644 --- a/mdk-stage1/log.h +++ b/mdk-stage1/log.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/lomount.c b/mdk-stage1/lomount.c index 6421cc226..c70730379 100644 --- a/mdk-stage1/lomount.c +++ b/mdk-stage1/lomount.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/lomount.h b/mdk-stage1/lomount.h index 4115507f2..84287108f 100644 --- a/mdk-stage1/lomount.h +++ b/mdk-stage1/lomount.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c index ad5332a8d..00f605cab 100644 --- a/mdk-stage1/modules.c +++ b/mdk-stage1/modules.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/modules.h b/mdk-stage1/modules.h index 8a57b9e41..31e7dbac4 100644 --- a/mdk-stage1/modules.h +++ b/mdk-stage1/modules.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c index 4967a2a6b..59536a718 100644 --- a/mdk-stage1/mount.c +++ b/mdk-stage1/mount.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/mount.h b/mdk-stage1/mount.h index 4a4317182..5b41949bb 100644 --- a/mdk-stage1/mount.h +++ b/mdk-stage1/mount.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c index 163bafe5c..85704b805 100644 --- a/mdk-stage1/network.c +++ b/mdk-stage1/network.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/network.h b/mdk-stage1/network.h index 3d2d94871..ad42f33d0 100644 --- a/mdk-stage1/network.h +++ b/mdk-stage1/network.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/newt-frontend.c b/mdk-stage1/newt-frontend.c index 3556eeca6..3fbf7fe09 100644 --- a/mdk-stage1/newt-frontend.c +++ b/mdk-stage1/newt-frontend.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/newt/Makefile b/mdk-stage1/newt/Makefile index fb6cdd5ff..6750b70ec 100644 --- a/mdk-stage1/newt/Makefile +++ b/mdk-stage1/newt/Makefile @@ -1,8 +1,8 @@ #****************************************************************************** # - # Guillaume Cottenceau (gc@mandrakesoft.com) + # Guillaume Cottenceau (gc@mandriva.com) # - # Copyright 2000 Mandrakesoft + # Copyright 2000 Mandriva # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/nfsmount.c b/mdk-stage1/nfsmount.c index ce329d43c..85ffb25c1 100644 --- a/mdk-stage1/nfsmount.c +++ b/mdk-stage1/nfsmount.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2003 Mandrakesoft + * Copyright 2003 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/params.c b/mdk-stage1/params.c index 38ac94956..cac53346d 100644 --- a/mdk-stage1/params.c +++ b/mdk-stage1/params.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/params.h b/mdk-stage1/params.h index 2fe624143..eb4fd49cd 100644 --- a/mdk-stage1/params.h +++ b/mdk-stage1/params.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/partition.c b/mdk-stage1/partition.c index d41fa7ebf..8d6655dad 100644 --- a/mdk-stage1/partition.c +++ b/mdk-stage1/partition.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/partition.h b/mdk-stage1/partition.h index e901662df..3accd7600 100644 --- a/mdk-stage1/partition.h +++ b/mdk-stage1/partition.h @@ -1,7 +1,7 @@ /* - * Olivier Blin (oblin@mandrakesoft.com) + * Olivier Blin (oblin@mandriva.com) * - * Copyright 2005 Mandrakesoft + * Copyright 2005 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/pci-resource/Makefile b/mdk-stage1/pci-resource/Makefile index fadeee162..24cfc7dd0 100644 --- a/mdk-stage1/pci-resource/Makefile +++ b/mdk-stage1/pci-resource/Makefile @@ -2,9 +2,9 @@ # # $Id$ # - # Guillaume Cottenceau (gc@mandrakesoft.com) + # Guillaume Cottenceau (gc@mandriva.com) # - # Copyright 2000 Mandrakesoft + # Copyright 2000 Mandriva # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/pcmcia/Makefile b/mdk-stage1/pcmcia/Makefile index 9e111f115..a9529260a 100644 --- a/mdk-stage1/pcmcia/Makefile +++ b/mdk-stage1/pcmcia/Makefile @@ -1,8 +1,8 @@ #****************************************************************************** # - # Guillaume Cottenceau (gc@mandrakesoft.com) + # Guillaume Cottenceau (gc@mandriva.com) # - # Copyright 2001 Mandrakesoft + # Copyright 2001 Mandriva # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/pcmcia/pcmcia.h b/mdk-stage1/pcmcia/pcmcia.h index ea0bccc2a..0b06792d7 100644 --- a/mdk-stage1/pcmcia/pcmcia.h +++ b/mdk-stage1/pcmcia/pcmcia.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/pcmcia/probe.c b/mdk-stage1/pcmcia/probe.c index 8f8a4bc8e..a32faf002 100644 --- a/mdk-stage1/pcmcia/probe.c +++ b/mdk-stage1/pcmcia/probe.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000-2001 Mandrakesoft + * Copyright 2000-2001 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/ppp/pppd/Makefile b/mdk-stage1/ppp/pppd/Makefile index fb5658879..e5fcc1411 100644 --- a/mdk-stage1/ppp/pppd/Makefile +++ b/mdk-stage1/ppp/pppd/Makefile @@ -1,8 +1,8 @@ #****************************************************************************** # - # Guillaume Cottenceau (gc@mandrakesoft.com) + # Guillaume Cottenceau (gc@mandriva.com) # - # Copyright 2000 Mandrakesoft + # Copyright 2000 Mandriva # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index 9dba6e6e8..632827e34 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/probing.h b/mdk-stage1/probing.h index bb185ef95..5b4c8d080 100644 --- a/mdk-stage1/probing.h +++ b/mdk-stage1/probing.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/rescue-gui.c b/mdk-stage1/rescue-gui.c index fbf23329a..a71a5ae91 100644 --- a/mdk-stage1/rescue-gui.c +++ b/mdk-stage1/rescue-gui.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2001 Mandrakesoft + * Copyright 2001 Mandriva * * * This software may be freely redistributed under the terms of the GNU diff --git a/mdk-stage1/rp-pppoe/rp-pppoe-gui.spec b/mdk-stage1/rp-pppoe/rp-pppoe-gui.spec index 3222a602e..e28faa3e6 100644 --- a/mdk-stage1/rp-pppoe/rp-pppoe-gui.spec +++ b/mdk-stage1/rp-pppoe/rp-pppoe-gui.spec @@ -1,7 +1,7 @@ Summary: PPP Over Ethernet (xDSL support) Name: rp-pppoe-gui Version: 3.0 -%if %(%{expand:test %{_vendor} != mandrake ; echo $?}) +%if %(%{expand:test %{_vendor} != mandriva ; echo $?}) Release: 1mdk %else Release: 1 diff --git a/mdk-stage1/rp-pppoe/rp-pppoe.spec b/mdk-stage1/rp-pppoe/rp-pppoe.spec index 622e3bb80..b39fd811c 100644 --- a/mdk-stage1/rp-pppoe/rp-pppoe.spec +++ b/mdk-stage1/rp-pppoe/rp-pppoe.spec @@ -1,7 +1,7 @@ Summary: PPP Over Ethernet (xDSL support) Name: rp-pppoe Version: 3.0 -%if %(%{expand:test %{_vendor} != mandrake ; echo $?}) +%if %(%{expand:test %{_vendor} != mandriva ; echo $?}) Release: 1mdk %else Release: 1 diff --git a/mdk-stage1/rp-pppoe/src/Makefile b/mdk-stage1/rp-pppoe/src/Makefile index b618e12a9..6f3eb4fa4 100644 --- a/mdk-stage1/rp-pppoe/src/Makefile +++ b/mdk-stage1/rp-pppoe/src/Makefile @@ -1,8 +1,8 @@ #****************************************************************************** # - # Guillaume Cottenceau (gc@mandrakesoft.com) + # Guillaume Cottenceau (gc@mandriva.com) # - # Copyright 2000 Mandrakesoft + # Copyright 2000 Mandriva # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/slang/Makefile b/mdk-stage1/slang/Makefile index 111062578..fbbf542b3 100644 --- a/mdk-stage1/slang/Makefile +++ b/mdk-stage1/slang/Makefile @@ -1,8 +1,8 @@ #****************************************************************************** # - # Guillaume Cottenceau (gc@mandrakesoft.com) + # Guillaume Cottenceau (gc@mandriva.com) # - # Copyright 2000 Mandrakesoft + # Copyright 2000 Mandriva # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index cdc207bfd..7c460036b 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (was gc@mandrakesoft.com) + * Guillaume Cottenceau (was gc@mandriva.com) * - * Copyright 2000-2004 Mandrakesoft + * Copyright 2000-2004 Mandriva * * * This software may be freely redistributed under the terms of the GNU diff --git a/mdk-stage1/stage1.h b/mdk-stage1/stage1.h index f21c6ab07..96215e9a7 100644 --- a/mdk-stage1/stage1.h +++ b/mdk-stage1/stage1.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/stdio-frontend.c b/mdk-stage1/stdio-frontend.c index bf6d5abfc..f99575bed 100644 --- a/mdk-stage1/stdio-frontend.c +++ b/mdk-stage1/stdio-frontend.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/sysfs/Makefile b/mdk-stage1/sysfs/Makefile index 5cab07408..56bd278dc 100644 --- a/mdk-stage1/sysfs/Makefile +++ b/mdk-stage1/sysfs/Makefile @@ -1,6 +1,6 @@ #****************************************************************************** # - # Guillaume Cottenceau (gc@mandrakesoft.com) + # Guillaume Cottenceau (gc@mandriva.com) # Olivier Blin (blino@mandriva.com) # # Copyright 2006 Mandriva diff --git a/mdk-stage1/thirdparty.c b/mdk-stage1/thirdparty.c index dcdb77062..247b7e1f9 100644 --- a/mdk-stage1/thirdparty.c +++ b/mdk-stage1/thirdparty.c @@ -1,8 +1,8 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) - * Olivier Blin (oblin@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) + * Olivier Blin (oblin@mandriva.com) * - * Copyright 2005 Mandrakesoft + * Copyright 2005 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/thirdparty.h b/mdk-stage1/thirdparty.h index c999d6a58..3995954e3 100644 --- a/mdk-stage1/thirdparty.h +++ b/mdk-stage1/thirdparty.h @@ -1,8 +1,8 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) - * Olivier Blin (oblin@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) + * Olivier Blin (oblin@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c index 9b05918b6..95064f095 100644 --- a/mdk-stage1/tools.c +++ b/mdk-stage1/tools.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/tools.h b/mdk-stage1/tools.h index 85ff42196..9c87528cf 100644 --- a/mdk-stage1/tools.h +++ b/mdk-stage1/tools.h @@ -1,8 +1,8 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/url.c b/mdk-stage1/url.c index 77233847e..788b44081 100644 --- a/mdk-stage1/url.c +++ b/mdk-stage1/url.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/url.h b/mdk-stage1/url.h index 7a9dcfb4b..3f5071ebb 100644 --- a/mdk-stage1/url.h +++ b/mdk-stage1/url.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/usb-resource/Makefile b/mdk-stage1/usb-resource/Makefile index 5b6806b84..9c192920c 100644 --- a/mdk-stage1/usb-resource/Makefile +++ b/mdk-stage1/usb-resource/Makefile @@ -2,9 +2,9 @@ # # $Id$ # - # Guillaume Cottenceau (gc@mandrakesoft.com) + # Guillaume Cottenceau (gc@mandriva.com) # - # Copyright 2000 Mandrakesoft + # Copyright 2000 Mandriva # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/mdk-stage1/utils.c b/mdk-stage1/utils.c index 434704bef..1ef3632e3 100644 --- a/mdk-stage1/utils.c +++ b/mdk-stage1/utils.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/mdk-stage1/utils.h b/mdk-stage1/utils.h index fe02bc00c..ba926066a 100644 --- a/mdk-stage1/utils.h +++ b/mdk-stage1/utils.h @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc@mandrakesoft.com) + * Guillaume Cottenceau (gc@mandriva.com) * - * Copyright 2000 Mandrakesoft + * Copyright 2000 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. |