commit yast2-tv for openSUSE:Factory
Hello community,
here is the log from the commit of package yast2-tv for openSUSE:Factory checked in at 2013-02-28 07:32:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-tv (Old)
and /work/SRC/openSUSE:Factory/.yast2-tv.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-tv", Maintainer is "lslezak@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-tv/yast2-tv.changes 2011-10-05 17:49:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-tv.new/yast2-tv.changes 2013-02-28 10:24:28.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Mar 29 16:15:57 CEST 2012 - jsuchome@suse.cz
+
+- merged proofread texts
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-tv.spec ++++++
--- /var/tmp/diff_new_pack.giTuRg/_old 2013-02-28 10:24:28.000000000 +0100
+++ /var/tmp/diff_new_pack.giTuRg/_new 2013-02-28 10:24:28.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-tv
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: yast2-tv
Version: 2.21.4
@@ -25,19 +23,22 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-tv-%{version}.tar.bz2
-Prefix: /usr
-
-Group: System/YaST
-License: GPL-2.0+
-BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-sound yast2-testsuite
+BuildRequires: perl-XML-Writer
+BuildRequires: update-desktop-files
+BuildRequires: yast2
+BuildRequires: yast2-devtools
+BuildRequires: yast2-sound
+BuildRequires: yast2-testsuite
# .modprobe_blacklist agent
Requires: yast2-core >= 2.16.19
# GetInstArgs::automatic_configuration
Requires: yast2 >= 2.21.22
Requires: yast2-sound
-Provides: yast2-config-tv yast2-db-tv
-Obsoletes: yast2-config-tv yast2-db-tv
+Provides: yast2-config-tv
+Provides: yast2-db-tv
+Obsoletes: yast2-config-tv
+Obsoletes: yast2-db-tv
Provides: yast2-lib-hardware
Obsoletes: yast2-lib-hardware
Provides: yast2-trans-tv
@@ -47,6 +48,8 @@
BuildArch: noarch
Summary: YaST2 - TV Configuration
+License: GPL-2.0+
+Group: System/YaST
%description
This package contains the YaST2 component for TV card configuration.
@@ -55,23 +58,22 @@
%setup -n yast2-tv-%{version}
%build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_prefix}/bin/y2tool y2autoconf
+%{_prefix}/bin/y2tool y2automake
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-%{?suse_update_config:%{suse_update_config -f}}
-./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
@@ -96,9 +98,9 @@
/usr/share/YaST2/include/tv/*
/usr/share/YaST2/clients/*.ycp
/usr/share/YaST2/modules/*.*
-%{prefix}/share/applications/YaST2/*.desktop
+%{_prefix}/share/applications/YaST2/*.desktop
/usr/share/YaST2/scrconf/*.scr
/usr/share/YaST2/data/*.ycp
-%doc %{prefix}/share/doc/packages/yast2-tv
+%doc %{_prefix}/share/doc/packages/yast2-tv
%changelog
++++++ yast2-tv-2.21.4.tar.bz2 ++++++
++++ 5656 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-tv-2.21.4/COPYING new/yast2-tv-2.21.4/COPYING
--- old/yast2-tv-2.21.4/COPYING 2011-10-04 15:26:30.000000000 +0200
+++ new/yast2-tv-2.21.4/COPYING 2013-02-22 11:16:03.000000000 +0100
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ 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
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@
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
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@
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
@@ -168,7 +168,7 @@
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
@@ -225,7 +225,7 @@
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
@@ -255,7 +255,7 @@
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ 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
@@ -277,9 +277,9 @@
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
+ 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
@@ -303,17 +303,16 @@
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
-
+ 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.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 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.
@@ -336,5 +335,5 @@
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
+library. If this is what you want to do, use the GNU Lesser 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-tv-2.21.4/Makefile.am.common new/yast2-tv-2.21.4/Makefile.am.common
--- old/yast2-tv-2.21.4/Makefile.am.common 2011-10-04 15:16:01.000000000 +0200
+++ new/yast2-tv-2.21.4/Makefile.am.common 2013-02-22 11:15:53.000000000 +0100
@@ -30,7 +30,7 @@
dist-hook: check-syntax
CHECK_SYNTAX = true
-check-syntax: $(client_DATA) $(ycpchook)
+check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
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-tv-2.21.4/agents/cfg_lirc.scr new/yast2-tv-2.21.4/agents/cfg_lirc.scr
--- old/yast2-tv-2.21.4/agents/cfg_lirc.scr 2007-05-18 12:49:12.000000000 +0200
+++ new/yast2-tv-2.21.4/agents/cfg_lirc.scr 2013-01-22 12:18:22.000000000 +0100
@@ -5,7 +5,7 @@
* SCR Agent for reading/writing /etc/sysconfig/lirc
* using the sysconfig-agent
*
- * $Id: cfg_lirc.scr 13018 2003-12-11 12:52:53Z jhumpol $
+ * $Id$
*
* Read/Sets the values defined in <tt>/etc/sysconfig/lirc</tt>
* in an easy manner.
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-tv-2.21.4/agents/modprobe_tv.scr new/yast2-tv-2.21.4/agents/modprobe_tv.scr
--- old/yast2-tv-2.21.4/agents/modprobe_tv.scr 2009-03-26 08:24:55.000000000 +0100
+++ new/yast2-tv-2.21.4/agents/modprobe_tv.scr 2013-01-22 12:18:22.000000000 +0100
@@ -18,7 +18,7 @@
* Write(.modules.options, $["agp_try_unsupported":"0"], "agpgart")
* (true)
*
- * $Id: modprobe_tv.scr 56404 2009-03-26 07:24:53Z lslezak $
+ * $Id$
*
* <p>Reads/writes <tt>/etc/modprobe.conf/tv</tt>. For more detail see its
* own documentation.</p>
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-tv-2.21.4/agents/xawtvrc.scr new/yast2-tv-2.21.4/agents/xawtvrc.scr
--- old/yast2-tv-2.21.4/agents/xawtvrc.scr 2007-05-18 12:49:12.000000000 +0200
+++ new/yast2-tv-2.21.4/agents/xawtvrc.scr 2013-01-22 12:18:22.000000000 +0100
@@ -4,7 +4,7 @@
* Summary:
* SCR Agent for reading/writing /etc/X11/xawtvrc using the ini-agent
*
- * $Id: xawtvrc.scr 13018 2003-12-11 12:52:53Z jhumpol $
+ * $Id$
*
* Read/Sets the values defined in <tt>/etc/X11/xawtvrc</tt>.
*/
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-tv-2.21.4/autodocs-ycp.ami new/yast2-tv-2.21.4/autodocs-ycp.ami
--- old/yast2-tv-2.21.4/autodocs-ycp.ami 2011-10-04 15:16:01.000000000 +0200
+++ new/yast2-tv-2.21.4/autodocs-ycp.ami 2013-02-22 11:15:53.000000000 +0100
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
+# $Id$
# Builds source documentation for YCP sources
# Uses ycpdoc
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-tv-2.21.4/configure.in new/yast2-tv-2.21.4/configure.in
--- old/yast2-tv-2.21.4/configure.in 2011-10-04 15:16:01.000000000 +0200
+++ new/yast2-tv-2.21.4/configure.in 2013-02-22 11:15:52.000000000 +0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-tv
dnl
-dnl -- This file is generated by y2autoconf 2.21.4 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-tv, 2.21.4, http://bugs.opensuse.org/, yast2-tv)
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-tv-2.21.4/data/Makefile.am new/yast2-tv-2.21.4/data/Makefile.am
--- old/yast2-tv-2.21.4/data/Makefile.am 2011-03-09 15:41:42.000000000 +0100
+++ new/yast2-tv-2.21.4/data/Makefile.am 2013-01-22 12:18:22.000000000 +0100
@@ -1,7 +1,7 @@
#
# Makefile.am for tv/data
#
-# $Id: Makefile.am 63552 2011-03-09 14:41:41Z lslezak $
+# $Id$
#
ydata_DATA = tv_cards-lirc_gpio.ycp tv_cards.ycp tv_tuners.ycp tv_dvbcards.ycp tv_dvbfirmware.ycp
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-tv-2.21.4/data/tv_cards-lirc_gpio.ycp new/yast2-tv-2.21.4/data/tv_cards-lirc_gpio.ycp
--- old/yast2-tv-2.21.4/data/tv_cards-lirc_gpio.ycp 2007-05-18 12:49:12.000000000 +0200
+++ new/yast2-tv-2.21.4/data/tv_cards-lirc_gpio.ycp 2013-01-22 12:18:22.000000000 +0100
@@ -2,7 +2,7 @@
* TV cards using ir-kbd-gpio module for LIRC
* data gathered from lirc_gpio.c and bttv.h
*
- * $Id: tv_cards-lirc_gpio.ycp 15782 2004-03-09 14:20:50Z jsuchome $
+ * $Id$
*/
$[
"bttv": [
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-tv-2.21.4/data/tv_dvbcards.ycp new/yast2-tv-2.21.4/data/tv_dvbcards.ycp
--- old/yast2-tv-2.21.4/data/tv_dvbcards.ycp 2008-06-19 07:59:55.000000000 +0200
+++ new/yast2-tv-2.21.4/data/tv_dvbcards.ycp 2013-01-22 12:18:22.000000000 +0100
@@ -1,7 +1,7 @@
/*
* Yast2 DVB card database
*
- * $Id: tv_dvbcards.ycp 48410 2008-06-19 05:59:54Z lslezak $
+ * $Id$
*/
{
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-tv-2.21.4/data/tv_dvbfirmware.ycp new/yast2-tv-2.21.4/data/tv_dvbfirmware.ycp
--- old/yast2-tv-2.21.4/data/tv_dvbfirmware.ycp 2009-09-22 14:57:05.000000000 +0200
+++ new/yast2-tv-2.21.4/data/tv_dvbfirmware.ycp 2013-01-22 12:18:22.000000000 +0100
@@ -3,7 +3,7 @@
*
* See /usr/src/linux/Documentation/dvb/get_dvb_firmware script
*
- * $Id: tv_dvbfirmware.ycp 58706 2009-09-22 12:57:04Z lslezak $
+ * $Id$
*/
{
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-tv-2.21.4/doc/Makefile.am new/yast2-tv-2.21.4/doc/Makefile.am
--- old/yast2-tv-2.21.4/doc/Makefile.am 2007-05-18 12:49:12.000000000 +0200
+++ new/yast2-tv-2.21.4/doc/Makefile.am 2013-01-22 12:18:22.000000000 +0100
@@ -1,7 +1,7 @@
#
# Makefile.am for y2c_tv/doc
#
-# $Id: Makefile.am 6558 2002-09-09 14:08:34Z jsuchome $
+# $Id$
#
SUBDIRS = autodocs
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-tv-2.21.4/missing new/yast2-tv-2.21.4/missing
--- old/yast2-tv-2.21.4/missing 2011-10-04 15:16:03.000000000 +0200
+++ new/yast2-tv-2.21.4/missing 2013-02-22 11:15:57.000000000 +0100
@@ -1,10 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.18; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard
participants (1)
-
root@hilbert.suse.de