Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Wed Oct 31 16:47:19 CET 2007.
--------
--- yast2-bootloader/yast2-bootloader.changes 2007-10-11 15:29:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2007-10-31 14:41:50.161319000 +0100
@@ -1,0 +2,12 @@
+Wed Oct 31 14:32:59 CET 2007 - dfiser@suse.cz
+
+- Adapted to change of StorageDevices API.
+- v2.16.2
+
+-------------------------------------------------------------------
+Wed Oct 31 14:08:59 CET 2007 - locilka@suse.cz
+
+- installedVersion and updateVersion moved from 'Update' to
+ 'Installation' YCP module to remove dependencies.
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.16.1.tar.bz2
New:
----
yast2-bootloader-2.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.xJ1267/_old 2007-10-31 16:47:00.000000000 +0100
+++ /var/tmp/diff_new_pack.xJ1267/_new 2007-10-31 16:47:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.16.1)
+# spec file for package yast2-bootloader (Version 2.16.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-bootloader
-Version: 2.16.1
+Version: 2.16.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.16.1.tar.bz2
+Source0: yast2-bootloader-2.16.2.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite
# to eliminate a cyclic dependency in autobuild:
@@ -50,7 +50,7 @@
Olaf Dabrunz
%prep
-%setup -n yast2-bootloader-2.16.1
+%setup -n yast2-bootloader-2.16.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -94,6 +94,12 @@
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Wed Oct 31 2007 - dfiser@suse.cz
+- Adapted to change of StorageDevices API.
+- v2.16.2
+* Wed Oct 31 2007 - locilka@suse.cz
+- installedVersion and updateVersion moved from 'Update' to
+ 'Installation' YCP module to remove dependencies.
* Thu Oct 11 2007 - od@suse.de
- migrate SLES9 persistent device ("...p1") names to SLES10
persistent device names ("...-part1") (#162216)
++++++ yast2-bootloader-2.16.1.tar.bz2 -> yast2-bootloader-2.16.2.tar.bz2 ++++++
++++ 7521 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/configure.in new/yast2-bootloader-2.16.2/configure.in
--- old/yast2-bootloader-2.16.1/configure.in 2007-07-03 14:50:07.000000000 +0200
+++ new/yast2-bootloader-2.16.2/configure.in 2007-10-31 14:40:51.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-bootloader
dnl
-dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-bootloader, 2.15.8, http://bugs.opensuse.org/, yast2-bootloader)
+AC_INIT(yast2-bootloader, 2.16.2, http://bugs.opensuse.org/, yast2-bootloader)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -14,10 +14,11 @@
AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
+dnl long filenames; we use GNU Make extensions and that's ok
+AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.15.8"
+VERSION="2.16.2"
RPMNAME="yast2-bootloader"
MAINTAINER="Olaf Dabrunz "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/COPYRIGHT.english new/yast2-bootloader-2.16.2/COPYRIGHT.english
--- old/yast2-bootloader-2.16.1/COPYRIGHT.english 2007-10-11 15:23:51.000000000 +0200
+++ new/yast2-bootloader-2.16.2/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C) <year> <name of author>
-
- 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 of the License, 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
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/Makefile.am new/yast2-bootloader-2.16.2/Makefile.am
--- old/yast2-bootloader-2.16.1/Makefile.am 2007-07-03 14:50:08.000000000 +0200
+++ new/yast2-bootloader-2.16.2/Makefile.am 2007-10-31 14:40:51.000000000 +0100
@@ -23,14 +23,15 @@
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
+COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+# less strict; prefer bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
@@ -210,8 +211,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# Contents of ./SUBDIRS
SUBDIRS = src scripts agents doc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/src/ChangeLog new/yast2-bootloader-2.16.2/src/ChangeLog
--- old/yast2-bootloader-2.16.1/src/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-bootloader-2.16.2/src/ChangeLog 2007-10-24 15:26:51.000000000 +0200
@@ -0,0 +1,6 @@
+2008-08-28 Philipp Thomas
+
+ * clients/bootloader_finish(func == write): Remember status and
+ call FlagOnetimeBoot if all went well. Use
+ Bootloader::getDefaultSection to get the name of the default
+ section.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.16.2/src/clients/bootloader_finish.ycp
--- old/yast2-bootloader-2.16.1/src/clients/bootloader_finish.ycp 2007-10-11 14:55:02.000000000 +0200
+++ new/yast2-bootloader-2.16.2/src/clients/bootloader_finish.ycp 2007-10-31 14:11:09.000000000 +0100
@@ -9,7 +9,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: bootloader_finish.ycp 41373 2007-10-11 12:55:01Z odabrunz $
+ * $Id: bootloader_finish.ycp 41683 2007-10-31 13:09:38Z locilka $
*
*/
@@ -23,7 +23,6 @@
import "Linuxrc";
import "Misc";
import "Mode";
-import "Update";
import "BootCommon";
any ret = nil;
@@ -164,8 +163,8 @@
else
{
retcode = Bootloader::Update (
- Update::installedVersion,
- Update::updateVersion);
+ Installation::installedVersion,
+ Installation::updateVersion);
}
if (retcode) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/src/grub/misc.ycp new/yast2-bootloader-2.16.2/src/grub/misc.ycp
--- old/yast2-bootloader-2.16.1/src/grub/misc.ycp 2007-08-10 20:08:38.000000000 +0200
+++ new/yast2-bootloader-2.16.2/src/grub/misc.ycp 2007-10-31 14:32:15.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: misc.ycp 40212 2007-08-10 18:08:36Z odabrunz $
+ * $Id: misc.ycp 41687 2007-10-31 13:32:10Z dfiser $
*
*/
@@ -44,7 +44,7 @@
if (BootCommon::globals["boot_custom"]:nil == nil)
ret = false;
else if (BootCommon::globals["boot_custom"]:nil ==
- StorageDevices::FloppyDevice)
+ StorageDevices::FloppyDevice())
ret = true;
else if (contains (BootCommon::getFloppyDevices (),
BootCommon::globals["boot_custom"]:nil))
@@ -508,8 +508,8 @@
ids[index] = true;
}
});
- if (StorageDevices::FloppyPresent)
- BootCommon::device_mapping[StorageDevices::FloppyDevice] = "fd0";
+ if (StorageDevices::FloppyPresent())
+ BootCommon::device_mapping[StorageDevices::FloppyDevice()] = "fd0";
y2milestone ("Detected device mapping: %1", BootCommon::device_mapping);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/src/modules/BootGRUB.ycp new/yast2-bootloader-2.16.2/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.16.1/src/modules/BootGRUB.ycp 2007-10-11 14:55:05.000000000 +0200
+++ new/yast2-bootloader-2.16.2/src/modules/BootGRUB.ycp 2007-10-31 14:32:15.000000000 +0100
@@ -15,7 +15,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootGRUB.ycp 41373 2007-10-11 12:55:01Z odabrunz $
+ * $Id: BootGRUB.ycp 41687 2007-10-31 13:32:10Z dfiser $
*
*/
@@ -567,7 +567,7 @@
"__devs" : [],
]);
}
- else if (StorageDevices::FloppyPresent)
+ else if (StorageDevices::FloppyPresent())
{
out = add (out, $[
"name" : BootCommon::translateSectionTitle("floppy"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/src/modules/ChangeLog new/yast2-bootloader-2.16.2/src/modules/ChangeLog
--- old/yast2-bootloader-2.16.1/src/modules/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-bootloader-2.16.2/src/modules/ChangeLog 2007-10-24 15:26:51.000000000 +0200
@@ -0,0 +1,12 @@
+2007-08-28 Philipp Thomas
+
+ * Bootloader(Summary): Turn code to determine section index into
+ Function and move it to
+ * BootCommon(Section2Index): Here.
+ * BootGRUB(FlagOnetimeBoot): reverse renaming.
+ Use BootCommon::Section2Index to get index of section.
+ * BootLILO(FlagOnetimeBoot): Rename back to old name.
+ * BootELILO(FlagOnetimeBoot): Likewise.
+ * BootPOWERLILO(FlagOnetimeBoot): Likewise.
+ * BootZIPL(FlagOnetimeBoot): Likewise.
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/src/routines/ChangeLog new/yast2-bootloader-2.16.2/src/routines/ChangeLog
--- old/yast2-bootloader-2.16.1/src/routines/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-bootloader-2.16.2/src/routines/ChangeLog 2007-10-24 15:26:51.000000000 +0200
@@ -0,0 +1,9 @@
+2007-08-28 Philipp Thomas
+
+ * switcher.ycp(blFlagBootDefaultOnce): Renamed back to old name.
+
+
+2007-08-23 Philipp Thomas
+
+ * switcher.ycp(blFlagOneTimeBoot): Rename to blFlagBootDefaultOnce,
+ and map to flagbootdefaultonce.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/src/routines/global_widgets.ycp new/yast2-bootloader-2.16.2/src/routines/global_widgets.ycp
--- old/yast2-bootloader-2.16.1/src/routines/global_widgets.ycp 2006-09-27 02:26:21.000000000 +0200
+++ new/yast2-bootloader-2.16.2/src/routines/global_widgets.ycp 2007-10-31 14:32:15.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: global_widgets.ycp 33156 2006-09-27 00:26:18Z odabrunz $
+ * $Id: global_widgets.ycp 41687 2007-10-31 13:32:10Z dfiser $
*
*/
@@ -519,13 +519,13 @@
)));
};
- if (StorageDevices::FloppyPresent)
+ if (StorageDevices::FloppyPresent())
{
targetlist = add (targetlist, `VSpacing (1));
targetlist = add (targetlist, `Left (`RadioButton (`id ("floppy"),
`opt (`notify),
// radiobutton, %1 is device name, typically /dev/fd0
- sformat (_("&Floppy Disk %1"), StorageDevices::FloppyDevice),
+ sformat (_("&Floppy Disk %1"), StorageDevices::FloppyDevice()),
(BootCommon::selected_location == "floppy")
)));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/src/routines/helps.ycp new/yast2-bootloader-2.16.2/src/routines/helps.ycp
--- old/yast2-bootloader-2.16.1/src/routines/helps.ycp 2006-01-02 14:59:32.000000000 +0100
+++ new/yast2-bootloader-2.16.2/src/routines/helps.ycp 2007-10-31 14:32:15.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: helps.ycp 26696 2005-12-21 09:31:47Z visnov $
+ * $Id: helps.ycp 41687 2007-10-31 13:32:10Z dfiser $
*
*/
@@ -126,7 +126,7 @@
if it is needed or configure your other boot manager
to start &product;.</p>");
- if (StorageDevices::FloppyPresent)
+ if (StorageDevices::FloppyPresent())
{
// custom bootloader help text, 4 of 7
// this part will only be shown if a floppy drive is attached.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/src/routines/lilolike.ycp new/yast2-bootloader-2.16.2/src/routines/lilolike.ycp
--- old/yast2-bootloader-2.16.1/src/routines/lilolike.ycp 2007-10-11 14:55:08.000000000 +0200
+++ new/yast2-bootloader-2.16.2/src/routines/lilolike.ycp 2007-10-31 14:32:15.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: lilolike.ycp 41373 2007-10-11 12:55:01Z odabrunz $
+ * $Id: lilolike.ycp 41687 2007-10-31 13:32:10Z dfiser $
*
*/
{
@@ -1242,8 +1242,8 @@
ids[index] = true;
}
});
- if (StorageDevices::FloppyPresent)
- device_mapping[StorageDevices::FloppyDevice] = "fd0";
+ if (StorageDevices::FloppyPresent())
+ device_mapping[StorageDevices::FloppyDevice()] = "fd0";
y2milestone ("Detected device mapping: %1", device_mapping);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/src/routines/misc.ycp new/yast2-bootloader-2.16.2/src/routines/misc.ycp
--- old/yast2-bootloader-2.16.1/src/routines/misc.ycp 2007-08-13 22:32:15.000000000 +0200
+++ new/yast2-bootloader-2.16.2/src/routines/misc.ycp 2007-10-31 14:32:15.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: misc.ycp 40242 2007-08-13 20:32:13Z odabrunz $
+ * $Id: misc.ycp 41687 2007-10-31 13:32:10Z dfiser $
*
* WARNING:
* To be included to BootCommon.ycp only, requires function
@@ -606,7 +606,7 @@
if (BootCommon::selected_location == "root")
return BootCommon::RootPartitionDevice;
if (BootCommon::selected_location == "floppy")
- return StorageDevices::FloppyDevice;
+ return StorageDevices::FloppyDevice();
if (BootCommon::selected_location == "mbr_md")
return "mbr_md";
if (BootCommon::selected_location == "none")
@@ -678,7 +678,7 @@
// FIXME: floppy support is probably obsolete
if ( haskey(BootCommon::globals, "boot_floppy") &&
BootCommon::globals["boot_floppy"]:"false" == "true" ) {
- ret = add(ret, StorageDevices::FloppyDevice);
+ ret = add(ret, StorageDevices::FloppyDevice());
}
if ( haskey(BootCommon::globals, "boot_custom") ) {
ret = add(ret, BootCommon::globals["boot_custom"]:"");
@@ -716,7 +716,7 @@
boolean ret = false;
if (loader_device == nil)
ret = false;
- else if (loader_device == StorageDevices::FloppyDevice)
+ else if (loader_device == StorageDevices::FloppyDevice())
ret = true;
else if (contains (getFloppyDevices (), loader_device))
ret = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.16.1/VERSION new/yast2-bootloader-2.16.2/VERSION
--- old/yast2-bootloader-2.16.1/VERSION 2007-10-11 15:22:18.000000000 +0200
+++ new/yast2-bootloader-2.16.2/VERSION 2007-10-31 14:34:07.000000000 +0100
@@ -1 +1 @@
-2.16.1
+2.16.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org