From 4f5cd4c0e1192cf1d2348d93f54004d97b9e1807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 26 Apr 2017 21:22:08 +0200 Subject: Update Mageia copyright statements --- NEWS | 1 + gurpm/RPMProgressDialog.pm | 4 ++-- gurpmi | 1 + gurpmi.pm | 5 +++-- gurpmi2 | 1 + rurpme | 1 + rurpmi | 1 + urpm.pm | 2 +- urpm/args.pm | 2 ++ urpm/bug_report.pm | 2 ++ urpm/cdrom.pm | 2 +- urpm/cfg.pm | 2 ++ urpm/download.pm | 2 ++ urpm/get_pkgs.pm | 2 ++ urpm/install.pm | 2 +- urpm/ldap.pm | 2 ++ urpm/lock.pm | 2 +- urpm/main_loop.pm | 3 ++- urpm/md5sum.pm | 2 ++ urpm/media.pm | 2 +- urpm/mirrors.pm | 2 ++ urpm/msg.pm | 2 ++ urpm/orphans.pm | 2 +- urpm/parallel.pm | 2 +- urpm/parallel_ka_run.pm | 1 + urpm/parallel_ssh.pm | 1 + urpm/prompt.pm | 2 ++ urpm/removable.pm | 2 ++ urpm/signature.pm | 2 ++ urpm/sys.pm | 2 ++ urpm/util.pm | 2 ++ urpm/xml_info.pm | 2 ++ urpm/xml_info_pkg.pm | 2 ++ urpme | 3 ++- urpmf | 3 ++- urpmi | 3 ++- urpmi.addmedia | 1 + urpmi.removemedia | 1 + urpmi.update | 1 + urpmq | 3 ++- 40 files changed, 64 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index 6f6fbe91..5d73904f 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ - make sure that urpmi.cfg is world-readable (mga#9386) - ensure gurpmi ProgressDialog centering (mga#19196) +- update Mageia copyright statements Version 8.106 - 6 December 2016 diff --git a/gurpm/RPMProgressDialog.pm b/gurpm/RPMProgressDialog.pm index 1a2aad3e..ea09a634 100644 --- a/gurpm/RPMProgressDialog.pm +++ b/gurpm/RPMProgressDialog.pm @@ -2,7 +2,7 @@ package gurpm::RPMProgressDialog; #- Copyright (C) 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA -#- Copyright (C) 2015 Mageia +#- Copyright (C) 2011-2017 Mageia # Sharing code from gurpmi2 && Rpmdrake::gurpm # Gtk3 only (no ugtk3/mygtk3) as it's used by gurpmi too... @@ -390,7 +390,7 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA -Copyright (C) 2011-2013 Mageia +Copyright (C) 2011-2017 Mageia =cut diff --git a/gurpmi b/gurpmi index db3c4008..7ddcaf4b 100755 --- a/gurpmi +++ b/gurpmi @@ -2,6 +2,7 @@ #- Copyright (C) 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia use strict; diff --git a/gurpmi.pm b/gurpmi.pm index 2427bdb4..52aa09c6 100644 --- a/gurpmi.pm +++ b/gurpmi.pm @@ -2,6 +2,7 @@ package gurpmi; #- Copyright (C) 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia #- This is needed because text printed by Gtk3 will always be encoded #- in UTF-8; we first check if LC_ALL is defined, because if it is, @@ -50,7 +51,7 @@ on a Mageia Linux distribution. urpm::select::add_packages_to_priority_upgrade_list(qw(gurpmi perl-Glib perl-Glib-Object-Introspection perl-Gtk3)); sub usage () { - print urpm::args::copyright('gurpmi', [ '1999-2010', 'Mandriva' ]) + print urpm::args::copyright('gurpmi', [ '1999-2010', 'Mandriva' ], [ '2011-2017', 'Mageia' ]) . " gurpmi [ ... ] " . N("Options:") . "\n" . N(" --help - print this help message. @@ -217,7 +218,7 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA -Copyright (C) 2011-2015 Mageia +Copyright (C) 2011-2017 Mageia 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/gurpmi2 b/gurpmi2 index b1235c7d..50726071 100755 --- a/gurpmi2 +++ b/gurpmi2 @@ -2,6 +2,7 @@ #- Copyright (C) 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia use strict; diff --git a/rurpme b/rurpme index 4f9814d0..104d4136 100644 --- a/rurpme +++ b/rurpme @@ -1,6 +1,7 @@ #!/usr/bin/perl -T #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia use strict; use urpm::msg; diff --git a/rurpmi b/rurpmi index 204423ed..35218ca6 100644 --- a/rurpmi +++ b/rurpmi @@ -2,6 +2,7 @@ #- Copyright (C) 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia use strict; use urpm::msg; diff --git a/urpm.pm b/urpm.pm index 6037c2df..3ce373d7 100644 --- a/urpm.pm +++ b/urpm.pm @@ -615,7 +615,7 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA -Copyright (C) 2011-2015 Mageia +Copyright (C) 2011-2017 Mageia 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 2f4ec5d7..55e589ae 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -553,6 +553,8 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =for vim:ts=8:sts=4:sw=4 =cut diff --git a/urpm/bug_report.pm b/urpm/bug_report.pm index 554875e3..cdd9f130 100644 --- a/urpm/bug_report.pm +++ b/urpm/bug_report.pm @@ -80,4 +80,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/cdrom.pm b/urpm/cdrom.pm index fd843529..f10a6313 100644 --- a/urpm/cdrom.pm +++ b/urpm/cdrom.pm @@ -263,6 +263,6 @@ Copyright (C) 1999-2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA -Copyright (C) 2011-2015 Mageia +Copyright (C) 2011-2017 Mageia =cut diff --git a/urpm/cfg.pm b/urpm/cfg.pm index 95a70e0b..f9600bc7 100644 --- a/urpm/cfg.pm +++ b/urpm/cfg.pm @@ -263,4 +263,6 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/download.pm b/urpm/download.pm index fe200da7..65fdbe3b 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -1122,4 +1122,6 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/get_pkgs.pm b/urpm/get_pkgs.pm index 7f314c74..19f3a273 100644 --- a/urpm/get_pkgs.pm +++ b/urpm/get_pkgs.pm @@ -309,4 +309,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/install.pm b/urpm/install.pm index 52e246c5..8a774076 100644 --- a/urpm/install.pm +++ b/urpm/install.pm @@ -411,6 +411,6 @@ Copyright (C) 1999-2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA -Copyright (C) 2011-2015 Mageia +Copyright (C) 2011-2017 Mageia =cut diff --git a/urpm/ldap.pm b/urpm/ldap.pm index a51812cf..312d6fe5 100644 --- a/urpm/ldap.pm +++ b/urpm/ldap.pm @@ -241,4 +241,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/lock.pm b/urpm/lock.pm index 3ff04a66..6150af68 100644 --- a/urpm/lock.pm +++ b/urpm/lock.pm @@ -146,6 +146,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA -Copyright (C) 2011-2015 Mageia +Copyright (C) 2011-2017 Mageia =cut diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm index 8ce14995..b0f80741 100644 --- a/urpm/main_loop.pm +++ b/urpm/main_loop.pm @@ -3,6 +3,7 @@ package urpm::main_loop; #- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia #- #- 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 @@ -633,6 +634,6 @@ Copyright (C) 1999-2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA -Copyright (C) 2011-2015 Mageia +Copyright (C) 2011-2017 Mageia =cut diff --git a/urpm/md5sum.pm b/urpm/md5sum.pm index eb123e62..c8ff1123 100644 --- a/urpm/md5sum.pm +++ b/urpm/md5sum.pm @@ -109,4 +109,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/media.pm b/urpm/media.pm index 9dac029f..aa78a191 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -2262,6 +2262,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA -Copyright (C) 2011-2015 Mageia +Copyright (C) 2011-2017 Mageia =cut diff --git a/urpm/mirrors.pm b/urpm/mirrors.pm index 888c411e..56cabbff 100644 --- a/urpm/mirrors.pm +++ b/urpm/mirrors.pm @@ -362,4 +362,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/msg.pm b/urpm/msg.pm index 92a0dc4f..42aef122 100644 --- a/urpm/msg.pm +++ b/urpm/msg.pm @@ -226,4 +226,6 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/orphans.pm b/urpm/orphans.pm index 6d427412..703a12a0 100644 --- a/urpm/orphans.pm +++ b/urpm/orphans.pm @@ -685,6 +685,6 @@ sub installed_leaves { Copyright (C) 2008-2010 Mandriva SA -Copyright (C) 2011-2015 Mageia +Copyright (C) 2011-2017 Mageia =cut diff --git a/urpm/parallel.pm b/urpm/parallel.pm index 2bd9ebe8..06b086ee 100644 --- a/urpm/parallel.pm +++ b/urpm/parallel.pm @@ -356,6 +356,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA -Copyright (C) 2010-2015 Mageia +Copyright (C) 2011-2017 Mageia =cut diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index 925469aa..d46a0ece 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -3,6 +3,7 @@ package urpm::parallel_ka_run; #- Copyright (C) 2002, 2003, 2004, 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia use strict; use urpm::util 'find'; diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm index 5dfe3329..4bf77449 100644 --- a/urpm/parallel_ssh.pm +++ b/urpm/parallel_ssh.pm @@ -3,6 +3,7 @@ package urpm::parallel_ssh; #- Copyright (C) 2002, 2003, 2004, 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia use strict; use urpm::util 'dirname'; diff --git a/urpm/prompt.pm b/urpm/prompt.pm index 02ac5573..9fd8bdb2 100644 --- a/urpm/prompt.pm +++ b/urpm/prompt.pm @@ -52,4 +52,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/removable.pm b/urpm/removable.pm index dd7beccf..bbfbfdf7 100644 --- a/urpm/removable.pm +++ b/urpm/removable.pm @@ -171,4 +171,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/signature.pm b/urpm/signature.pm index 95653b04..40add019 100644 --- a/urpm/signature.pm +++ b/urpm/signature.pm @@ -131,4 +131,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/sys.pm b/urpm/sys.pm index c99e1381..574ddbda 100644 --- a/urpm/sys.pm +++ b/urpm/sys.pm @@ -401,4 +401,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/util.pm b/urpm/util.pm index 7f19712a..931a0bc0 100644 --- a/urpm/util.pm +++ b/urpm/util.pm @@ -234,4 +234,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/xml_info.pm b/urpm/xml_info.pm index a03126f5..10fab691 100644 --- a/urpm/xml_info.pm +++ b/urpm/xml_info.pm @@ -195,4 +195,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpm/xml_info_pkg.pm b/urpm/xml_info_pkg.pm index 634d3f83..21c72987 100644 --- a/urpm/xml_info_pkg.pm +++ b/urpm/xml_info_pkg.pm @@ -122,4 +122,6 @@ Copyright (C) 2005 MandrakeSoft SA Copyright (C) 2005-2010 Mandriva SA +Copyright (C) 2011-2017 Mageia + =cut diff --git a/urpme b/urpme index a309d490..669168b3 100755 --- a/urpme +++ b/urpme @@ -3,6 +3,7 @@ #- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia # # 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 @@ -37,7 +38,7 @@ my $yesexpr = N("Yy"); sub usage() { - print urpm::args::copyright('urpme', [ '1999-2010', 'Mandriva' ], [ '2012-2013', 'Mageia' ]) + print urpm::args::copyright('urpme', [ '1999-2010', 'Mandriva' ], [ '2011-2017', 'Mageia' ]) . N(" --help - print this help message. ") . N(" --auto - automatically select a package in choices. ") . N(" --auto-orphans - remove orphans diff --git a/urpmf b/urpmf index 2fca0573..12674216 100755 --- a/urpmf +++ b/urpmf @@ -3,6 +3,7 @@ #- Copyright (C) 2002, 2003, 2004, 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia #- #- 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 @@ -25,7 +26,7 @@ use urpm::msg; use urpm::media; sub usage() { - print urpm::args::copyright('urpmf', [ '2002-2010', 'Mandriva' ], [ '2011-2013', 'Mageia' ]) + print urpm::args::copyright('urpmf', [ '2002-2010', 'Mandriva' ], [ '2011-2017', 'Mageia' ]) . N(" --help - print this help message. ") . N(" --version - print this tool's version number. ") . N(" --env - use specific environment (typically a bug report). diff --git a/urpmi b/urpmi index 05e125c1..24b0af07 100755 --- a/urpmi +++ b/urpmi @@ -3,6 +3,7 @@ #- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia #- #- 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 @@ -62,7 +63,7 @@ $ENV{HOME} ||= "/root"; $ENV{USER} ||= "root"; sub usage () { - print urpm::args::copyright('urpmi', [ '1999-2010', 'Mandriva' ], [ '2011-2013', 'Mageia' ]) + print urpm::args::copyright('urpmi', [ '1999-2010', 'Mandriva' ], [ '2011-2017', 'Mageia' ]) . N(" --help - print this help message. ") . N(" --media - use only the given media, separated by comma. ") . N(" --excludemedia - do not use the given media, separated by comma. diff --git a/urpmi.addmedia b/urpmi.addmedia index 31853163..065453da 100755 --- a/urpmi.addmedia +++ b/urpmi.addmedia @@ -3,6 +3,7 @@ #- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia #- #- 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 21ad1e10..8b6cccad 100755 --- a/urpmi.removemedia +++ b/urpmi.removemedia @@ -3,6 +3,7 @@ #- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia #- #- 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 6eaa45b3..37bc561d 100755 --- a/urpmi.update +++ b/urpmi.update @@ -2,6 +2,7 @@ #- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia #- #- 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 ece0e439..2ce524cf 100755 --- a/urpmq +++ b/urpmq @@ -3,6 +3,7 @@ #- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA #- Copyright (C) 2005-2010 Mandriva SA +#- Copyright (C) 2011-2017 Mageia #- #- 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 @@ -36,7 +37,7 @@ our @names; our @src_names; sub usage() { - print urpm::args::copyright('urpmq', [ '2000-2010', 'Mandriva' ], [ '2012-2013', 'Mageia' ]) + print urpm::args::copyright('urpmq', [ '2000-2010', 'Mandriva' ], [ '2011-2017', 'Mageia' ]) . N(" --help - print this help message. ") . N(" --update - use only update media. ") . N(" --media - use only the given media, separated by comma. -- cgit v1.2.1