Update copyright notices

22 files changed, 92 insertions, 17 deletions

diff --git a/gurpmi b/gurpmi
index 35eb5289..d92c45d0 100644
--- a/gurpmi
+++ b/gurpmi
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
-#- Copyright (C) 2005 Mandriva
+#- Copyright (C) 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
 
 use strict;
 use warnings;
diff --git a/gurpmi.pm b/gurpmi.pm
index 9385d233..1883de81 100644
--- a/gurpmi.pm
+++ b/gurpmi.pm
@@ -1,5 +1,8 @@
 package gurpmi;
 
+#- Copyright (C) 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
+
 #- This is needed because text printed by Gtk2 will always be encoded
 #- in UTF-8; we first check if LC_ALL is defined, because if it is,
 #- changing only LC_COLLATE will have no effect.
diff --git a/gurpmi2 b/gurpmi2
index bdf36daf..7bf19f71 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
-#- Copyright (C) 2005 Mandriva
+#- Copyright (C) 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
 
 use strict;
 use warnings;
diff --git a/rurpmi b/rurpmi
index aa10fcb8..f402d44d 100644
--- a/rurpmi
+++ b/rurpmi
@@ -1,5 +1,8 @@
 #!/usr/bin/perl -T
 
+#- Copyright (C) 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
+
 use strict;
 use urpm::msg;
 use urpm::util qw(untaint);
diff --git a/urpm.pm b/urpm.pm
index 03d7fa0c..0f481f71 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -3434,12 +3434,14 @@ on a Mandriva Linux distribution.
 
 =head1 SEE ALSO
 
-The perl-URPM package is used to manipulate at a lower level hdlist and rpm
+The C<URPM> package is used to manipulate at a lower level hdlist and rpm
 files.
 
 =head1 COPYRIGHT
 
-Copyright (C) 2000-2005 Mandriva
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
+
+Copyright (C) 2005 Mandriva SA
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/urpm/args.pm b/urpm/args.pm
index ae4eb444..4700402a 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -385,7 +385,9 @@ urpm::args - command-line argument parser for the urpm* tools
 
 =head1 COPYRIGHT
 
-Copyright (C) 2000-2005 Mandriva
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
+
+Copyright (C) 2005 Mandriva SA
 
 =cut
 
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index 5baffc60..ea233d85 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -245,6 +245,8 @@ __END__
 
 =head1 COPYRIGHT
 
-Copyright (C) 2000-2005 Mandriva
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
+
+Copyright (C) 2005 Mandriva SA
 
 =cut
diff --git a/urpm/download.pm b/urpm/download.pm
index ded58cdd..c005ede1 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -504,6 +504,8 @@ urpm::download - download routines for the urpm* tools
 
 =head1 COPYRIGHT
 
-Copyright (C) 2000-2005 Mandriva
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
+
+Copyright (C) 2005 Mandriva SA
 
 =cut
diff --git a/urpm/ldap.pm b/urpm/ldap.pm
index 77b110e4..6a6f3c18 100644
--- a/urpm/ldap.pm
+++ b/urpm/ldap.pm
@@ -218,3 +218,13 @@ sub load_ldap_media($%) {
 }
 
 1;
+
+__END__
+
+=head1 COPYRIGHT
+
+Copyright (C) 2005 MandrakeSoft SA
+
+Copyright (C) 2005 Mandriva SA
+
+=cut
diff --git a/urpm/msg.pm b/urpm/msg.pm
index a50d0743..162355bc 100644
--- a/urpm/msg.pm
+++ b/urpm/msg.pm
@@ -114,6 +114,8 @@ urpm::msg - routines to prompt messages from the urpm* tools
 
 =head1 COPYRIGHT
 
-Copyright (C) 2000-2005 Mandriva
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
+
+Copyright (C) 2005 Mandriva SA
 
 =cut
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index e108e863..4100ee96 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -1,5 +1,8 @@
 package urpm::parallel_ka_run;
 
