diff options
-rw-r--r-- | perl-install/scanner.pm | 2 | ||||
-rw-r--r-- | perl-install/standalone.pm | 2 | ||||
-rwxr-xr-x | perl-install/standalone/diskdrake | 2 | ||||
-rwxr-xr-x | perl-install/standalone/drakautoinst | 2 | ||||
-rwxr-xr-x | perl-install/standalone/drakboot | 2 | ||||
-rwxr-xr-x | perl-install/standalone/drakbug | 3 | ||||
-rwxr-xr-x | perl-install/standalone/drakedm | 2 | ||||
-rwxr-xr-x | perl-install/standalone/drakfloppy | 2 | ||||
-rwxr-xr-x | perl-install/standalone/drakfont | 4 | ||||
-rwxr-xr-x | perl-install/standalone/drakhelp | 2 | ||||
-rwxr-xr-x | perl-install/standalone/draksec | 2 | ||||
-rwxr-xr-x | perl-install/standalone/draksound | 2 | ||||
-rwxr-xr-x | perl-install/standalone/drakupdate_fstab | 2 | ||||
-rwxr-xr-x | perl-install/standalone/drakxtv | 2 | ||||
-rwxr-xr-x | perl-install/standalone/fileshareset | 2 | ||||
-rwxr-xr-x | perl-install/standalone/finish-install | 2 | ||||
-rwxr-xr-x | perl-install/standalone/finish-install.xsetup | 2 | ||||
-rwxr-xr-x | perl-install/standalone/harddrake2 | 2 | ||||
-rwxr-xr-x | perl-install/standalone/logdrake | 2 | ||||
-rwxr-xr-x | perl-install/standalone/scannerdrake | 2 |
20 files changed, 22 insertions, 21 deletions
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm index be972a260..0d9015eec 100644 --- a/perl-install/scanner.pm +++ b/perl-install/scanner.pm @@ -2,7 +2,7 @@ package scanner; # scanner.pm $Id$ # Yves Duret <yduret at mandriva.com> # Till Kamppeter <till at mandriva.com> -# Copyright (C) 2001-2004 Mandriva +# Copyright (C) 2001-2008 Mandriva # # 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/perl-install/standalone.pm b/perl-install/standalone.pm index 42f73744f..e19600777 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -141,7 +141,7 @@ sub real_version { sub version() { print 'Drakxtools version ' . real_version() . ' -Copyright (C) 1999-2006 Mandriva by <install@mandriva.com> +Copyright (C) 1999-2008 Mandriva by <install@mandriva.com> ', $::license, "\n"; } diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index 97564e3e0..0d4bbc9ef 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -1,7 +1,7 @@ #!/usr/bin/perl # DiskDrake -# Copyright (C) 1999-2006 Mandriva (pixel@mandrakesoft.com) +# Copyright (C) 1999-2008 Mandriva (pixel@mandrakesoft.com) # # 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/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index 42c415a22..9534d513d 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -3,7 +3,7 @@ # # Guillaume Cottenceau (gc@mandrakesoft.com) # -# Copyright 2001-2006 Mandriva +# Copyright 2001-2008 Mandriva # # This software may be freely redistributed under the terms of the GNU # public license. diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 7c3a66daf..1d71f6bd8 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -2,7 +2,7 @@ # DrakBoot # $Id$ -# Copyright (C) 2001-2006 Mandriva +# Copyright (C) 2001-2008 Mandriva # Yves Duret, Thierry Vignaud # # This program is free software; you can redistribute it and/or modify diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index d89490db2..d064b1ae8 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -1,7 +1,7 @@ #!/usr/bin/perl # Drak Bug Report -# Copyright (C) 2002-2006 Mandriva (daouda at mandriva dot com) +# Copyright (C) 2002-2008 Mandriva (daouda at mandriva dot com) # Stew Benedict (sbenedict at mandriva dot com) # # This program is free software; you can redistribute it and/or modify @@ -66,6 +66,7 @@ if (!check_for_xserver) { $gdb_trace, '') if $error; + #c::exit(1); } mygtk2::init(); diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm index 03e3213cf..36c8200d6 100755 --- a/perl-install/standalone/drakedm +++ b/perl-install/standalone/drakedm @@ -1,6 +1,6 @@ #!/usr/bin/perl # DrakxDM -- Display Manager chooser -# Copyright (C) 2003-2006 Mandriva (tvignaud@mandriva.com) +# Copyright (C) 2003-2008 Mandriva (tvignaud@mandriva.com) # # 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/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index 1dcc5b0d6..f0b35321a 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -3,7 +3,7 @@ # DrakFloppy # $Id$ # -# Copyright (C) 2001-2006 Mandriva +# Copyright (C) 2001-2008 Mandriva # Yves Duret # Thierry Vignaud # diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index cce577201..9ed05beec 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -1,7 +1,7 @@ #!/usr/bin/perl # -*- coding: utf-8 -*- # -# Copyright (C) 2001-2007 by Mandriva SA +# Copyright (C) 2001-2008 by Mandriva SA # DUPONT Sebastien # Damien Chaumette # Thierry Vignaud @@ -530,7 +530,7 @@ sub help() { $license =~ s/\n/\n\n/sg; # nicer formatting my $w = gtknew('AboutDialog', name => N("Drakfont"), version => mandrake_release_info()->{version}, - copyright => N("Copyright (C) 2001-2006 by Mandriva"), + copyright => N("Copyright (C) 2001-2008 by Mandriva"), license => $license, wrap_license => 1, comments => N("Font installer."), website => 'http://mandrivalinux.com', diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp index 4e4716684..3eaf580cc 100755 --- a/perl-install/standalone/drakhelp +++ b/perl-install/standalone/drakhelp @@ -19,7 +19,7 @@ Copyright (C) %s Mandriva. This is free software and may be redistributed under the terms of the GNU GPL. Usage: -", '2003-2006') . N(" --help - display this help +", '2003-2008') . N(" --help - display this help ") . N(" --id <id_label> - load the html help page which refers to id_label ") . N(" --doc <link> - link to another web page ( for WM welcome frontend) "); diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index 38ba2c02f..7fd59a2b9 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -1,7 +1,7 @@ #!/usr/bin/perl #***************************************************************************** # -# Copyright (c) 2002-2006 Christian Belisle +# Copyright (c) 2002-2008 Christian Belisle # Thierry Vignaud <tvignaud@mandrakesoft.com> # # This program is free software; you can redistribute it and/or modify diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound index 0258cbe9d..90ae002f2 100755 --- a/perl-install/standalone/draksound +++ b/perl-install/standalone/draksound @@ -1,6 +1,6 @@ #!/usr/bin/perl # DrakxSound -# Copyright (C) 2002-2006 Mandriva (tvignaud@mandriva.com) +# Copyright (C) 2002-2008 Mandriva (tvignaud@mandriva.com) # # 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/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab index 5c615f726..6ab4a40f6 100755 --- a/perl-install/standalone/drakupdate_fstab +++ b/perl-install/standalone/drakupdate_fstab @@ -1,7 +1,7 @@ #!/usr/bin/perl # drakupdate_fstab -# Copyright (C) 2002-2006 Mandriva (pixel@mandrakesoft.com) +# Copyright (C) 2002-2008 Mandriva (pixel@mandrakesoft.com) # # 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/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index 55b8e272e..63f2e36cd 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -2,7 +2,7 @@ # DrakxTV # $Id$ -# Copyright (C) 2002-2006 Mandriva (tvignaud@mandriva.com) +# Copyright (C) 2002-2008 Mandriva (tvignaud@mandriva.com) # # 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/perl-install/standalone/fileshareset b/perl-install/standalone/fileshareset index d09749739..c67e89545 100755 --- a/perl-install/standalone/fileshareset +++ b/perl-install/standalone/fileshareset @@ -12,7 +12,7 @@ my $authorisation_group = 'fileshare'; ######################################## # fileshare utility $Id$ -# Copyright (C) 2001-2006 Mandriva (pixel@mandrakesoft.com) +# Copyright (C) 2001-2008 Mandriva (pixel@mandrakesoft.com) # # 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/perl-install/standalone/finish-install b/perl-install/standalone/finish-install index 8579cfc67..5e3438813 100755 --- a/perl-install/standalone/finish-install +++ b/perl-install/standalone/finish-install @@ -184,7 +184,7 @@ sub call { } } -call('language'); +#call('language'); call('license'); # "Previous" button isn't functiunnal and acts like "next" (#25349) $::Wizard_no_previous = 1; diff --git a/perl-install/standalone/finish-install.xsetup b/perl-install/standalone/finish-install.xsetup index e80d2e23a..ca7e536bb 100755 --- a/perl-install/standalone/finish-install.xsetup +++ b/perl-install/standalone/finish-install.xsetup @@ -1,5 +1,5 @@ #!/bin/sh -# (c) 2005-2006 Mandriva SA +# (c) 2005-2008 Mandriva SA # to be sourced if [ -f /etc/sysconfig/finish-install -a -x /usr/sbin/finish-install ]; then diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index b0435b097..6bd946102 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -231,7 +231,7 @@ my @menu_items = $license =~ s/\n/\n\n/sg; # nicer formatting my $w = gtknew('AboutDialog', name => N("Harddrake"), version => mandrake_release_info()->{version}, - copyright => N("Copyright (C) %s by Mandriva", '2001-2007'), + copyright => N("Copyright (C) %s by Mandriva", '2001-2008'), license => $license, wrap_license => 1, comments => N("This is HardDrake, a %s hardware configuration tool.", $distro_name), website => 'http://mandrivalinux.com', diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index 00ccaeaf5..20f663645 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -1,7 +1,7 @@ #! /usr/bin/perl # $Id$ -# Copyright (C) 2001-2006 Mandriva +# Copyright (C) 2001-2008 Mandriva # Yves Duret <yduret at mandriva.com> # some code is Copyright: (C) 1999, Michael T. Babcock <mikebabcock@pobox.com> # diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index b4c319d61..e120d2f78 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -3,7 +3,7 @@ # scannerdrake $Id$ # Yves Duret <yduret at mandriva.com> # Till Kamppeter <till at mandriva.com> -# Copyright (C) 2001-2006 Mandriva +# Copyright (C) 2001-2008 Mandriva # # 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 |