From 510102392552555bfa4699760ae9de244e56c99f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
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)

---
 .../install/share/display_release_notes.pl         | 33 ----------------------
 perl-install/install/share/list.xml                | 10 ++++---
 2 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100755 perl-install/install/share/display_release_notes.pl

(limited to 'perl-install/install')

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 @@
   </to>
 </from>
 
+<from dir="../standalone">
+  <to dir="/usr/bin">
+    display_release_notes.pl
+  </to>
+</from>
+
 <from dir="share">
   <from expand="tar">
     fonts.tar.bz2
     keymaps.tar.bz2
   </from>
 
-  <to dir="/usr/bin">
-    display_release_notes.pl
-  </to>
-
   <to dir="/usr/share">
     consolefonts symlinks
     upgrade
-- 
cgit v1.2.1