+#- Copyright (C) 2002, 2003, 2004, 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
+
 use strict;
 
 (our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm
index b8681c86..04b56fbc 100644
--- a/urpm/parallel_ssh.pm
+++ b/urpm/parallel_ssh.pm
@@ -1,5 +1,8 @@
 package urpm::parallel_ssh;
 
+#- Copyright (C) 2002, 2003, 2004, 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
+
 use strict;
 use Time::HiRes qw(gettimeofday);
 
diff --git a/urpm/prompt.pm b/urpm/prompt.pm
index b2896bde..c4f50225 100644
--- a/urpm/prompt.pm
+++ b/urpm/prompt.pm
@@ -52,6 +52,8 @@ urpm::prompt - base class to prompt the user for data
 
 =head1 COPYRIGHT
 
-Copyright (C) 2005 Mandriva
+Copyright (C) 2005 MandrakeSoft SA
+
+Copyright (C) 2005 Mandriva SA
 
 =cut
diff --git a/urpm/sys.pm b/urpm/sys.pm
index 9ab60dc8..4b6fb26e 100644
--- a/urpm/sys.pm
+++ b/urpm/sys.pm
@@ -167,3 +167,20 @@ sub mktempdir {
 }
 
 1;
+__END__
+
+=head1 NAME
+
+urpm::sys - OS-related routines for urpmi
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+=head1 COPYRIGHT
+
+Copyright (C) 2005 MandrakeSoft SA
+
+Copyright (C) 2005 Mandriva SA
+
+=cut
diff --git a/urpm/util.pm b/urpm/util.pm
index 008f2e89..79b7adab 100644
--- a/urpm/util.pm
+++ b/urpm/util.pm
@@ -100,3 +100,19 @@ sub difference2 { my %l; @l{@{$_[1]}} = (); grep { !exists $l{$_} } @{$_[0]} }
 1;
 
 __END__
+
+=head1 NAME
+
+urpm::util - Misc. utilities subs for urpmi
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+=head1 COPYRIGHT
+
+Copyright (C) 2005 MandrakeSoft SA
+
+Copyright (C) 2005 Mandriva SA
+
+=cut
diff --git a/urpme b/urpme
index f68d2854..eec50015 100644
--- a/urpme
+++ b/urpme
@@ -2,8 +2,8 @@
 
 # $Id$
 
-# Copyright (C) 1999-2005 Mandriva <pixel@mandriva.com>
-#                                  <fpons@mandriva.com>
+#- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/urpmf b/urpmf
index 8ef70ca2..4f8762c6 100755
--- a/urpmf
+++ b/urpmf
@@ -2,7 +2,8 @@
 
 # $Id$
 
-#- Copyright (C) 2002, 2003, 2004, 2005 Mandriva
+#- Copyright (C) 2002, 2003, 2004, 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
 #-
 #- This program is free software; you can redistribute it and/or modify
 #- it under the terms of the GNU General Public License as published by
diff --git a/urpmi b/urpmi
index 5698fecf..d96c5d21 100755
--- a/urpmi
+++ b/urpmi
@@ -2,7 +2,8 @@
 
 # $Id$
 
-#- Copyright (C) 1999-2005 Mandriva (pixel@mandriva.com)
+#- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
 #-
 #- This program is free software; you can redistribute it and/or modify
 #- it under the terms of the GNU General Public License as published by
diff --git a/urpmi.addmedia b/urpmi.addmedia
index 2526c664..216afc12 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -2,7 +2,8 @@
 
 # $Id$
 
-#- Copyright (C) 1999-2005 Mandriva
+#- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
 #-
 #- This program is free software; you can redistribute it and/or modify
 #- it under the terms of the GNU General Public License as published by
diff --git a/urpmi.removemedia b/urpmi.removemedia
index 3d3d273c..fa54b53f 100755
--- a/urpmi.removemedia
+++ b/urpmi.removemedia
@@ -2,7 +2,8 @@
 
 # $Id$
 
-#- Copyright (C) 2000-2004 Mandriva (fpons@mandriva.com)
+#- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
 #-
 #- This program is free software; you can redistribute it and/or modify
 #- it under the terms of the GNU General Public License as published by
diff --git a/urpmi.update b/urpmi.update
index 9504f08a..3bda128b 100755
--- a/urpmi.update
+++ b/urpmi.update
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
-#- Copyright (C) 2000-2004 Mandriva (fpons@mandriva.com)
+#- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
 #-
 #- This program is free software; you can redistribute it and/or modify
 #- it under the terms of the GNU General Public License as published by
diff --git a/urpmq b/urpmq
index f8122663..26abf5cd 100755
--- a/urpmq
+++ b/urpmq
@@ -2,7 +2,8 @@
 
 # $Id$
 
-#- Copyright (C) 2000-2005 Mandriva (fpons@mandriva.com)
+#- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA
+#- Copyright (C) 2005 Mandriva SA
 #-
 #- This program is free software; you can redistribute it and/or modify
 #- it under the terms of the GNU General Public License as published by