Hello community,
here is the log from the commit of package yast2-devtools
checked in at Wed Oct 3 00:47:57 CEST 2007.
--------
--- yast2-devtools/yast2-devtools.changes 2007-09-12 14:00:50.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-devtools/yast2-devtools.changes 2007-10-02 10:24:36.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Oct 2 10:23:44 CEST 2007 - mvidner@suse.cz
+
+- One copy of the license is enough (COPYING), removed
+ COPYRIGHT.english (#299144).
+- 2.16.0
+
+-------------------------------------------------------------------
Old:
----
yast2-devtools-2.15.9.tar.bz2
New:
----
yast2-devtools-2.16.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-devtools.spec ++++++
--- /var/tmp/diff_new_pack.Y20380/_old 2007-10-03 00:47:51.000000000 +0200
+++ /var/tmp/diff_new_pack.Y20380/_new 2007-10-03 00:47:51.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-devtools (Version 2.15.9)
+# spec file for package yast2-devtools (Version 2.16.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,13 +11,13 @@
# norootforbuild
Name: yast2-devtools
-Version: 2.15.9
+Version: 2.16.0
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-devtools-2.15.9.tar.bz2
-prefix: /usr
+Source0: yast2-devtools-2.16.0.tar.bz2
+Prefix: /usr
BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer pkgconfig sgml-skel
Requires: perl
Requires: perl-XML-Writer
@@ -29,7 +29,7 @@
Provides: yast2-config-newmodule yast2-trans-newmodule
Obsoletes: yast2-config-newmodule yast2-trans-newmodule
Summary: YaST2 - Development Tools
-BuildArchitectures: noarch
+BuildArch: noarch
%description
Scripts and templates for developing YaST2 modules and components.
@@ -48,7 +48,7 @@
Michal Svec
%prep
-%setup -n yast2-devtools-2.15.9
+%setup -n yast2-devtools-2.16.0
%build
autoreconf --force --install
@@ -86,8 +86,11 @@
%{prefix}/share/aclocal/*.m4
%{prefix}/share/pkgconfig/yast2-devtools.pc
%doc %{prefix}/share/doc/packages/yast2-devtools
-
%changelog
+* Tue Oct 02 2007 - mvidner@suse.cz
+- One copy of the license is enough (COPYING), removed
+ COPYRIGHT.english (#299144).
+- 2.16.0
* Wed Sep 12 2007 - dfiser@suse.cz
- Added support for reading from stdin to showy2log script.
- 2.15.9
++++++ yast2-devtools-2.15.9.tar.bz2 -> yast2-devtools-2.16.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.15.9/configure new/yast2-devtools-2.16.0/configure
--- old/yast2-devtools-2.15.9/configure 2007-09-12 13:59:37.000000000 +0200
+++ new/yast2-devtools-2.16.0/configure 2007-10-02 10:42:29.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-devtools 2.15.9.
+# Generated by GNU Autoconf 2.61 for yast2-devtools 2.16.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-devtools'
PACKAGE_TARNAME='yast2-devtools'
-PACKAGE_VERSION='2.15.9'
-PACKAGE_STRING='yast2-devtools 2.15.9'
+PACKAGE_VERSION='2.16.0'
+PACKAGE_STRING='yast2-devtools 2.16.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1449,7 +1449,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-devtools 2.15.9 to adapt to many kinds of systems.
+\`configure' configures yast2-devtools 2.16.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1520,7 +1520,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-devtools 2.15.9:";;
+ short | recursive ) echo "Configuration of yast2-devtools 2.16.0:";;
esac
cat <<\_ACEOF
@@ -1629,7 +1629,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-devtools configure 2.15.9
+yast2-devtools configure 2.16.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1643,7 +1643,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-devtools $as_me 2.15.9, which was
+It was created by yast2-devtools $as_me 2.16.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2464,7 +2464,7 @@
# Define the identity of the package.
PACKAGE='yast2-devtools'
- VERSION='2.15.9'
+ VERSION='2.16.0'
cat >>confdefs.h <<_ACEOF
@@ -2691,7 +2691,7 @@
-VERSION="2.15.9"
+VERSION="2.16.0"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner "
@@ -20653,7 +20653,7 @@
ac_config_files="$ac_config_files devtools/bin/version"
-ac_config_files="$ac_config_files Makefile devtools/bin/Makefile devtools/admin/po/Makefile devtools/admin/copyright/yast/Makefile devtools/admin/copyright/gpl/Makefile devtools/admin/copyright/Makefile devtools/admin/aclocal/Makefile devtools/admin/aminclude/Makefile devtools/admin/Makefile devtools/skeletons/Makefile devtools/doc/skeletons/config/Makefile devtools/doc/skeletons/Makefile devtools/doc/Makefile devtools/data/Makefile devtools/Makefile docbook/stylesheets/Makefile docbook/css/Makefile docbook/images/navig/Makefile docbook/images/admon/Makefile docbook/images/Makefile docbook/Makefile doxygen/Makefile scrdoc/doc/Makefile scrdoc/src/Makefile scrdoc/Makefile y2logview/y2log_ana/Makefile y2logview/Makefile yast2/check_ycp/doc/Makefile yast2/check_ycp/Makefile yast2/Makefile ycpdoc/doc/example/Makefile ycpdoc/doc/Makefile ycpdoc/src/Makefile ycpdoc/testsuite/Makefile ycpdoc/Makefile ydoc/doc/Makefile ydoc/src/Makefile ydoc/po-tools/Makefile ydoc/Makefile"
+ac_config_files="$ac_config_files Makefile devtools/bin/Makefile devtools/admin/po/Makefile devtools/admin/copyright/yast/Makefile devtools/admin/copyright/gpl/Makefile devtools/admin/copyright/Makefile devtools/admin/aclocal/Makefile devtools/admin/aminclude/Makefile devtools/admin/Makefile devtools/skeletons/Makefile devtools/doc/skeletons/config/Makefile devtools/doc/skeletons/Makefile devtools/doc/Makefile devtools/data/Makefile devtools/Makefile docbook/stylesheets/Makefile docbook/css/Makefile docbook/images/navig/Makefile docbook/images/admon/Makefile docbook/images/Makefile docbook/Makefile doxygen/Makefile scrdoc/doc/Makefile scrdoc/src/Makefile scrdoc/Makefile yast2/check_ycp/doc/Makefile yast2/check_ycp/Makefile yast2/Makefile ycpdoc/doc/example/Makefile ycpdoc/doc/Makefile ycpdoc/src/Makefile ycpdoc/testsuite/Makefile ycpdoc/Makefile ydoc/doc/Makefile ydoc/src/Makefile ydoc/po-tools/Makefile ydoc/Makefile y2logview/y2log_ana/Makefile y2logview/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -21137,7 +21137,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-devtools $as_me 2.15.9, which was
+This file was extended by yast2-devtools $as_me 2.16.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21184,7 +21184,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-devtools config.status 2.15.9
+yast2-devtools config.status 2.16.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21316,8 +21316,6 @@
"scrdoc/doc/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/doc/Makefile" ;;
"scrdoc/src/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/src/Makefile" ;;
"scrdoc/Makefile") CONFIG_FILES="$CONFIG_FILES scrdoc/Makefile" ;;
- "y2logview/y2log_ana/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/y2log_ana/Makefile" ;;
- "y2logview/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/Makefile" ;;
"yast2/check_ycp/doc/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/check_ycp/doc/Makefile" ;;
"yast2/check_ycp/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/check_ycp/Makefile" ;;
"yast2/Makefile") CONFIG_FILES="$CONFIG_FILES yast2/Makefile" ;;
@@ -21330,6 +21328,8 @@
"ydoc/src/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/src/Makefile" ;;
"ydoc/po-tools/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/po-tools/Makefile" ;;
"ydoc/Makefile") CONFIG_FILES="$CONFIG_FILES ydoc/Makefile" ;;
+ "y2logview/y2log_ana/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/y2log_ana/Makefile" ;;
+ "y2logview/Makefile") CONFIG_FILES="$CONFIG_FILES y2logview/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.15.9/configure.in new/yast2-devtools-2.16.0/configure.in
--- old/yast2-devtools-2.15.9/configure.in 2007-09-12 13:59:30.000000000 +0200
+++ new/yast2-devtools-2.16.0/configure.in 2007-10-02 10:42:05.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-devtools
dnl
-dnl -- This file is generated by y2autoconf 2.15.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-devtools, 2.15.9, http://bugs.opensuse.org/, yast2-devtools)
+AC_INIT(yast2-devtools, 2.16.0, http://bugs.opensuse.org/, yast2-devtools)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.9"
+VERSION="2.16.0"
RPMNAME="yast2-devtools"
MAINTAINER="Martin Vidner "
@@ -208,8 +208,6 @@
scrdoc/doc/Makefile
scrdoc/src/Makefile
scrdoc/Makefile
-y2logview/y2log_ana/Makefile
-y2logview/Makefile
yast2/check_ycp/doc/Makefile
yast2/check_ycp/Makefile
yast2/Makefile
@@ -221,6 +219,8 @@
ydoc/doc/Makefile
ydoc/src/Makefile
ydoc/po-tools/Makefile
-ydoc/Makefile)
+ydoc/Makefile
+y2logview/y2log_ana/Makefile
+y2logview/Makefile)
AC_OUTPUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.15.9/COPYRIGHT.english new/yast2-devtools-2.16.0/COPYRIGHT.english
--- old/yast2-devtools-2.15.9/COPYRIGHT.english 2007-09-12 13:59:52.000000000 +0200
+++ new/yast2-devtools-2.16.0/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 old/yast2-devtools-2.15.9/devtools/admin/copyright/gpl/COPYRIGHT.english new/yast2-devtools-2.16.0/devtools/admin/copyright/gpl/COPYRIGHT.english
--- old/yast2-devtools-2.15.9/devtools/admin/copyright/gpl/COPYRIGHT.english 2007-09-12 13:41:45.000000000 +0200
+++ new/yast2-devtools-2.16.0/devtools/admin/copyright/gpl/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 old/yast2-devtools-2.15.9/devtools/admin/copyright/gpl/Makefile.am new/yast2-devtools-2.16.0/devtools/admin/copyright/gpl/Makefile.am
--- old/yast2-devtools-2.15.9/devtools/admin/copyright/gpl/Makefile.am 2007-09-12 13:41:45.000000000 +0200
+++ new/yast2-devtools-2.16.0/devtools/admin/copyright/gpl/Makefile.am 2007-10-02 10:22:50.000000000 +0200
@@ -6,7 +6,6 @@
copyright_DATA = \
COPYING \
- COPYRIGHT.english \
README
EXTRA_DIST = $(copyright_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.15.9/devtools/admin/copyright/gpl/Makefile.in new/yast2-devtools-2.16.0/devtools/admin/copyright/gpl/Makefile.in
--- old/yast2-devtools-2.15.9/devtools/admin/copyright/gpl/Makefile.in 2007-09-12 13:59:37.000000000 +0200
+++ new/yast2-devtools-2.16.0/devtools/admin/copyright/gpl/Makefile.in 2007-10-02 10:42:33.000000000 +0200
@@ -213,7 +213,6 @@
copyrightdir = @YAST2DEVTOOLS@/admin/copyright/gpl
copyright_DATA = \
COPYING \
- COPYRIGHT.english \
README
EXTRA_DIST = $(copyright_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.15.9/devtools/admin/copyright/gpl/README new/yast2-devtools-2.16.0/devtools/admin/copyright/gpl/README
--- old/yast2-devtools-2.15.9/devtools/admin/copyright/gpl/README 2007-09-12 13:41:45.000000000 +0200
+++ new/yast2-devtools-2.16.0/devtools/admin/copyright/gpl/README 2007-10-02 10:22:50.000000000 +0200
@@ -1,2 +1,2 @@
This program/library is part of YaST2
-See the file COPYRIGHT.english for license terms
+See the file COPYING for license terms
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.15.9/devtools/admin/Makefile.am.toplevel new/yast2-devtools-2.16.0/devtools/admin/Makefile.am.toplevel
--- old/yast2-devtools-2.15.9/devtools/admin/Makefile.am.toplevel 2007-09-12 13:41:46.000000000 +0200
+++ new/yast2-devtools-2.16.0/devtools/admin/Makefile.am.toplevel 2007-10-02 10:22:50.000000000 +0200
@@ -23,7 +23,7 @@
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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.15.9/devtools/bin/showy2log new/yast2-devtools-2.16.0/devtools/bin/showy2log
--- old/yast2-devtools-2.15.9/devtools/bin/showy2log 2007-09-12 13:49:27.000000000 +0200
+++ new/yast2-devtools-2.16.0/devtools/bin/showy2log 2007-09-18 16:55:51.000000000 +0200
@@ -41,7 +41,7 @@
my $debuglvl = 0;
my $vcs_id = '$Id: showy2log 40869 2007-09-12 11:50:09Z dfiser $';
-my $vcs_date = '$Date: 2007-09-12 13:50:09 +0200 (Wed, 12 Sep 2007) $';
+my $vcs_date = '$Date: 2007-09-12 13:50:09 +0200 (St, 12 zář 2007) $';
$vcs_id =~ /^\$[[:alpha:]]+: [^ ]+ ([^ ]+ [^ ]+ [^ ]+) [^ ]+.*$/;
my $version = $1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.15.9/devtools/bin/version new/yast2-devtools-2.16.0/devtools/bin/version
--- old/yast2-devtools-2.15.9/devtools/bin/version 2007-09-12 13:59:44.000000000 +0200
+++ new/yast2-devtools-2.16.0/devtools/bin/version 2007-10-02 10:43:01.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/bash
-echo 2.15.9
+echo 2.16.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-devtools-2.15.9/devtools/bin/y2makeall new/yast2-devtools-2.16.0/devtools/bin/y2makeall
--- old/yast2-devtools-2.15.9/devtools/bin/y2makeall 2007-09-12 13:41:46.000000000 +0200
+++ new/yast2-devtools-2.16.0/devtools/bin/y2makeall 2007-10-02 10:03:42.000000000 +0200
@@ -73,6 +73,7 @@
my $work_root = $ENV{'PWD'};
+my $build_root = $work_root . "/build";
my $make_log = $work_root . "/make.log";
my $failed_log = $work_root . "/failed-packages.log";
@@ -86,6 +87,14 @@
my $dry_run = 0;
my $prefix = "/usr";
my $enable_print_summary = 1;
+my $enable_make_zypp = 0;
+my $libzypp_source = "";
+my $libzypp_prefix = "/usr";
+my $icecream_prefix = "/opt/icecream";
+my $jobs = 8;
+
+# cmake defines
+my $zypp_defines = "";
# Verbosity values
@@ -152,6 +161,8 @@
my $dump_build_order = 0;
my $dump_dependencies = 0;
my $ignore_libzypp = 0;
+ my $build_libzypp = 0;
+ my $enable_icecream = 0;
GetOptions( "favourites-only" => \$favourites_only,
"fast" => \$disable_make_makefile_cvs,
@@ -161,6 +172,12 @@
"dump-dependencies" => \$dump_dependencies,
"dry-run" => \$dry_run,
"ignore-libzypp" => \$ignore_libzypp,
+ "build-libzypp" => \$build_libzypp,
+ "libzypp-source=s" => \$libzypp_source,
+ "libzypp-prefix=s" => \$libzypp_prefix,
+ "icecream" => \$enable_icecream,
+ "icecream-prefix=s" => \$icecream_prefix,
+ "jobs=i" => \$jobs,
"verbose" => \$verbose,
"debug" => \$debug,
"silent" => \$silent,
@@ -196,13 +213,36 @@
die "FATAL: Call \"$prog_name\" from your YaST2 CVS or Subversion working directory! (yast2/source)\n"
unless -f "devtools/RPMNAME";
+ #
+ # Check if correct zypp directory was specified
+ #
+
+ if ( $build_libzypp ) {
+ die "FATAL: wrong zypp source dir specified!\n"
+ unless -f "$libzypp_source/libzypp.pc.cmake";
+ }
#
- # Make sure we have exactly one version of libzypp installed
+ # Set up logs
#
+ open( LOG, ">" . $make_log ) or warn "Couldn't open $make_log";
+ open( FAILED_LOG, ">" . $failed_log ) or warn "Couldn't open $failed_log";
+ $OUTPUT_AUTOFLUSH = 1;
+
+ #
+ # Build libzypp if necessary and
+ # make sure we have exactly one version of libzypp installed
+ #
+
+ make_libzypp_build() if $build_libzypp;
check_libzypp() unless $ignore_libzypp;
+ #
+ # disable icecream_prefix if we don't need it
+ #
+
+ $icecream_prefix = "" unless $enable_icecream;
#
# All remaining command line parameters go to "make".
@@ -223,14 +263,6 @@
#
- # Set up logs
- #
-
- open( LOG, ">" . $make_log ) or warn "Couldn't open $make_log";
- open( FAILED_LOG, ">" . $failed_log ) or warn "Couldn't open $failed_log";
- $OUTPUT_AUTOFLUSH = 1;
-
- #
# Make a hash from the exclude list
#
@@ -828,6 +860,20 @@
#-----------------------------------------------------------------------------
+# Build libzypp
+
+sub make_libzypp_build()
+{
+ # zypp cmake defines
+
+ my $zypp_defines = "-DCMAKE_INSTALL_PREFIX=$libzypp_prefix";
+
+ cmake( $libzypp_source, $zypp_defines );
+
+}
+
+#-----------------------------------------------------------------------------
+
# Build in build order
sub make_in_build_order()
@@ -870,6 +916,101 @@
}
}
+#-----------------------------------------------------------------------------
+
+# Make cmake package.
+#
+# Parameters:
+# $dir source dir
+# $defines cmake build defines
+
+sub cmake()
+{
+ my( $pkg_dir, $defines ) = @_;
+ my $error = 0;
+ my $pkg = basename( $pkg_dir );
+
+ chdir $work_root;
+
+ log_progress( "Building", $pkg );
+ log_progress( "\tcreate temp. build dir" );
+
+ system_int( "mkdir -p $build_root/$pkg >>$make_log 2>&1" );
+
+ if ( $CHILD_ERROR )
+ {
+ log_error( "'mkdir -p $build_root/$pkg' failed for $pkg: $!" );
+ $error = 1;
+ }
+
+ #
+ # cmake in build dir
+ #
+
+ if ( ! $error )
+ {
+ chdir "$build_root/$pkg";
+
+ log_progress( "\tcmake build in $pkg_dir" );
+
+ system_int( "cmake $defines $pkg_dir >>$make_log 2>&1" );
+
+ if ( $CHILD_ERROR )
+ {
+ log_error( "'cmake $defines $pkg_dir' failed for $pkg" );
+ $error = 1;
+ }
+ }
+
+ #
+ # make
+ #
+
+ if ( ! $error )
+ {
+ log_progress ( "\tmake $pkg" );
+ system_int( "make -C $build_root/$pkg -j$jobs $make_target >>$make_log 2>&1" );
+
+ if ( $CHILD_ERROR )
+ {
+ log_error( "'make -C $build_root/$pkg -j$jobs $make_target' failed for $pkg" );
+ $error = 1;
+ }
+ }
+
+ #
+ # sudo make install
+ #
+
+ if ( $make_target eq "" && ! $error )
+ {
+ log_progress( "\t$sudo_cmd make -C $build_root/$pkg install" );
+ sudo_system_int( "make -C $build_root/$pkg install >>$make_log 2>&1" );
+
+ if ( $CHILD_ERROR )
+ {
+ log_error( "'$sudo_cmd make -C $build_root/$pkg install' failed for $pkg" );
+ $error = 1;
+ }
+ }
+
+ #
+ # Summary
+ #
+
+ if ( $error )
+ {
+ push( @failed_dirs, $pkg );
+ print FAILED_LOG "$pkg\n";
+ }
+ else
+ {
+ log_progress( "\tOK" );
+ $successful_count++;
+ }
+
+ chdir $work_root;
+}
#-----------------------------------------------------------------------------
@@ -888,6 +1029,38 @@
log_progress( "Building", basename( $pkg_dir ) );
+ my $make_env = "";
+ my $path = "";
+ my $pkg_config_path = "";
+ my $ld_library_path = "";
+ my $perllib = "";
+
+ #
+ # prepare make environment
+ #
+
+ # libzypp pkgconfig path
+ $ld_library_path = "$libzypp_prefix/lib64:$libzypp_prefix/lib";
+ $pkg_config_path = "$libzypp_prefix/lib64/pkgconfig:$libzypp_prefix/lib/pkgconfig:";
+
+ # YaST pkgconfig path
+
+ $pkg_config_path .= "$prefix/lib64/pkgconfig:$prefix/lib/pkgconfig:$prefix/share/pkgconfig:";
+
+ # perl libs
+ $perllib = "$prefix/lib/perl5/5.8.8/x86_64-linux-thread-multi:$prefix/lib/perl5/5.8.8:" .
+ "$prefix/lib/perl5/vendor_perl/5.8.8/x86_64-linux-thread-multi:$prefix/lib/perl5/vendor_perl/5.8.8:" .
+ "$prefix/lib/perl5/vendor_perl";
+
+ # PATH
+
+ $path = "$prefix/bin:\$PATH";
+ $path = "$icecream_prefix/bin:" . $path if $icecream_prefix;
+
+ # install prefix and PKG_CONFIG_PATH
+
+ $make_env = "YCPC_Y2DIR=$prefix/share/YaST2 PREFIX=$prefix PKG_CONFIG_PATH=\"$pkg_config_path\$PKG_CONFIG_PATH\" PATH=\"$path\" YCPC_LD_LIBRARY_PATH=\"$ld_library_path\" PERLLIB=\"$perllib\"";
+
# Check if "make -f Makefile.cvs" must be performed.
# Even if command line option "-f" (fast mode - sets $disable_make_makefile_cvs)
@@ -908,7 +1081,7 @@
system_int( "rm -rf autom4te.cache >>$make_log 2>&1" ) unless $dry_run;
log_progress( "\tmake -f Makefile.cvs" );
- system_int( "make -f Makefile.cvs >>$make_log 2>&1" ) unless $dry_run;
+ system_int( "$make_env make -e -f Makefile.cvs >>$make_log 2>&1" ) unless $dry_run;
if ( $CHILD_ERROR )
{
@@ -925,11 +1098,11 @@
if ( ! $error )
{
log_progress( "\tmake $make_target" );
- system_int( "make $make_target >>$make_log 2>&1" ) unless $dry_run;
+ system_int( "$make_env make -e -j$jobs $make_target >>$make_log 2>&1" ) unless $dry_run;
if ( $CHILD_ERROR )
{
- log_error( "'make $make_target' failed for $pkg_dir" );
+ log_error( "'make -j$jobs $make_target' failed for $pkg_dir" );
$error = 1;
}
}
@@ -1047,7 +1220,7 @@
sub check_libzypp()
{
- my @libs = ;
+ my @libs = <$libzypp_prefix/lib/libzypp.so* $libzypp_prefix/lib64/libzypp.so.*>;
my @libzypp;
my $libzypp_count = 0;
my $lib;
@@ -1079,7 +1252,7 @@
{
die <