From 510102392552555bfa4699760ae9de244e56c99f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 17 Mar 2010 11:22:09 +0000 Subject: package display_release_notes.pl so that "release notes" button works in Ones & Flash live media (#58199) (broken since version 12.48 - 7 September 2009) --- perl-install/Makefile.config | 2 +- perl-install/Makefile.drakxtools | 1 + perl-install/NEWS | 2 ++ .../install/share/display_release_notes.pl | 33 ---------------------- perl-install/install/share/list.xml | 10 ++++--- perl-install/standalone/display_release_notes.pl | 33 ++++++++++++++++++++++ 6 files changed, 43 insertions(+), 38 deletions(-) delete mode 100755 perl-install/install/share/display_release_notes.pl create mode 100755 perl-install/standalone/display_release_notes.pl (limited to 'perl-install') diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index da1239ab5..ef0ee7a4b 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -9,7 +9,7 @@ SO_FILES = c/blib/arch/auto/c/c.so PMS_DIRS = c diskdrake harddrake interactive modules partition_table resize_fat security fs fs/remote PMS = *.pm $(PMS_DIRS:%=%/*.pm) install/*.pm install/help/*.pm install/commands install/install2 -STANDALONEPMS_ = adduserdrake bootloader-config display_help diskdrake drakauth drakboot drakbug drakbug_report drakclock drakedm drakdvb drakfont drakhelp drakperm draksec draksound drakupdate_fstab drakups drakxservices drakxtv fileshareset finish-install harddrake2 localedrake logdrake lsnetdrake notify-x11-free-driver-switch remove-unused-packages scannerdrake service_harddrake service_harddrake_confirm +STANDALONEPMS_ = adduserdrake bootloader-config display_help display_release_notes.pl diskdrake drakauth drakboot drakbug drakbug_report drakclock drakedm drakdvb drakfont drakhelp drakperm draksec draksound drakupdate_fstab drakups drakxservices drakxtv fileshareset finish-install harddrake2 localedrake logdrake lsnetdrake notify-x11-free-driver-switch remove-unused-packages scannerdrake service_harddrake service_harddrake_confirm STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%) ALLPMS = $(PMS) $(STANDALONEPMS) diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index f0644ca64..6874a47d5 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -41,6 +41,7 @@ install: mv -f $(SBINDEST)/drakdvb $(BINDEST) mv -f $(SBINDEST)/drakhelp $(BINDEST) mv -f $(SBINDEST)/display_help $(BINDEST) + mv -f $(SBINDEST)/display_release_notes.pl $(BINDEST) mv -f $(SBINDEST)/localedrake $(BINDEST) install -m 644 *.pm $(LIBDEST) diff --git a/perl-install/NEWS b/perl-install/NEWS index c0a03751c..9fc25567f 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,7 @@ - include 'mpt2sas' SCSI driver (#57833) - add mdadm raid10 support +- package display_release_notes.pl so that "release notes" button works in Ones + & Flash live media (#58199) (broken since version 12.48 - 7 September 2009) - harddrake: o identify HECI controllers as system devices (#58215) diff --git a/perl-install/install/share/display_release_notes.pl b/perl-install/install/share/display_release_notes.pl deleted file mode 100755 index 420209e42..000000000 --- a/perl-install/install/share/display_release_notes.pl +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/perl - -# DrakBoot -# $Id: display_release_notes 242795 2008-05-29 15:38:07Z tv $ -# Copyright (C) 2009 Mandriva -# Thierry Vignaud -# -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# so that we popup above drakx: -BEGIN { $::isInstall = 1 } - -use lib qw(/usr/lib/libDrakX); -use interactive; -use any; -use MDK::Common; - -my $in = 'interactive'->vnew('su'); -# not very safe but we run in a restricted environment anyway: -my $release_notes = cat_utf8('/tmp/release_notes.html'); -any::display_release_notes($in, $release_notes); diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 68de8d233..7a8355e90 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -453,16 +453,18 @@ + + + display_release_notes.pl + + + fonts.tar.bz2 keymaps.tar.bz2 - - display_release_notes.pl - - consolefonts symlinks upgrade diff --git a/perl-install/standalone/display_release_notes.pl b/perl-install/standalone/display_release_notes.pl new file mode 100755 index 000000000..420209e42 --- /dev/null +++ b/perl-install/standalone/display_release_notes.pl @@ -0,0 +1,33 @@ +#!/usr/bin/perl + +# DrakBoot +# $Id: display_release_notes 242795 2008-05-29 15:38:07Z tv $ +# Copyright (C) 2009 Mandriva +# Thierry Vignaud +# +# 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# so that we popup above drakx: +BEGIN { $::isInstall = 1 } + +use lib qw(/usr/lib/libDrakX); +use interactive; +use any; +use MDK::Common; + +my $in = 'interactive'->vnew('su'); +# not very safe but we run in a restricted environment anyway: +my $release_notes = cat_utf8('/tmp/release_notes.html'); +any::display_release_notes($in, $release_notes); -- cgit v1.2.1