summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-03-17 11:22:09 +0000
committerThierry Vignaud <tv@mandriva.org>2010-03-17 11:22:09 +0000
commit510102392552555bfa4699760ae9de244e56c99f (patch)
tree88b2567f773b05c0352c4cdf3dd75e62880af910
parent2ae7e3cd0d0473a628907ea12c01d81ce8ea24dd (diff)
downloaddrakx-backup-do-not-use-510102392552555bfa4699760ae9de244e56c99f.tar
drakx-backup-do-not-use-510102392552555bfa4699760ae9de244e56c99f.tar.gz
drakx-backup-do-not-use-510102392552555bfa4699760ae9de244e56c99f.tar.bz2
drakx-backup-do-not-use-510102392552555bfa4699760ae9de244e56c99f.tar.xz
drakx-backup-do-not-use-510102392552555bfa4699760ae9de244e56c99f.zip
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)
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/Makefile.drakxtools1
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/share/list.xml10
-rwxr-xr-xperl-install/standalone/display_release_notes.pl (renamed from perl-install/install/share/display_release_notes.pl)0
5 files changed, 10 insertions, 5 deletions
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/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
diff --git a/perl-install/install/share/display_release_notes.pl b/perl-install/standalone/display_release_notes.pl
index 420209e42..420209e42 100755
--- a/perl-install/install/share/display_release_notes.pl
+++ b/perl-install/standalone/display_release_notes.pl