February 2013 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-firewall for openSUSE:Factory
by root＠hilbert.suse.de 28 Feb '13

28 Feb '13

Hello community, here is the log from the commit of package yast2-firewall for openSUSE:Factory checked in at 2013-02-28 07:26:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-firewall (Old) and /work/SRC/openSUSE:Factory/.yast2-firewall.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-firewall", Maintainer is "yast2-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-firewall/yast2-firewall.changes 2011-11-05 12:15:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-firewall.new/yast2-firewall.changes 2013-02-28 10:24:05.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 13 13:44:09 CET 2012 - tgoettlicher(a)suse.de + +- confirmed license GPL v2 +- 2.21.3 + +------------------------------------------------------------------- +Thu Mar 29 14:45:40 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Old: ---- yast2-firewall-2.21.2.tar.bz2 New: ---- yast2-firewall-2.21.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.4UIcq2/_old 2013-02-28 10:24:06.000000000 +0100 +++ /var/tmp/diff_new_pack.4UIcq2/_new 2013-02-28 10:24:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-firewall # -# 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,20 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-firewall -Version: 2.21.2 +Version: 2.21.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-firewall-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0+ -BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files BuildRequires: yast2 >= 2.16.47 +BuildRequires: yast2-devtools +BuildRequires: yast2-testsuite # Netmask::CheckPrefix4 Requires: yast2 >= 2.18.26 @@ -44,6 +43,8 @@ BuildArch: noarch Summary: YaST2 - Firewall Configuration +License: GPL-2.0 +Group: System/YaST %description A YaST2 module to be used for configuring a firewall. @@ -59,7 +60,6 @@ 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} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works ++++++ yast2-firewall-2.21.2.tar.bz2 -> yast2-firewall-2.21.3.tar.bz2 ++++++ ++++ 4700 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-firewall-2.21.2/COPYING new/yast2-firewall-2.21.3/COPYING --- old/yast2-firewall-2.21.2/COPYING 2011-11-04 16:07:50.000000000 +0100 +++ new/yast2-firewall-2.21.3/COPYING 2013-02-22 10:51:40.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-firewall-2.21.2/MAINTAINER new/yast2-firewall-2.21.3/MAINTAINER --- old/yast2-firewall-2.21.2/MAINTAINER 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/MAINTAINER 2013-01-22 11:19:16.000000000 +0100 @@ -1 +1 @@ -Lukas Ocilka <locilka(a)suse.cz> +YaST2 Maintainers <yast2-maintainers(a)suse.de> 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-firewall-2.21.2/Makefile.am.common new/yast2-firewall-2.21.3/Makefile.am.common --- old/yast2-firewall-2.21.2/Makefile.am.common 2011-11-04 14:33:54.000000000 +0100 +++ new/yast2-firewall-2.21.3/Makefile.am.common 2013-02-22 10:51:25.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-firewall-2.21.2/VERSION new/yast2-firewall-2.21.3/VERSION --- old/yast2-firewall-2.21.2/VERSION 2011-11-04 15:51:19.000000000 +0100 +++ new/yast2-firewall-2.21.3/VERSION 2013-01-22 11:19:16.000000000 +0100 @@ -1 +1 @@ -2.21.2 +2.21.3 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-firewall-2.21.2/autodocs-ycp.ami new/yast2-firewall-2.21.3/autodocs-ycp.ami --- old/yast2-firewall-2.21.2/autodocs-ycp.ami 2011-11-04 14:33:54.000000000 +0100 +++ new/yast2-firewall-2.21.3/autodocs-ycp.ami 2013-02-22 10:51:25.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-firewall-2.21.2/configure.in new/yast2-firewall-2.21.3/configure.in --- old/yast2-firewall-2.21.2/configure.in 2011-11-04 14:33:54.000000000 +0100 +++ new/yast2-firewall-2.21.3/configure.in 2013-02-22 10:51:25.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-firewall dnl -dnl -- This file is generated by y2autoconf 2.21.6 - 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-firewall, 2.21.1, http://bugs.opensuse.org/, yast2-firewall) +AC_INIT(yast2-firewall, 2.21.3, http://bugs.opensuse.org/, yast2-firewall) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,9 +18,9 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.1" +VERSION="2.21.3" RPMNAME="yast2-firewall" -MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" +MAINTAINER="YaST2 Maintainers <yast2-maintainers(a)suse.de>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig 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-firewall-2.21.2/doc/Makefile.am new/yast2-firewall-2.21.3/doc/Makefile.am --- old/yast2-firewall-2.21.2/doc/Makefile.am 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/doc/Makefile.am 2013-01-22 11:19:16.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile.am for y2c_firewall/doc # -# $Id: Makefile.am 3154 2002-07-01 15:52:42Z msvec $ +# $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-firewall-2.21.2/missing new/yast2-firewall-2.21.3/missing --- old/yast2-firewall-2.21.2/missing 2011-11-04 14:33:59.000000000 +0100 +++ new/yast2-firewall-2.21.3/missing 2013-02-22 10:51:35.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 <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' sed_minuso='s/.* -o $[^ ]*$.*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-automake(a)gnu.org>." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac 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-firewall-2.21.2/src/SuSEFirewallCMDLine.ycp new/yast2-firewall-2.21.3/src/SuSEFirewallCMDLine.ycp --- old/yast2-firewall-2.21.2/src/SuSEFirewallCMDLine.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/SuSEFirewallCMDLine.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,5 +1,25 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** - * Copyright 2004, Novell, Inc. All rights reserved. * * File: modules/SuSEFirewallCMDLine.ycp * Package: Firewall configuration @@ -7,7 +27,7 @@ * Authors: Lukas Ocilka <locilka(a)suse.cz> * Internal * - * $Id: SuSEFirewallCMDLine.ycp 50387 2008-08-26 17:12:46Z kmachalkova $ + * $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-firewall-2.21.2/src/SuSEFirewallUI.ycp new/yast2-firewall-2.21.3/src/SuSEFirewallUI.ycp --- old/yast2-firewall-2.21.2/src/SuSEFirewallUI.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/SuSEFirewallUI.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,5 +1,25 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** - * Copyright 2004, Novell, Inc. All rights reserved. * * File: modules/SuSEFirewallUI.ycp * Package: Firewall configuration @@ -7,7 +27,7 @@ * Authors: Lukas Ocilka <locilka(a)suse.cz> * Internal * - * $Id: SuSEFirewallUI.ycp 57028 2009-04-29 10:58:09Z 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-firewall-2.21.2/src/complex.ycp new/yast2-firewall-2.21.3/src/complex.ycp --- old/yast2-firewall-2.21.2/src/complex.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/complex.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,10 +1,31 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** * File: include/firewall/complex.ycp * Package: Firewall configuration * Summary: Complex dialogs definitions * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: complex.ycp 49128 2008-07-15 16:39:03Z locilka $ + * $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-firewall-2.21.2/src/dialogs.ycp new/yast2-firewall-2.21.3/src/dialogs.ycp --- old/yast2-firewall-2.21.2/src/dialogs.ycp 2011-11-02 14:25:49.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/dialogs.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,10 +1,31 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** * File: firewall/dialogs.ycp * Package: Configuration YaST2 Firewall * Summary: Configuration dialogs and workflow * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: dialogs.ycp 54815 2009-01-20 13:55:47Z locilka $ + * $Id$ * * Configuration dialogs and workflow. * Both Expert and Simple. 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-firewall-2.21.2/src/firewall.ycp new/yast2-firewall-2.21.3/src/firewall.ycp --- old/yast2-firewall-2.21.2/src/firewall.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/firewall.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,12 +1,32 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** - * Copyright 2004, Novell, Inc. All rights reserved. * * File: clients/firewall.ycp * Package: Firewall configuration * Summary: Firewall configuration dialogs * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: firewall.ycp 48908 2008-07-08 09:33:41Z locilka $ + * $Id$ * * File includes helps for yast2-firewall dialogs. */ 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-firewall-2.21.2/src/firewall_auto.ycp new/yast2-firewall-2.21.3/src/firewall_auto.ycp --- old/yast2-firewall-2.21.2/src/firewall_auto.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/firewall_auto.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,3 +1,24 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** * File: clients/firewall_auto.ycp * Package: SuSE firewall configuration @@ -5,7 +26,7 @@ * Authors: Anas Nashif <nashif(a)suse.de> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: firewall_auto.ycp 22126 2005-03-02 09:59:24Z locilka $ + * $Id$ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. 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-firewall-2.21.2/src/firewall_proposal.ycp new/yast2-firewall-2.21.3/src/firewall_proposal.ycp --- old/yast2-firewall-2.21.2/src/firewall_proposal.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/firewall_proposal.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,10 +1,31 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** * File: clients/firewall_proposal.ycp * Package: Firewall configuration * Summary: Firewall configuration proposal * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: firewall_proposal.ycp 59187 2009-10-23 16:01:47Z kmachalkova $ + * $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-firewall-2.21.2/src/generalfunctions.ycp new/yast2-firewall-2.21.3/src/generalfunctions.ycp --- old/yast2-firewall-2.21.2/src/generalfunctions.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/generalfunctions.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,10 +1,31 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** * File: firewall/generalfunctions * Package: Configuration YaST2 Firewall * Summary: General Handling Functions * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: generalfunctions.ycp 36538 2007-02-27 13:30:50Z locilka $ + * $Id$ */ { textdomain "firewall"; 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-firewall-2.21.2/src/helps.ycp new/yast2-firewall-2.21.3/src/helps.ycp --- old/yast2-firewall-2.21.2/src/helps.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/helps.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,12 +1,32 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** - * Copyright 2004, Novell, Inc. All rights reserved. * * File: include/firewall/helps.ycp * Package: Firewall configuration * Summary: Firewall dialogs helps * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: helps.ycp 61937 2010-04-30 12:26:20Z locilka $ + * $Id$ * * File includes helps for yast2-firewall dialogs. */ @@ -52,15 +72,16 @@ // TRANSLATORS: Allowed services dialog help 1/2 "allowed-services" : _("<big>Allowed Services</big> - Here, specify services or ports that should be accessible from the network. + Specify services or ports that should be accessible from the network. Networks are divided into firewall zones. To allow a service, select the Zone and the Service to Allow then press Add. To remove an allowed service, select the Zone and the Allowed Service then press Delete. -By deselecting Protect Firewall from Internal Zone, remove -protection from the zone. All services and ports would be unprotected from this zone. +By deselecting Protect Firewall from Internal Zone, you remove +protection from the zone. All services and ports in your internal network will +be unprotected. ") + // TRANSLATORS: Allowed services dialog help 2/2 @@ -191,18 +212,21 @@ // TRANSLATORS: help for Installation Proposal Dialog "installation_proposal" : _("<big>Firewall</big> -Firewall is a defensive mechanism that protects your computer from network attacks."), +A firewall is a defensive mechanism that protects your computer from network attacks. +"), // TRANSLATORS: general help for Custom Rules 1/5 "custom-rules" : _("<big>Custom Rules</big> -Here you can set special firewall rules that allow new connections -matching these rules.") + +Set special firewall rules that allow new connections +matching these rules. +") + // TRANSLATORS: general help for Custom Rules 2/5 _("Source Network -Network or IP where the connection comes from, +Network or IP address where the connection comes from, e.g., <tt>192.168.0.1</tt> or <tt>192.168.0.0/255.255.255.0</tt> -or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>).") + +or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>). +") + // TRANSLATORS: general help for Custom Rules 3/5 _("Protocol @@ -223,9 +247,10 @@ // TRANSLATORS: help for Custom Rules - Adding new rule 1/4 "custom-rules-popup" : _("Source Network -Network or IP where the connection comes from, +Network or IP address where the connection comes from, e.g., <tt>192.168.0.1</tt> or <tt>192.168.0.0/255.255.255.0</tt> -or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>).") + +or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>). +") + // TRANSLATORS: help for Custom Rules - Adding new rule 2/4 _("Protocol 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-firewall-2.21.2/src/subdialogs.ycp new/yast2-firewall-2.21.3/src/subdialogs.ycp --- old/yast2-firewall-2.21.2/src/subdialogs.ycp 2011-11-04 15:51:36.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/subdialogs.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,10 +1,31 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** * File: include/firewall/dialogs.ycp * Package: Configuration YaST2 Firewall * Summary: Configuration screens * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: subdialogs.ycp 66702 2011-11-04 14:50:21Z locilka $ + * $Id$ * * Configuration dialogs divided into smaller logic groups. * Both Expert and Simple. 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-firewall-2.21.2/src/summary.ycp new/yast2-firewall-2.21.3/src/summary.ycp --- old/yast2-firewall-2.21.2/src/summary.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/summary.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,12 +1,32 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** - * Copyright 2004, Novell, Inc. All rights reserved. * * File: firewall/summary.ycp * Package: Firewall configuration * Summary: Firewall configuration summary * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: summary.ycp 65402 2011-08-26 11:41:52Z locilka $ + * $Id$ * * Summary functions. */ @@ -331,21 +351,21 @@ // Is running and will be running again if (SuSEFirewall::IsStarted()) { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall starts after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall starts after the configuration has been written") + li_end + "\n"; // Is stopped and will be running } else { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall starts after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall starts after the configuration has been written") + li_end + "\n"; } } else { // Is running and will be stopped if (SuSEFirewall::IsStarted()) { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will be stopped after the configuration is written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall will be stopped after the configuration has been written") + li_end + "\n"; // Is not running and will not be running } else { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will not start after the configuration is written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall will not start after the configuration has been written") + li_end + "\n"; } } 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-firewall-2.21.2/src/uifunctions.ycp new/yast2-firewall-2.21.3/src/uifunctions.ycp --- old/yast2-firewall-2.21.2/src/uifunctions.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/uifunctions.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,10 +1,31 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** * File: firewall/uifunctions.ycp * Package: Configuration YaST2 Firewall * Summary: Configuration dialogs handling functions * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: uifunctions.ycp 65402 2011-08-26 11:41:52Z locilka $ + * $Id$ * * Configuration dialogs handling. * Both Expert and Simple. @@ -1206,7 +1227,8 @@ if (Popup::YesNo (_("Firewall automatic starting has been disabled but firewall is currently running. -Stop the firewall after the new configuration is written?"))) { +Stop the firewall after the new configuration has been written? +"))) { y2milestone ("User decided to stop the firewall after it is disabled"); new_running = false; } else { 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-firewall-2.21.2/src/wizards.ycp new/yast2-firewall-2.21.3/src/wizards.ycp --- old/yast2-firewall-2.21.2/src/wizards.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/src/wizards.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,12 +1,32 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /** - * Copyright 2004, Novell, Inc. All rights reserved. * * File: firewall/wizards.ycp * Package: Firewall configuration * Summary: Wizards definition * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: wizards.ycp 49128 2008-07-15 16:39:03Z locilka $ + * $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-firewall-2.21.2/testsuite/tests/Functions.ycp new/yast2-firewall-2.21.3/testsuite/tests/Functions.ycp --- old/yast2-firewall-2.21.2/testsuite/tests/Functions.ycp 2011-11-01 13:20:37.000000000 +0100 +++ new/yast2-firewall-2.21.3/testsuite/tests/Functions.ycp 2013-01-22 11:19:16.000000000 +0100 @@ -1,3 +1,24 @@ +/**************************************************************************** + +Copyright (c) 2000 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { include "testsuite.ycp";

1 0

commit yast2-fcoe-client for openSUSE:Factory
by root＠hilbert.suse.de 28 Feb '13

28 Feb '13

Hello community, here is the log from the commit of package yast2-fcoe-client for openSUSE:Factory checked in at 2013-02-28 07:26:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-fcoe-client (Old) and /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-fcoe-client", Maintainer is "gs(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-fcoe-client/yast2-fcoe-client.changes 2012-04-17 22:04:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new/yast2-fcoe-client.changes 2013-02-28 10:24:04.000000000 +0100 @@ -1,0 +2,5 @@ +Wed May 16 14:47:54 CEST 2012 - gs(a)suse.de + +- Add 'Retry' button, internal code cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-fcoe-client.spec ++++++ --- /var/tmp/diff_new_pack.Chw78r/_old 2013-02-28 10:24:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Chw78r/_new 2013-02-28 10:24:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-fcoe-client # -# Copyright (c) 2012 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 @@ -16,7 +16,6 @@ # - Name: yast2-fcoe-client Version: 2.22.3 Release: 0 @@ -24,14 +23,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-fcoe-client-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0 Requires: yast2 >= 2.21.22 -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools +BuildRequires: yast2-testsuite BuildArch: noarch Summary: YaST2 - Configuration of Fibre Channel over Ethernet +License: GPL-2.0 +Group: System/YaST %description This package contains the YaST2 component for the Fibre Channel over ++++++ yast2-fcoe-client-2.22.3.tar.bz2 ++++++ ++++ 4026 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-fcoe-client-2.22.3/COPYING new/yast2-fcoe-client-2.22.3/COPYING --- old/yast2-fcoe-client-2.22.3/COPYING 2012-04-17 12:23:57.000000000 +0200 +++ new/yast2-fcoe-client-2.22.3/COPYING 2013-02-22 10:51:12.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-fcoe-client-2.22.3/Makefile.am.common new/yast2-fcoe-client-2.22.3/Makefile.am.common --- old/yast2-fcoe-client-2.22.3/Makefile.am.common 2012-04-17 12:23:45.000000000 +0200 +++ new/yast2-fcoe-client-2.22.3/Makefile.am.common 2013-02-22 10:51:00.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-fcoe-client-2.22.3/autodocs-ycp.ami new/yast2-fcoe-client-2.22.3/autodocs-ycp.ami --- old/yast2-fcoe-client-2.22.3/autodocs-ycp.ami 2012-04-17 12:23:45.000000000 +0200 +++ new/yast2-fcoe-client-2.22.3/autodocs-ycp.ami 2013-02-22 10:51:00.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-fcoe-client-2.22.3/configure.in new/yast2-fcoe-client-2.22.3/configure.in --- old/yast2-fcoe-client-2.22.3/configure.in 2012-04-17 12:23:45.000000000 +0200 +++ new/yast2-fcoe-client-2.22.3/configure.in 2013-02-22 10:51:00.000000000 +0100 @@ -1,6 +1,6 @@ dnl configure.in for yast2-fcoe-client dnl -dnl -- This file is generated by y2autoconf 2.21.2 - 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-fcoe-client, 2.22.3, http://bugs.opensuse.org/, yast2-fcoe-client) 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-fcoe-client-2.22.3/missing new/yast2-fcoe-client-2.22.3/missing --- old/yast2-fcoe-client-2.22.3/missing 2012-04-17 12:23:48.000000000 +0200 +++ new/yast2-fcoe-client-2.22.3/missing 2013-02-22 10:51:06.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 <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' sed_minuso='s/.* -o $[^ ]*$.*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-automake(a)gnu.org>." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac

1 0

commit yast2-dhcp-server for openSUSE:Factory
by root＠hilbert.suse.de 28 Feb '13

28 Feb '13

Hello community, here is the log from the commit of package yast2-dhcp-server for openSUSE:Factory checked in at 2013-02-28 07:16:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-dhcp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-dhcp-server", Maintainer is "MFilka(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-dhcp-server/yast2-dhcp-server.changes 2012-03-30 14:20:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new/yast2-dhcp-server.changes 2013-02-28 10:24:02.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Apr 19 10:57:31 UTC 2012 - jsrain(a)suse.cz + +- use the ButtonBox widget (bnc#684863) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dhcp-server.spec ++++++ --- /var/tmp/diff_new_pack.Cqla5f/_old 2013-02-28 10:24:03.000000000 +0100 +++ /var/tmp/diff_new_pack.Cqla5f/_new 2013-02-28 10:24:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-dhcp-server # -# Copyright (c) 2012 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 ++++++ yast2-dhcp-server-2.22.0.tar.bz2 ++++++ ++++ 9070 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-dhcp-server-2.22.0/COPYING new/yast2-dhcp-server-2.22.0/COPYING --- old/yast2-dhcp-server-2.22.0/COPYING 2012-03-29 14:34:37.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/COPYING 2013-02-26 18:05:38.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-dhcp-server-2.22.0/MAINTAINER new/yast2-dhcp-server-2.22.0/MAINTAINER --- old/yast2-dhcp-server-2.22.0/MAINTAINER 2011-05-23 10:22:57.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/MAINTAINER 2013-01-22 11:17:11.000000000 +0100 @@ -1 +1 @@ -YaST2 Maintainers <yast2-maintainers(a)suse.de> +Michal Filka <MFilka(a)suse.com> 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-dhcp-server-2.22.0/Makefile.am.common new/yast2-dhcp-server-2.22.0/Makefile.am.common --- old/yast2-dhcp-server-2.22.0/Makefile.am.common 2012-03-29 14:29:53.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/Makefile.am.common 2013-02-26 18:05:28.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-dhcp-server-2.22.0/agents/cfg_dhcpd.scr new/yast2-dhcp-server-2.22.0/agents/cfg_dhcpd.scr --- old/yast2-dhcp-server-2.22.0/agents/cfg_dhcpd.scr 2009-12-18 14:52:23.000000000 +0100 +++ new/yast2-dhcp-server-2.22.0/agents/cfg_dhcpd.scr 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Author: Jiri Srain <jsrain(a)suse.cz> * Access: read / write * - * $Id: cfg_dhcpd.scr 13018 2003-12-11 12:52:53Z jhumpol $ + * $Id$ * * Read/Sets the values defined in <tt>/etc/sysconfig/named</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-dhcp-server-2.22.0/agents/etc_dhcpd_conf.scr new/yast2-dhcp-server-2.22.0/agents/etc_dhcpd_conf.scr --- old/yast2-dhcp-server-2.22.0/agents/etc_dhcpd_conf.scr 2009-12-18 14:52:23.000000000 +0100 +++ new/yast2-dhcp-server-2.22.0/agents/etc_dhcpd_conf.scr 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Author: Jiri Srain <jsrain(a)suse.cz> * Access: read, write * - * $Id: etc_dhcpd_conf.scr 13626 2004-01-29 14:16:19Z jsrain $ + * $Id$ * */ .etc.dhcpd_conf 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-dhcp-server-2.22.0/autodocs-ycp.ami new/yast2-dhcp-server-2.22.0/autodocs-ycp.ami --- old/yast2-dhcp-server-2.22.0/autodocs-ycp.ami 2012-03-29 14:29:53.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/autodocs-ycp.ami 2013-02-26 18:05:28.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-dhcp-server-2.22.0/configure.in new/yast2-dhcp-server-2.22.0/configure.in --- old/yast2-dhcp-server-2.22.0/configure.in 2012-03-29 14:29:53.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/configure.in 2013-02-26 18:05:28.000000000 +0100 @@ -1,6 +1,6 @@ dnl configure.in for yast2-dhcp-server dnl -dnl -- This file is generated by y2autoconf 2.21.8 - 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-dhcp-server, 2.22.0, http://bugs.opensuse.org/, yast2-dhcp-server) @@ -20,7 +20,7 @@ dnl Important YaST2 variables VERSION="2.22.0" RPMNAME="yast2-dhcp-server" -MAINTAINER="YaST2 Maintainers <yast2-maintainers(a)suse.de>" +MAINTAINER="Michal Filka <MFilka(a)suse.com>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig 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-dhcp-server-2.22.0/missing new/yast2-dhcp-server-2.22.0/missing --- old/yast2-dhcp-server-2.22.0/missing 2012-03-29 14:29:56.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/missing 2013-02-26 18:05:33.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 <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' sed_minuso='s/.* -o $[^ ]*$.*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-automake(a)gnu.org>." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac 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-dhcp-server-2.22.0/src/DhcpServerUI.ycp new/yast2-dhcp-server-2.22.0/src/DhcpServerUI.ycp --- old/yast2-dhcp-server-2.22.0/src/DhcpServerUI.ycp 2009-12-18 14:52:25.000000000 +0100 +++ new/yast2-dhcp-server-2.22.0/src/DhcpServerUI.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -5,7 +5,7 @@ * input and output functions. * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: DhcpServerUI.ycp 22848 2005-03-30 08:52:01Z locilka $ + * $Id$ * * Representation of the configuration of dhcp-server. * Input and output routines. 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-dhcp-server-2.22.0/src/commandline.ycp new/yast2-dhcp-server-2.22.0/src/commandline.ycp --- old/yast2-dhcp-server-2.22.0/src/commandline.ycp 2012-03-29 14:28:13.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/commandline.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Command-line interface * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: commandline.ycp 43869 2008-01-24 12:58:23Z mzugec $ + * $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-dhcp-server-2.22.0/src/dhcp-server.ycp new/yast2-dhcp-server-2.22.0/src/dhcp-server.ycp --- old/yast2-dhcp-server-2.22.0/src/dhcp-server.ycp 2009-12-18 14:52:25.000000000 +0100 +++ new/yast2-dhcp-server-2.22.0/src/dhcp-server.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Main file * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: dhcp-server.ycp 20635 2005-01-03 16:41:20Z jsrain $ + * $Id$ * * Main file for dhcp-server configuration. Uses all other files. */ 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-dhcp-server-2.22.0/src/dhcp-server_auto.ycp new/yast2-dhcp-server-2.22.0/src/dhcp-server_auto.ycp --- old/yast2-dhcp-server-2.22.0/src/dhcp-server_auto.ycp 2009-12-18 14:52:25.000000000 +0100 +++ new/yast2-dhcp-server-2.22.0/src/dhcp-server_auto.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Client for autoinstallation * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: dhcp-server_auto.ycp 20559 2004-12-15 12:04:28Z jsrain $ + * $Id$ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. 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-dhcp-server-2.22.0/src/dialogs.ycp new/yast2-dhcp-server-2.22.0/src/dialogs.ycp --- old/yast2-dhcp-server-2.22.0/src/dialogs.ycp 2012-03-29 14:28:13.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/dialogs.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: User interface * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: dialogs.ycp 29297 2006-03-23 07:54:03Z locilka $ + * $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-dhcp-server-2.22.0/src/dialogs2.ycp new/yast2-dhcp-server-2.22.0/src/dialogs2.ycp --- old/yast2-dhcp-server-2.22.0/src/dialogs2.ycp 2012-03-29 14:28:13.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/dialogs2.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Vladimír Bobek <vbobek(a)suse.cz> * - * $Id: dialogs2.ycp 56074 2009-03-11 13:24:53Z juhliarik $ + * $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-dhcp-server-2.22.0/src/dns-helps.ycp new/yast2-dhcp-server-2.22.0/src/dns-helps.ycp --- old/yast2-dhcp-server-2.22.0/src/dns-helps.ycp 2012-03-29 14:28:13.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/dns-helps.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Help texts for DNS-Related dialogs * Authors: Lukas Ocilka <lukas.ocilka(a)novell.com> * - * $Id: dns-helps.ycp 57028 2009-04-29 10:58:09Z 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-dhcp-server-2.22.0/src/dns-server-dialogs.ycp new/yast2-dhcp-server-2.22.0/src/dns-server-dialogs.ycp --- old/yast2-dhcp-server-2.22.0/src/dns-server-dialogs.ycp 2012-03-29 14:28:13.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/dns-server-dialogs.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Synchronization with DNS Server (shared dialogs) * Authors: Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id: dns-server-dialogs.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id$ */ { @@ -88,9 +88,8 @@ ) ) )), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok), Label::OKButton()), - `HSpacing (1), `PushButton (`id(`cancel), Label::CancelButton()) ) )); 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-dhcp-server-2.22.0/src/dns-server-management.ycp new/yast2-dhcp-server-2.22.0/src/dns-server-management.ycp --- old/yast2-dhcp-server-2.22.0/src/dns-server-management.ycp 2012-03-29 14:28:13.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/dns-server-management.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Synchronization with DNS Server * Authors: Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id: dns-server-management.ycp 66039 2011-09-26 11:12:17Z visnov $ + * $Id$ */ { @@ -206,9 +206,8 @@ `TextEntry (`id ("new_ip"), _("&IP Address")) ) )), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok), Label::OKButton()), - `HSpacing (1), `PushButton (`id(`cancel), Label::CancelButton()) ) )); @@ -309,9 +308,8 @@ `HWeight (1, `TextEntry (`id ("last_ip"), _("&Last IP Address"))) ) )), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok), Label::OKButton()), - `HSpacing (1), `PushButton (`id(`cancel), Label::CancelButton()) ) )); 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-dhcp-server-2.22.0/src/dns-server-wizard.ycp new/yast2-dhcp-server-2.22.0/src/dns-server-wizard.ycp --- old/yast2-dhcp-server-2.22.0/src/dns-server-wizard.ycp 2012-03-29 14:28:13.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/dns-server-wizard.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Synchronization with DNS Server * Authors: Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id: dns-server-wizard.ycp 66039 2011-09-26 11:12:17Z visnov $ + * $Id$ */ { @@ -129,7 +129,7 @@ ) ) ), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok), Label::OKButton()), `PushButton (`id(`cancel), Label::CancelButton()) ) 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-dhcp-server-2.22.0/src/helps.ycp new/yast2-dhcp-server-2.22.0/src/helps.ycp --- old/yast2-dhcp-server-2.22.0/src/helps.ycp 2012-03-29 14:28:13.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/helps.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Help texts of all the dialogs * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: helps.ycp 45915 2008-04-01 07:25:07Z juhliarik $ + * $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-dhcp-server-2.22.0/src/misc.ycp new/yast2-dhcp-server-2.22.0/src/misc.ycp --- old/yast2-dhcp-server-2.22.0/src/misc.ycp 2009-12-18 14:52:25.000000000 +0100 +++ new/yast2-dhcp-server-2.22.0/src/misc.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Misc. functions * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: misc.ycp 20635 2005-01-03 16:41:20Z jsrain $ + * $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-dhcp-server-2.22.0/src/options.ycp new/yast2-dhcp-server-2.22.0/src/options.ycp --- old/yast2-dhcp-server-2.22.0/src/options.ycp 2012-03-29 14:28:13.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/options.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Popups for table/popup mechanism * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: options.ycp 39272 2007-07-10 11:35:29Z kmachalkova $ + * $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-dhcp-server-2.22.0/src/routines.ycp new/yast2-dhcp-server-2.22.0/src/routines.ycp --- old/yast2-dhcp-server-2.22.0/src/routines.ycp 2009-12-18 14:52:25.000000000 +0100 +++ new/yast2-dhcp-server-2.22.0/src/routines.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Miscelanous functions for configuration of dhcp-server. * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: routines.ycp 17834 2004-06-14 14:34:31Z jsrain $ + * $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-dhcp-server-2.22.0/src/widgets.ycp new/yast2-dhcp-server-2.22.0/src/widgets.ycp --- old/yast2-dhcp-server-2.22.0/src/widgets.ycp 2012-03-29 14:28:13.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/widgets.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Widgets * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: widgets.ycp 60806 2010-02-12 10:08:08Z juhliarik $ + * $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-dhcp-server-2.22.0/src/wizards.ycp new/yast2-dhcp-server-2.22.0/src/wizards.ycp --- old/yast2-dhcp-server-2.22.0/src/wizards.ycp 2011-09-26 14:28:23.000000000 +0200 +++ new/yast2-dhcp-server-2.22.0/src/wizards.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: User interface * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: wizards.ycp 66039 2011-09-26 11:12:17Z visnov $ + * $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-dhcp-server-2.22.0/testsuite/tests/Read.ycp new/yast2-dhcp-server-2.22.0/testsuite/tests/Read.ycp --- old/yast2-dhcp-server-2.22.0/testsuite/tests/Read.ycp 2009-12-18 14:52:25.000000000 +0100 +++ new/yast2-dhcp-server-2.22.0/testsuite/tests/Read.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: Read.ycp 34331 2006-11-13 13:40:30Z kmachalkova $ + * $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-dhcp-server-2.22.0/testsuite/tests/Write.ycp new/yast2-dhcp-server-2.22.0/testsuite/tests/Write.ycp --- old/yast2-dhcp-server-2.22.0/testsuite/tests/Write.ycp 2009-12-18 14:52:25.000000000 +0100 +++ new/yast2-dhcp-server-2.22.0/testsuite/tests/Write.ycp 2013-01-22 11:17:11.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: Write.ycp 34331 2006-11-13 13:40:30Z kmachalkova $ + * $Id$ * */

1 0

commit yast2-control-center-gnome for openSUSE:Factory
by root＠hilbert.suse.de 28 Feb '13

28 Feb '13

Hello community, here is the log from the commit of package yast2-control-center-gnome for openSUSE:Factory checked in at 2013-02-28 07:16:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-control-center-gnome (Old) and /work/SRC/openSUSE:Factory/.yast2-control-center-gnome.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-control-center-gnome", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-control-center-gnome/yast2-control-center-gnome.changes 2012-01-12 15:27:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-control-center-gnome.new/yast2-control-center-gnome.changes 2013-02-28 10:24:00.000000000 +0100 @@ -1,0 +2,19 @@ +Wed Feb 27 10:06:42 CET 2013 - tgoettlicher(a)suse.de + +- Added dependency to yast2_theme +- Release 2.23.3 + +------------------------------------------------------------------- +Fri Feb 22 00:00:00 UTC 2013 - mike.catanzaro(a)gmail.com + +Release 2.23.0 + +Update code to gnome-control-center 3.6 branch. Most significant change +is bigger sizes for the window and all icons. + +* configure.in.in: now requires x11 +* src/cut-n-paste/: update code from gnome-control-center +* src/{control-center.c,gnome-control-center.c,shell.ui}: rebase on updated code +* src/patch/: update patch to current changes + +------------------------------------------------------------------- Old: ---- yast2-control-center-gnome-2.21.3.tar.bz2 New: ---- yast2-control-center-gnome-2.23.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-control-center-gnome.spec ++++++ --- /var/tmp/diff_new_pack.qwpdVu/_old 2013-02-28 10:24:01.000000000 +0100 +++ /var/tmp/diff_new_pack.qwpdVu/_new 2013-02-28 10:24:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-control-center-gnome # -# Copyright (c) 2012 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,14 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: yast2-control-center-gnome -Version: 2.21.3 +Version: 2.23.3 Release: 0 + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-control-center-gnome-%{version}.tar.bz2 + Summary: YaST2 - Control Center (GNOME version) License: GPL-2.0+ Group: System/YaST -Url: http://en.opensuse.org/YaST2-GTK -Source: %{name}-%{version}.tar.bz2 + +#Source: %{name}-%{version}.tar.bz2 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -32,6 +37,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libgnome-menu-3.0) Requires: yast2-control-center +Requires: yast2_theme Supplements: gnome-main-menu Provides: yast2-control-center-binary BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-control-center-gnome-2.21.3.tar.bz2 -> yast2-control-center-gnome-2.23.3.tar.bz2 ++++++ ++++ 25144 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-control-center for openSUSE:Factory
by root＠hilbert.suse.de 28 Feb '13

28 Feb '13

Hello community, here is the log from the commit of package yast2-control-center for openSUSE:Factory checked in at 2013-02-28 07:15:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-control-center (Old) and /work/SRC/openSUSE:Factory/.yast2-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-control-center", Maintainer is "TGoettlicher(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-control-center/yast2-control-center.changes 2012-05-07 22:53:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-control-center.new/yast2-control-center.changes 2013-02-28 10:23:59.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Feb 26 15:20:07 CET 2013 - tgoettlicher(a)suse.de + +- Adapted requirement for libyui-qt4 +- Version: 2.22.4 + +------------------------------------------------------------------- +Tue Feb 26 15:09:31 CET 2013 - tgoettlicher(a)suse.de + +- Added requirement for yast2-theme +- Version: 2.22.3 + +------------------------------------------------------------------- New: ---- yast2-control-center-2.22.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-control-center.spec ++++++ --- /var/tmp/diff_new_pack.eA2iIE/_old 2013-02-28 10:24:00.000000000 +0100 +++ /var/tmp/diff_new_pack.eA2iIE/_new 2013-02-28 10:24:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-control-center # -# Copyright (c) 2012 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 @@ -16,17 +16,21 @@ # - Name: yast2-control-center -Version: 2.22.2 +Version: 2.22.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-control-center-2.22.2.tar.bz2 -Group: System/YaST -License: GPL-2.0 -BuildRequires: libdrm-devel libjpeg-devel libqt4-devel pkgconfig update-desktop-files yast2-devtools +Source0: yast2-control-center-2.22.4.tar.bz2 BuildRequires: cmake +BuildRequires: libdrm-devel +BuildRequires: libjpeg-devel +BuildRequires: libqt4-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: yast2-devtools + +Requires: yast2_theme %if 0%{?force_gcc_46} BuildRequires: gcc46 @@ -36,22 +40,29 @@ %endif Summary: YaST2 - Control Center -Requires: yast2 yast2-control-center-binary -Provides: y2c_menu y2m_menu yast2-menu -Obsoletes: y2c_menu y2m_menu yast2-menu +License: GPL-2.0 +Group: System/YaST +Requires: yast2 +Requires: yast2-control-center-binary +Provides: y2c_menu +Provides: y2m_menu +Provides: yast2-menu +Obsoletes: y2c_menu +Obsoletes: y2m_menu +Obsoletes: yast2-menu %description This package contains the menu selection component for YaST2. %package qt Summary: YaST2 - Control Center (Qt Version) +Group: System/YaST Requires: yast2-control-center Provides: yast2-control-center-binary Provides: yast2-control-center:%{_prefix}/lib/YaST2/bin/y2controlcenter -Recommends: yast2-qt +Recommends: libyui-qt4 Supplements: kdebase3 Supplements: kdebase4-session -Group: System/YaST %description qt This package contains the menu selection component for YaST2 using the ++++++ yast2-control-center-2.22.2.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-apparmor for openSUSE:Factory
by root＠hilbert.suse.de 28 Feb '13

28 Feb '13

Hello community, here is the log from the commit of package yast2-apparmor for openSUSE:Factory checked in at 2013-02-28 07:15:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-apparmor (Old) and /work/SRC/openSUSE:Factory/.yast2-apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-apparmor", Maintainer is "yast2-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-apparmor/yast2-apparmor.changes 2012-04-12 09:57:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-apparmor.new/yast2-apparmor.changes 2013-02-28 10:23:57.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 13 14:35:03 CET 2012 - tgoettlicher(a)suse.de + +- confirmed license GPL v2 +- 2.22.3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-apparmor.spec ++++++ --- /var/tmp/diff_new_pack.LJkU7j/_old 2013-02-28 10:23:58.000000000 +0100 +++ /var/tmp/diff_new_pack.LJkU7j/_new 2013-02-28 10:23:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-apparmor # -# Copyright (c) 2012 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 @@ -24,7 +24,7 @@ Source0: yast2-apparmor-%{version}.tar.bz2 Summary: YaST2 - Plugins for AppArmor Profile Management -License: GPL-2.0+ +License: GPL-2.0 Group: Productivity/Security Requires: perl-TimeDate ++++++ yast2-apparmor-2.22.2.tar.bz2 ++++++ ++++ 8484 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-apparmor-2.22.2/COPYING new/yast2-apparmor-2.22.2/COPYING --- old/yast2-apparmor-2.22.2/COPYING 2012-04-04 08:37:41.000000000 +0200 +++ new/yast2-apparmor-2.22.2/COPYING 2013-02-22 10:48:43.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-apparmor-2.22.2/MAINTAINER new/yast2-apparmor-2.22.2/MAINTAINER --- old/yast2-apparmor-2.22.2/MAINTAINER 2009-12-18 14:50:23.000000000 +0100 +++ new/yast2-apparmor-2.22.2/MAINTAINER 2013-01-22 11:06:54.000000000 +0100 @@ -1 +1 @@ -Katarina Machalkova <kmachalkova(a)suse.cz> +YaST2 Maintainers <yast2-maintainers(a)suse.de> 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-apparmor-2.22.2/Makefile.am.common new/yast2-apparmor-2.22.2/Makefile.am.common --- old/yast2-apparmor-2.22.2/Makefile.am.common 2012-03-30 11:22:34.000000000 +0200 +++ new/yast2-apparmor-2.22.2/Makefile.am.common 2013-02-22 10:48:33.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-apparmor-2.22.2/configure.in new/yast2-apparmor-2.22.2/configure.in --- old/yast2-apparmor-2.22.2/configure.in 2012-03-30 11:22:34.000000000 +0200 +++ new/yast2-apparmor-2.22.2/configure.in 2013-02-22 10:48:33.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-apparmor dnl -dnl -- This file is generated by y2autoconf 2.21.8 - 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-apparmor, 2.22.1, http://bugs.opensuse.org/, yast2-apparmor) +AC_INIT(yast2-apparmor, 2.22.2, http://bugs.opensuse.org/, yast2-apparmor) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,9 +18,9 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.22.1" +VERSION="2.22.2" RPMNAME="yast2-apparmor" -MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" +MAINTAINER="YaST2 Maintainers <yast2-maintainers(a)suse.de>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig 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-apparmor-2.22.2/missing new/yast2-apparmor-2.22.2/missing --- old/yast2-apparmor-2.22.2/missing 2012-03-30 11:22:37.000000000 +0200 +++ new/yast2-apparmor-2.22.2/missing 2013-02-22 10:48:38.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 <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' sed_minuso='s/.* -o $[^ ]*$.*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-automake(a)gnu.org>." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac 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-apparmor-2.22.2/src/clients/AA_AddProfile.ycp new/yast2-apparmor-2.22.2/src/clients/AA_AddProfile.ycp --- old/yast2-apparmor-2.22.2/src/clients/AA_AddProfile.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/clients/AA_AddProfile.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2006 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { import "Wizard"; import "Popup"; 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-apparmor-2.22.2/src/clients/AA_DeleteProfile.ycp new/yast2-apparmor-2.22.2/src/clients/AA_DeleteProfile.ycp --- old/yast2-apparmor-2.22.2/src/clients/AA_DeleteProfile.ycp 2012-04-04 08:36:31.000000000 +0200 +++ new/yast2-apparmor-2.22.2/src/clients/AA_DeleteProfile.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2006 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { import "Wizard"; import "Label"; 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-apparmor-2.22.2/src/clients/AA_EditProfile.ycp new/yast2-apparmor-2.22.2/src/clients/AA_EditProfile.ycp --- old/yast2-apparmor-2.22.2/src/clients/AA_EditProfile.ycp 2012-04-04 08:36:06.000000000 +0200 +++ new/yast2-apparmor-2.22.2/src/clients/AA_EditProfile.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2006 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { import "Wizard"; import "Popup"; 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-apparmor-2.22.2/src/clients/AA_Report.ycp new/yast2-apparmor-2.22.2/src/clients/AA_Report.ycp --- old/yast2-apparmor-2.22.2/src/clients/AA_Report.ycp 2011-10-05 09:36:32.000000000 +0200 +++ new/yast2-apparmor-2.22.2/src/clients/AA_Report.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2006 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { import "Wizard"; 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-apparmor-2.22.2/src/clients/GenProf.ycp new/yast2-apparmor-2.22.2/src/clients/GenProf.ycp --- old/yast2-apparmor-2.22.2/src/clients/GenProf.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/clients/GenProf.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2006 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { import "Label"; import "Wizard"; 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-apparmor-2.22.2/src/clients/LogProf.ycp new/yast2-apparmor-2.22.2/src/clients/LogProf.ycp --- old/yast2-apparmor-2.22.2/src/clients/LogProf.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/clients/LogProf.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2006 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { import "Label"; import "Wizard"; 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-apparmor-2.22.2/src/clients/apparmor-settings.ycp new/yast2-apparmor-2.22.2/src/clients/apparmor-settings.ycp --- old/yast2-apparmor-2.22.2/src/clients/apparmor-settings.ycp 2011-09-12 15:43:51.000000000 +0200 +++ new/yast2-apparmor-2.22.2/src/clients/apparmor-settings.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2006 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { 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-apparmor-2.22.2/src/clients/apparmor.ycp new/yast2-apparmor-2.22.2/src/clients/apparmor.ycp --- old/yast2-apparmor-2.22.2/src/clients/apparmor.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/clients/apparmor.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,3 +1,24 @@ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { textdomain "yast2-apparmor"; import "Wizard"; 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-apparmor-2.22.2/src/clients/apparmor_no_impl.ycp new/yast2-apparmor-2.22.2/src/clients/apparmor_no_impl.ycp --- old/yast2-apparmor-2.22.2/src/clients/apparmor_no_impl.ycp 2011-09-12 15:43:51.000000000 +0200 +++ new/yast2-apparmor-2.22.2/src/clients/apparmor_no_impl.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2005 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { import "Popup"; import "Wizard"; 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-apparmor-2.22.2/src/include/apparmor/aa-config.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/aa-config.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/aa-config.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/aa-config.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2005 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { include "apparmor/config_complain.ycp"; include "apparmor/helps.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-apparmor-2.22.2/src/include/apparmor/apparmor_packages.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_packages.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_packages.ycp 2011-09-12 15:43:54.000000000 +0200 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_packages.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,20 +1,24 @@ -/* - Copyright (C) 2006 Novell Inc. All Rights Reserved. +/**************************************************************************** - This program is free software; you can redistribute it and/or - modify it under the terms of version 2 of the GNU General Public - License published by the Free Software Foundation. - - 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. +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. - You should have received a copy of the GNU General Public License - along with this program; if not, contact Novell, Inc. +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. - Written by Steve Beattie <sbeattie(a)suse.de> - */ +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ /* This should probably be more intelligent and query the user once * whether they want optional packages like apparmor-docs, libapparmor, 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-apparmor-2.22.2/src/include/apparmor/apparmor_profile_check.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_profile_check.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_profile_check.ycp 2011-11-16 12:17:44.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_profile_check.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,19 +1,24 @@ -/* - Copyright (C) 2006 Novell Inc. All Rights Reserved. +/**************************************************************************** - This program is free software; you can redistribute it and/or - modify it under the terms of version 2 of the GNU General Public - License published by the Free Software Foundation. - - 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. +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. - You should have received a copy of the GNU General Public License - along with this program; if not, contact Novell, Inc. +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. - */ +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ import "Popup"; 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-apparmor-2.22.2/src/include/apparmor/apparmor_ycp_utils.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_ycp_utils.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_ycp_utils.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_ycp_utils.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,20 +1,24 @@ +/**************************************************************************** -/* - Copyright (C) 2007 Novell Inc. All Rights Reserved. +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. - This program is free software; you can redistribute it and/or - modify it under the terms of version 2 of the GNU General Public - License published by the Free Software Foundation. - - 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. +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. - You should have received a copy of the GNU General Public License - along with this program; if not, contact Novell, Inc. +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ import "Label"; 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-apparmor-2.22.2/src/include/apparmor/capabilities.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/capabilities.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/capabilities.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/capabilities.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2005 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ // // YCP map containing definitons for Capabiltiies // 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-apparmor-2.22.2/src/include/apparmor/config_complain.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/config_complain.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/config_complain.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/config_complain.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,13 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2005 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { textdomain "yast2-apparmor"; 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-apparmor-2.22.2/src/include/apparmor/helps.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/helps.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/helps.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/helps.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2005 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { 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-apparmor-2.22.2/src/include/apparmor/profile_dialogs.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/profile_dialogs.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/profile_dialogs.ycp 2011-11-16 12:20:44.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/profile_dialogs.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2005 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { import "Wizard"; import "Popup"; 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-apparmor-2.22.2/src/include/apparmor/report_helptext.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/report_helptext.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/report_helptext.ycp 2011-11-16 12:22:00.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/report_helptext.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,13 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2005 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { textdomain "yast2-apparmor"; 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-apparmor-2.22.2/src/include/apparmor/reporting_archived_dialogs.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/reporting_archived_dialogs.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/reporting_archived_dialogs.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/reporting_archived_dialogs.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2005 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { 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-apparmor-2.22.2/src/include/apparmor/reporting_dialogues.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/reporting_dialogues.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/reporting_dialogues.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/reporting_dialogues.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2005 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { import "Wizard"; 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-apparmor-2.22.2/src/include/apparmor/reporting_utils.ycp new/yast2-apparmor-2.22.2/src/include/apparmor/reporting_utils.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/reporting_utils.ycp 2011-11-16 12:13:16.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/include/apparmor/reporting_utils.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,12 +1,24 @@ -/* ------------------------------------------------------------------ -* -* Copyright (C) 2002-2005 Novell/SUSE -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License published by the Free Software Foundation. -* - ------------------------------------------------------------------*/ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { import "Wizard"; 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-apparmor-2.22.2/src/modules/AppArmorDialogs.ycp new/yast2-apparmor-2.22.2/src/modules/AppArmorDialogs.ycp --- old/yast2-apparmor-2.22.2/src/modules/AppArmorDialogs.ycp 2009-12-18 14:50:23.000000000 +0100 +++ new/yast2-apparmor-2.22.2/src/modules/AppArmorDialogs.ycp 2013-01-22 11:06:54.000000000 +0100 @@ -1,3 +1,24 @@ +/**************************************************************************** + +Copyright (c) 2002 - 2012 Novell, Inc. +All Rights Reserved. + +This program is free software; you can redistribute it and/or +modify it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +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, contact Novell, Inc. + +To contact Novell about this file by physical or electronic mail, +you may find current contact information at www.novell.com + +****************************************************************************/ { module "AppArmorDialogs"; N§²æìržyéZ)z{.±ç(húéì¹»®&Þ¢§²ë¢ž¢¶v+b¢v¥rŠjwlzf¢^Ë¬yÊ&+~éi¢§²ë¢ž

1 0

commit xstdcmap for openSUSE:Factory
by root＠hilbert.suse.de 28 Feb '13

28 Feb '13

Hello community, here is the log from the commit of package xstdcmap for openSUSE:Factory checked in at 2013-02-28 07:15:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xstdcmap (Old) and /work/SRC/openSUSE:Factory/.xstdcmap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xstdcmap", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xstdcmap/xstdcmap.changes 2012-05-08 12:08:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xstdcmap.new/xstdcmap.changes 2013-02-28 10:23:53.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Feb 25 19:13:54 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 1.0.3: + + Constify some char * to fix gcc warnings. + + Combine usage message into single string. + + Add -version option. + + Replace sprintf with snprintf. + + -help should not fail if display cannot be opened. + + Mark Exit() & usage() with _X_NORETURN, cleanup previous + workarounds. + + config: + - Add missing AC_CONFIG_SRCDIR. + - Replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS. + - Move man pages into their own directory. + man: remove trailing spaces and tabs. + +------------------------------------------------------------------- Old: ---- xstdcmap-1.0.2.tar.bz2 New: ---- xstdcmap-1.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xstdcmap.spec ++++++ --- /var/tmp/diff_new_pack.8l2nud/_old 2013-02-28 10:23:54.000000000 +0100 +++ /var/tmp/diff_new_pack.8l2nud/_new 2013-02-28 10:23:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xstdcmap # -# Copyright (c) 2012 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,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xstdcmap -Version: 1.0.2 +Version: 1.0.3 Release: 0 -License: MIT Summary: Utility to define standard colormap properties -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.… BuildRequires: pkg-config BuildRequires: pkgconfig(x11) ++++++ xstdcmap-1.0.2.tar.bz2 -> xstdcmap-1.0.3.tar.bz2 ++++++ ++++ 10802 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/xstdcmap-1.0.2/ChangeLog new/xstdcmap-1.0.3/ChangeLog --- old/xstdcmap-1.0.2/ChangeLog 2010-09-27 03:17:55.000000000 +0200 +++ new/xstdcmap-1.0.3/ChangeLog 2013-02-11 01:15:44.000000000 +0100 @@ -1,3 +1,99 @@ +commit a1569179b99f6c8af86132030077439c1dbd52c2 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Feb 10 16:15:08 2013 -0800 + + xstdcmap 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit dcd3ef4f939077b032319508ea6f6107286dd39a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 12:50:21 2013 -0800 + + Constify some char * to fix gcc warnings + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit d8f572a262c37f79d3fabc855543404b774c96b1 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 12:46:49 2013 -0800 + + Combine usage message into single string + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 250cdac0bcc73e1dee9094ded8612f500370640c +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 12:38:19 2013 -0800 + + Add -version option + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit c6f15b6d67f4c8df2af07848d6277593e24f6352 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 12:35:40 2013 -0800 + + Replace sprintf with snprintf + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 06186d82c57b2545db2d6b1a6665f23d1b6a3cfd +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 12:29:03 2013 -0800 + + -help should not fail if display cannot be opened + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 701d5f797a77ba3b3ff2d8c25b7951563d7e4363 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 12:25:45 2013 -0800 + + Mark Exit() & usage() with _X_NORETURN, cleanup previous workarounds + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 4b994408d260eb90d8c65739bc3cd6d56037b10a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Jan 13 12:16:41 2013 -0800 + + config: Add missing AC_CONFIG_SRCDIR + + Regroup AC statements under the Autoconf initialization section. + Regroup AM statements under the Automake initialization section. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 88f027eb5caafea16925b44e8da77e9837b4988e +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Jan 19 10:06:57 2011 -0500 + + config: move man pages into their own directory + + Use services provided by XORG_MANPAGE_SECTIONS. + Use standard Makefile for man pages. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit c2e66dced98d62bbfe013e54f2332b9950a268b9 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Jan 13 11:15:48 2011 -0500 + + man: remove trailing spaces and tabs + + Using s/[ \t]*$// + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit e6c2aa2cea7df267679414155434d7c1ee5f837d +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Jan 12 16:28:02 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + This silences an Autoconf warning + commit 180893b7d452d31e1a64671292315abef8b7590e Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Sun Sep 26 18:16:14 2010 -0700 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/xstdcmap-1.0.2/Makefile.am new/xstdcmap-1.0.3/Makefile.am --- old/xstdcmap-1.0.2/Makefile.am 2010-09-27 03:11:43.000000000 +0200 +++ new/xstdcmap-1.0.3/Makefile.am 2013-02-11 01:15:16.000000000 +0100 @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xstdcmap AM_CFLAGS = $(XSTDCMAP_CFLAGS) -D_BSD_SOURCE $(CWARNFLAGS) @@ -27,24 +28,7 @@ xstdcmap_SOURCES = \ xstdcmap.c -appman_PRE = \ - xstdcmap.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - .PHONY: ChangeLog INSTALL 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/xstdcmap-1.0.2/configure.ac new/xstdcmap-1.0.3/configure.ac --- old/xstdcmap-1.0.2/configure.ac 2010-09-27 03:15:51.000000000 +0200 +++ new/xstdcmap-1.0.3/configure.ac 2013-02-11 01:15:16.000000000 +0100 @@ -21,9 +21,14 @@ dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xstdcmap], [1.0.2], +AC_INIT([xstdcmap], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xstdcmap]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -32,9 +37,11 @@ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AM_CONFIG_HEADER(config.h) # Checks for pkg-config packages -PKG_CHECK_MODULES(XSTDCMAP, xmu x11) +PKG_CHECK_MODULES(XSTDCMAP, [xmu x11 xproto >= 7.0.17]) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT 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/xstdcmap-1.0.2/man/Makefile.am new/xstdcmap-1.0.3/man/Makefile.am --- old/xstdcmap-1.0.2/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/xstdcmap-1.0.3/man/Makefile.am 2013-02-11 01:15:16.000000000 +0100 @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xstdcmap.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/xstdcmap-1.0.2/man/xstdcmap.man new/xstdcmap-1.0.3/man/xstdcmap.man --- old/xstdcmap-1.0.2/man/xstdcmap.man 1970-01-01 01:00:00.000000000 +0100 +++ new/xstdcmap-1.0.3/man/xstdcmap.man 2013-02-11 01:15:16.000000000 +0100 @@ -0,0 +1,116 @@ +.\" $Xorg: xstdcmap.man,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ +.\" Copyright 1989, 1994, 1998 The Open Group +.\" +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. +.\" +.\" The above copyright notice and this permission notice shall be included +.\" in all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +.\" OTHER DEALINGS IN THE SOFTWARE. +.\" +.\" Except as contained in this notice, the name of The Open Group shall +.\" not be used in advertising or otherwise to promote the sale, use or +.\" other dealings in this Software without prior written authorization +.\" from The Open Group. +.\" +.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.7 2001/01/27 18:21:24 dawes Exp $ +.\" +.de EX \"Begin example +.ne 5 +.if n .sp 1 +.if t .sp .5 +.nf +.in +.5i +.. +.de EE +.fi +.in -.5i +.if n .sp 1 +.if t .sp .5 +.. +.TH XSTDCMAP 1 __xorgversion__ +.SH NAME +xstdcmap - X standard colormap utility +.SH SYNOPSIS +.B xstdcmap +[-all] [-best] [-blue] [-default] [-delete \fImap\fP] [-display \fIdisplay\fP] +[-gray] [-green] [-help] [-red] [-verbose] [-version] +.SH DESCRIPTION +.PP +The \fIxstdcmap\fP utility can be used to selectively define standard colormap +properties. It is intended to be run from a user's X startup script to +create standard colormap definitions in order to facilitate sharing of +scarce colormap resources among clients. Where at all possible, colormaps +are created with read-only allocations. +.SH OPTIONS +.PP +The following options may be used with \fIxstdcmap\fP: +.TP 8 +.B \-all +This option indicates that all six standard colormap properties should be +defined on each screen of the display. Not all screens will support +visuals under which all six standard colormap properties are meaningful. +\fIxstdcmap\fP will determine the best +allocations and visuals for the colormap properties of a screen. Any +previously existing standard colormap properties will be replaced. +.TP 8 +.B \-best +This option indicates that the RGB_BEST_MAP should be defined. +.TP 8 +.B \-blue +This option indicates that the RGB_BLUE_MAP should be defined. +.TP 8 +.B \-default +This option indicates that the RGB_DEFAULT_MAP should be defined. +.TP 8 +.B \-delete \fImap\fP +This option specifies that a specific standard colormap property, or +all such properties, should be removed. +\fImap\fP may be one of: default, best, red, green, blue, gray, or all. +.TP 8 +.B \-display \fIdisplay\fP +This option specifies the host and display to use; see \fIX(__miscmansuffix__)\fP. +.TP 8 +.B \-gray +This option indicates that the RGB_GRAY_MAP should be defined. +.TP 8 +.B \-green +This option indicates that the RGB_GREEN_MAP should be defined. +.TP 8 +.B \-help +This option indicates that a brief description of the command line arguments +should be printed on the standard error. This will be done whenever an +unhandled argument is given to +.I xstdcmap. +.TP 8 +.B \-red +This option indicates that the RGB_RED_MAP should be defined. +.TP 8 +.B \-verbose +This option indicates that \fIxstdcmap\fP should +print logging information as it parses its input and defines the +standard colormap properties. +.TP 8 +.B \-version +This option indicates that \fIxstdcmap\fP should print its version and exit. +.SH ENVIRONMENT +.PP +.TP 8 +.B DISPLAY +to get default host and display number. +.SH SEE ALSO +X(__miscmansuffix__) +.SH AUTHOR +Donna Converse, MIT X Consortium + + 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/xstdcmap-1.0.2/xstdcmap.c new/xstdcmap-1.0.3/xstdcmap.c --- old/xstdcmap-1.0.2/xstdcmap.c 2009-10-16 23:40:24.000000000 +0200 +++ new/xstdcmap-1.0.3/xstdcmap.c 2013-02-11 01:15:16.000000000 +0100 @@ -28,6 +28,10 @@ */ /* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.8tsi Exp $ */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <stdio.h> #include <stdlib.h> #include <X11/Xos.h> @@ -47,6 +51,7 @@ static Bool all = 0; static Bool help = 0; static Bool verbose = 0; +static Bool version = 0; static Display *dpy = NULL; typedef struct @@ -54,8 +59,8 @@ Bool create; Bool delete; Atom property; - char *name; - char *nickname; + const char *name; + const char *nickname; } colormap_property; static colormap_property propertyTable[]= @@ -76,20 +81,18 @@ #define GREEN 4 #define BLUE 5 -static char *usage_message[]= -{ -" -all make all standard colormaps for the display", -" -best make the RGB_BEST_MAP", -" -blue make the RGB_BLUE_MAP", -" -default make the RGB_DEFAULT_MAP", -" -delete name remove a standard colormap", -" -display dpy X server to use", -" -gray make the RGB_GRAY_MAP", -" -green make the RGB_GREEN_MAP", -" -red make the RGB_RED_MAP", -" -verbose turn on logging", -"", -NULL }; +static const char *usage_message = + " -all make all standard colormaps for the display\n" + " -best make the RGB_BEST_MAP\n" + " -blue make the RGB_BLUE_MAP\n" + " -default make the RGB_DEFAULT_MAP\n" + " -delete name remove a standard colormap\n" + " -display dpy X server to use\n" + " -gray make the RGB_GRAY_MAP\n" + " -green make the RGB_GREEN_MAP\n" + " -red make the RGB_RED_MAP\n" + " -verbose turn on logging\n" + " -version print version info\n"; static XrmOptionDescRec optionTable[]= { @@ -104,6 +107,7 @@ {"-help", ".help", XrmoptionNoArg, (caddr_t) "on"}, {"-red", ".red", XrmoptionNoArg, (caddr_t) "on"}, {"-verbose", ".verbose", XrmoptionNoArg, (caddr_t) "on"}, +{"-version", ".version", XrmoptionNoArg, (caddr_t) "on"}, }; #define NOPTIONS (sizeof optionTable / sizeof optionTable[0]) @@ -126,23 +130,23 @@ if (--argc) usage(1); - (void) sprintf(option, "%s%s", program_name, ".all"); + snprintf(option, sizeof(option), "%s%s", program_name, ".all"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) all++; - (void) sprintf(option, "%s%s", program_name, ".best"); + snprintf(option, sizeof(option), "%s%s", program_name, ".best"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) propertyTable[BEST].create++; - (void) sprintf(option, "%s%s", program_name, ".blue"); + snprintf(option, sizeof(option), "%s%s", program_name, ".blue"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) propertyTable[BLUE].create++; - (void) sprintf(option, "%s%s", program_name, ".default"); + snprintf(option, sizeof(option), "%s%s", program_name, ".default"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) propertyTable[DEFAULT].create++; - (void) sprintf(option, "%s%s", program_name, ".delete"); + snprintf(option, sizeof(option), "%s%s", program_name, ".delete"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) { register int i; for (i=0; i < NPROPERTIES; i++) { @@ -155,32 +159,36 @@ } } - (void) sprintf(option, "%s%s", program_name, ".display"); + snprintf(option, sizeof(option), "%s%s", program_name, ".display"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) display_name = value.addr; - (void) sprintf(option, "%s%s", program_name, ".gray"); + snprintf(option, sizeof(option), "%s%s", program_name, ".gray"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) propertyTable[GRAY].create++; - (void) sprintf(option, "%s%s", program_name, ".green"); + snprintf(option, sizeof(option), "%s%s", program_name, ".green"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) propertyTable[GREEN].create++; - (void) sprintf(option, "%s%s", program_name, ".help"); + snprintf(option, sizeof(option), "%s%s", program_name, ".help"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) help++; - (void) sprintf(option, "%s%s", program_name, ".red"); + snprintf(option, sizeof(option), "%s%s", program_name, ".red"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) propertyTable[RED].create++; - (void) sprintf(option, "%s%s", program_name, ".verbose"); + snprintf(option, sizeof(option), "%s%s", program_name, ".verbose"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) verbose++; + + snprintf(option, sizeof(option), "%s%s", program_name, ".version"); + if (XrmGetResource(database, option, (char *) NULL, &type, &value)) + version++; } -static void +static void _X_NORETURN Exit(Status status) { if (dpy) @@ -188,14 +196,11 @@ exit(status); } -static void +static void _X_NORETURN usage(Status status) { - register char **i; (void) fprintf(stderr, "usage: %s [-options]\n\n", program_name); - (void) fprintf(stderr, "where options include:\n"); - for (i = usage_message; *i != NULL; i++) - (void) fprintf(stderr, "%s\n", *i); + (void) fprintf(stderr, "where options include:\n%s\n", usage_message); Exit(status); } @@ -254,7 +259,7 @@ } -static char * +static const char * visualStringFromClass(int class) { switch (class) { @@ -339,20 +344,21 @@ parse(argc, argv); + if (help) { + usage(0); + } + + if (version) { + printf("%s\n", PACKAGE_STRING); + exit(0); + } + if ((dpy = XOpenDisplay(display_name)) == NULL) { (void) fprintf(stderr, "%s: cannot open display \"%s\".\n", program_name, XDisplayName(display_name)); exit(1); } - if (help) { - usage(0); - Exit(0); - - /* Muffle gcc */ - return 0; - } - if (all) { if (verbose) (void) fprintf(stderr, @@ -370,6 +376,4 @@ "Not all new colormap definitions will be retained.\n"); } Exit((status == 0) ? 1 : 0); - /* Muffle compiler */ - return 0; } 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/xstdcmap-1.0.2/xstdcmap.man new/xstdcmap-1.0.3/xstdcmap.man --- old/xstdcmap-1.0.2/xstdcmap.man 2009-10-16 23:40:24.000000000 +0200 +++ new/xstdcmap-1.0.3/xstdcmap.man 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -.\" $Xorg: xstdcmap.man,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ -.\" Copyright 1989, 1994, 1998 The Open Group -.\" -.\" Permission to use, copy, modify, distribute, and sell this software and its -.\" documentation for any purpose is hereby granted without fee, provided that -.\" the above copyright notice appear in all copies and that both that -.\" copyright notice and this permission notice appear in supporting -.\" documentation. -.\" -.\" The above copyright notice and this permission notice shall be included -.\" in all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -.\" OTHER DEALINGS IN THE SOFTWARE. -.\" -.\" Except as contained in this notice, the name of The Open Group shall -.\" not be used in advertising or otherwise to promote the sale, use or -.\" other dealings in this Software without prior written authorization -.\" from The Open Group. -.\" -.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.7 2001/01/27 18:21:24 dawes Exp $ -.\" -.de EX \"Begin example -.ne 5 -.if n .sp 1 -.if t .sp .5 -.nf -.in +.5i -.. -.de EE -.fi -.in -.5i -.if n .sp 1 -.if t .sp .5 -.. -.TH XSTDCMAP 1 __xorgversion__ -.SH NAME -xstdcmap - X standard colormap utility -.SH SYNOPSIS -.B xstdcmap -[-all] [-best] [-blue] [-default] [-delete \fImap\fP] [-display \fIdisplay\fP] -[-gray] [-green] [-help] [-red] [-verbose] -.SH DESCRIPTION -.PP -The \fIxstdcmap\fP utility can be used to selectively define standard colormap -properties. It is intended to be run from a user's X startup script to -create standard colormap definitions in order to facilitate sharing of -scarce colormap resources among clients. Where at all possible, colormaps -are created with read-only allocations. -.SH OPTIONS -.PP -The following options may be used with \fIxstdcmap\fP: -.TP 8 -.B \-all -This option indicates that all six standard colormap properties should be -defined on each screen of the display. Not all screens will support -visuals under which all six standard colormap properties are meaningful. -\fIxstdcmap\fP will determine the best -allocations and visuals for the colormap properties of a screen. Any -previously existing standard colormap properties will be replaced. -.TP 8 -.B \-best -This option indicates that the RGB_BEST_MAP should be defined. -.TP 8 -.B \-blue -This option indicates that the RGB_BLUE_MAP should be defined. -.TP 8 -.B \-default -This option indicates that the RGB_DEFAULT_MAP should be defined. -.TP 8 -.B \-delete \fImap\fP -This option specifies that a specific standard colormap property, or -all such properties, should be removed. -\fImap\fP may be one of: default, best, red, green, blue, gray, or all. -.TP 8 -.B \-display \fIdisplay\fP -This option specifies the host and display to use; see \fIX(__miscmansuffix__)\fP. -.TP 8 -.B \-gray -This option indicates that the RGB_GRAY_MAP should be defined. -.TP 8 -.B \-green -This option indicates that the RGB_GREEN_MAP should be defined. -.TP 8 -.B \-help -This option indicates that a brief description of the command line arguments -should be printed on the standard error. This will be done whenever an -unhandled argument is given to -.I xstdcmap. -.TP 8 -.B \-red -This option indicates that the RGB_RED_MAP should be defined. -.TP 8 -.B \-verbose -This option indicates that \fIxstdcmap\fP should -print logging information as it parses its input and defines the -standard colormap properties. -.SH ENVIRONMENT -.PP -.TP 8 -.B DISPLAY -to get default host and display number. -.SH SEE ALSO -X(__miscmansuffix__) -.SH AUTHOR -Donna Converse, MIT X Consortium - - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xsm for openSUSE:Factory
by root＠hilbert.suse.de 28 Feb '13

28 Feb '13

Hello community, here is the log from the commit of package xsm for openSUSE:Factory checked in at 2013-02-28 07:14:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xsm (Old) and /work/SRC/openSUSE:Factory/.xsm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xsm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xsm/xsm.changes 2012-05-08 12:08:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xsm.new/xsm.changes 2013-02-28 10:23:51.000000000 +0100 @@ -1,0 +2,27 @@ +Tue Feb 26 18:48:26 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 1.0.3: + + Use mode_t, not int, for umask return/argument value. + + Use standard autoconf defines for mkstemp & putenv instead of + imake leftovers. + + install: Use sysconfdir instead of libdir for config files. + + Add size limit to scanf string specifier. + + Fix some gcc -Wwrite-strings warnings. + + Terminate execl() arguments with NULL instead of 0. + + Convert a couple last sprintf calls to snprintf. + + Convert XtMalloc + sprintf to XtAsprintf. Depends on libXt > + 1.0.99 to ensure XtAsprintf is available. + + config: + - Add missing AC_CONFIG_SRCDIR + - Replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS. + - Replace deprecated AC_HELP_STRING with AS_HELP_STRING. + - Move man pages into their own directory. + + man: + - Replace hard coded man page section with substitution + strings. + - Remove trailing spaces and tabs. + + Make System() prototype for Solaris in xsm.h actually a + prototype. +- Drop xsm.diff patch, fixed upstream. + +------------------------------------------------------------------- Old: ---- xsm-1.0.2.tar.bz2 xsm.diff New: ---- xsm-1.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsm.spec ++++++ --- /var/tmp/diff_new_pack.cLubB0/_old 2013-02-28 10:23:53.000000000 +0100 +++ /var/tmp/diff_new_pack.cLubB0/_new 2013-02-28 10:23:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xsm # -# Copyright (c) 2012 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,25 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xsm -Version: 1.0.2 +Version: 1.0.3 Release: 0 -License: MIT Summary: X Session Manager -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.… -# xsm.diff -- Change path to config file -Patch0: xsm.diff -# needed for patch0 -BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(xt) > 1.0.99 # default rsh command is ssh Requires: openssh # This was part of the xorg-x11 package up to version 7.6 @@ -52,9 +49,6 @@ %prep %setup -q -%patch0 -p0 -# needed for patch0 -autoreconf -fi %build %configure ++++++ xsm-1.0.2.tar.bz2 -> xsm-1.0.3.tar.bz2 ++++++ ++++ 11840 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xkbutils for openSUSE:Factory
by root＠hilbert.suse.de 28 Feb '13

28 Feb '13

Hello community, here is the log from the commit of package xkbutils for openSUSE:Factory checked in at 2013-02-28 07:14:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xkbutils (Old) and /work/SRC/openSUSE:Factory/.xkbutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xkbutils", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xkbutils/xkbutils.changes 2012-05-08 12:05:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xkbutils.new/xkbutils.changes 2013-02-28 10:23:42.000000000 +0100 @@ -1,0 +2,28 @@ +Tue Feb 26 19:06:26 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 1.0.4: + + Declare bit to shift as unsigned to clear compiler warning. + + Add -version flags to all three commands. + + Combine usage message strings/calls. + + Delete unused macros from utils.h. + + Remove unused u*alloc functions from utils.c. + + Remove unused uStringDup function. + + Make configure actually check for strcasecmp. + + Remove unused debug & function tracing infrastructure from + utils.c. + + Mark uFatalError as _X_NORETURN. + + Add printf attributes to utils.c printing functions. + + Declare utils.c functions as taking const char * arguments. + + Remove unused streq() macro. + + Remove unused #ifdef notyet typedef. + + Remove CVS version tags. + + Convert to X.Org standard coding style. + + Fix typo in SetValues which could fail to detect a change if + only width/height changed. + + config: + - Add missing AC_CONFIG_SRCDIR. + - Replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS. + - Move man pages into their own directory. + + man: Remove trailing spaces and tabs. + +------------------------------------------------------------------- Old: ---- xkbutils-1.0.3.tar.bz2 New: ---- xkbutils-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkbutils.spec ++++++ --- /var/tmp/diff_new_pack.FHLMRY/_old 2013-02-28 10:23:43.000000000 +0100 +++ /var/tmp/diff_new_pack.FHLMRY/_new 2013-02-28 10:23:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xkbutils # -# Copyright (c) 2012 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,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xkbutils -Version: 1.0.3 +Version: 1.0.4 Release: 0 -License: MIT Summary: Collection of small utilities utilizing the X11 XKeyboard extension -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.… BuildRequires: pkg-config BuildRequires: pkgconfig(inputproto) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xt) # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 ++++++ xkbutils-1.0.3.tar.bz2 -> xkbutils-1.0.4.tar.bz2 ++++++ ++++ 13880 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfsinfo for openSUSE:Factory
by root＠hilbert.suse.de 28 Feb '13

28 Feb '13

Hello community, here is the log from the commit of package xfsinfo for openSUSE:Factory checked in at 2013-02-28 07:13:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfsinfo (Old) and /work/SRC/openSUSE:Factory/.xfsinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfsinfo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xfsinfo/xfsinfo.changes 2012-05-08 12:05:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfsinfo.new/xfsinfo.changes 2013-02-28 10:23:39.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Feb 26 19:14:54 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 1.0.4: + + Print normalized version for X.Org servers, the way xdpyinfo + does. + + Remove CVS/RCS id tags. + + Mark usage() as _X_NORETURN. + + config: + - Add missing AC_CONFIG_SRCDIR. + - Replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS. + - Move man pages into their own directory. + + man: remove trailing spaces and tabs. + +------------------------------------------------------------------- Old: ---- xfsinfo-1.0.3.tar.bz2 New: ---- xfsinfo-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfsinfo.spec ++++++ --- /var/tmp/diff_new_pack.yyXqXb/_old 2013-02-28 10:23:40.000000000 +0100 +++ /var/tmp/diff_new_pack.yyXqXb/_new 2013-02-28 10:23:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfsinfo # -# Copyright (c) 2012 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,18 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xfsinfo -Version: 1.0.3 +Version: 1.0.4 Release: 0 -License: MIT Summary: X font server information utility -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.… BuildRequires: pkg-config BuildRequires: pkgconfig(libfs) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xproto) >= 7.0.17 # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ xfsinfo-1.0.3.tar.bz2 -> xfsinfo-1.0.4.tar.bz2 ++++++ ++++ 10358 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/xfsinfo-1.0.3/ChangeLog new/xfsinfo-1.0.4/ChangeLog --- old/xfsinfo-1.0.3/ChangeLog 2010-10-31 00:56:12.000000000 +0200 +++ new/xfsinfo-1.0.4/ChangeLog 2013-02-11 00:40:08.000000000 +0100 @@ -1,3 +1,81 @@ +commit 4c717e41a5d894ef833815396b0de057b53213aa +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Feb 10 15:39:31 2013 -0800 + + xfsinfo 1.0.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 57d7eb7506cef9ffeda231c8896fc2c90be34b60 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Jan 12 18:02:58 2013 -0800 + + Print normalized version for X.Org servers, the way xdpyinfo does + + Results in output like: + vendor string: X.Org Foundation + vendor release number: 10102000 + X.Org xfs version: 1.1.2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Julien Cristau <jcristau(a)debian.org> + +commit e249bb674751f9a9a50a47d89eefdb8b783a8de4 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Jan 12 17:53:32 2013 -0800 + + Remove CVS/RCS id tags + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 899c9a296a8a086e7a61a2690b5446fb7cffe5b5 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Jan 12 17:47:47 2013 -0800 + + Mark usage() as _X_NORETURN + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 82222e014e7c75e88811cdb7b8e39389b8f49b6a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Jan 12 17:43:28 2013 -0800 + + config: Add missing AC_CONFIG_SRCDIR + + Regroup AC statements under the Autoconf initialization section. + Regroup AM statements under the Automake initialization section. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 05b05bfaa88ded7422d058d42aedae3e32e670bd +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Jan 19 10:06:56 2011 -0500 + + config: move man pages into their own directory + + Use services provided by XORG_MANPAGE_SECTIONS. + Use standard Makefile for man pages. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 56ad6e59105b29469ed324f80c5a442556df03dc +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Jan 13 11:15:47 2011 -0500 + + man: remove trailing spaces and tabs + + Using s/[ \t]*$// + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit b9d54b21ce24c16b9fb01357ea3168c19cbca46a +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Jan 12 16:28:02 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + This silences an Autoconf warning + commit 42adfc3d4fda8dfd3aac1329e86af9201dca7c03 Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Sat Oct 30 15:52:02 2010 -0700 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/xfsinfo-1.0.3/Makefile.am new/xfsinfo-1.0.4/Makefile.am --- old/xfsinfo-1.0.3/Makefile.am 2010-10-31 00:49:09.000000000 +0200 +++ new/xfsinfo-1.0.4/Makefile.am 2013-02-11 00:39:39.000000000 +0100 @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xfsinfo AM_CFLAGS = $(XFSINFO_CFLAGS) $(CWARNFLAGS) @@ -27,24 +28,7 @@ xfsinfo_SOURCES = \ xfsinfo.c -appman_PRE = \ - xfsinfo.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - .PHONY: ChangeLog INSTALL 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/xfsinfo-1.0.3/configure.ac new/xfsinfo-1.0.4/configure.ac --- old/xfsinfo-1.0.3/configure.ac 2010-10-31 00:51:46.000000000 +0200 +++ new/xfsinfo-1.0.4/configure.ac 2013-02-11 00:39:39.000000000 +0100 @@ -21,9 +21,14 @@ dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xfsinfo], [1.0.3], +AC_INIT([xfsinfo], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xfsinfo]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -33,9 +38,10 @@ XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AM_CONFIG_HEADER(config.h) - # Checks for pkg-config packages -PKG_CHECK_MODULES(XFSINFO, xproto libfs) +PKG_CHECK_MODULES(XFSINFO, [xproto >= 7.0.17 libfs]) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT 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/xfsinfo-1.0.3/man/Makefile.am new/xfsinfo-1.0.4/man/Makefile.am --- old/xfsinfo-1.0.3/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/xfsinfo-1.0.4/man/Makefile.am 2013-02-11 00:39:39.000000000 +0100 @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xfsinfo.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/xfsinfo-1.0.3/man/xfsinfo.man new/xfsinfo-1.0.4/man/xfsinfo.man --- old/xfsinfo-1.0.3/man/xfsinfo.man 1970-01-01 01:00:00.000000000 +0100 +++ new/xfsinfo-1.0.4/man/xfsinfo.man 2013-02-11 00:39:39.000000000 +0100 @@ -0,0 +1,90 @@ +.\" Copyright 1991, Network Computing Devices, Inc +.\" Copyright 1993, 1998 The Open Group +.\" +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. +.\" +.\" The above copyright notice and this permission notice shall be included +.\" in all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +.\" OTHER DEALINGS IN THE SOFTWARE. +.\" +.\" Except as contained in this notice, the name of The Open Group shall +.\" not be used in advertising or otherwise to promote the sale, use or +.\" other dealings in this Software without prior written authorization +.\" from The Open Group. +.\" +.TH XFSINFO __appmansuffix__ __xorgversion__ +.SH NAME +xfsinfo \- X font server information utility +.SH SYNOPSIS +.B "xfsinfo" +[\-server \fIservername\fP] +.SH DESCRIPTION +.PP +.I Xfsinfo +is a utility for displaying information about an X font server. It is used to +examine the +capabilities of a server, the predefined values for various parameters used +in communicating between clients and the server, and the font catalogues +and alternate servers that are available. +.SH "OPTIONS" +.PP +.TP +.B \-server \fIservername\fP +This option specifies the X font server to contact. +.I servername +must be specified in one of the formats defined in the +.I Font Server Names +section of X(__miscmansuffix__). If not specified, the server name in the +.B FONTSERVER +environment variable is used. +.SH HISTORY +.I Xfsinfo +was originally called +.I fsinfo. +It was renamed to avoid a clash with the +.I fsinfo +utility from the Berkeley automounter +.I amd. +.SH EXAMPLE +.PP +The following shows a sample produced by +.IR xfsinfo . +.PP +.nf +example% xfsinfo -server hansen:7100 +name of server: hansen:7100 +version number: 1 +vendor string: Font Server Prototype +vendor release number: 17 +maximum request size: 16384 longwords (65536 bytes) +number of catalogues: 1 + all +Number of alternate servers: 2 +\& #0 hansen:7101 +\& #1 hansen:7102 +number of extensions: 0 +.fi + +.SH ENVIRONMENT +.PP +.TP 8 +.B FONTSERVER +To get the default fontserver. The server name must +be specified in one of the formats defined in the +.I Font Server Names +section of X(__miscmansuffix__). +.SH "SEE ALSO" +xfs(__appmansuffix__), fslsfonts(__appmansuffix__), X(__miscmansuffix__). +.SH AUTHOR +Dave Lemke, Network Computing Devices, Inc 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/xfsinfo-1.0.3/xfsinfo.c new/xfsinfo-1.0.4/xfsinfo.c --- old/xfsinfo-1.0.3/xfsinfo.c 2009-10-16 23:39:22.000000000 +0200 +++ new/xfsinfo-1.0.4/xfsinfo.c 2013-02-11 00:39:39.000000000 +0100 @@ -2,7 +2,6 @@ * xfsinfo -- report info about a font server */ -/* $TOG: fsinfo.c /main/7 1998/02/09 13:43:08 kaleb $ */ /* Portions Copyright 1987, 1998 The Open Group @@ -30,7 +29,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/xfsinfo/xfsinfo.c,v 1.3 2001/08/27 17:41:02 dawes Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -70,7 +68,7 @@ static char *progname; -static void +static void _X_NORETURN usage(void) { fprintf(stderr, "usage: %s [-server server_name]\n", progname); @@ -123,6 +121,17 @@ printf("version number: %d\n", FSProtocolVersion(svr)); printf("vendor string: %s\n", FSServerVendor(svr)); printf("vendor release number: %d\n", FSVendorRelease(svr)); + if (strstr(FSServerVendor(svr), "X.Org")) { + int vendrel = FSVendorRelease(svr); + + printf("X.Org xfs version: "); + printf("%d.%d.%d", vendrel / 10000000, + (vendrel / 100000) % 100, + (vendrel / 1000) % 100); + if (vendrel % 1000) + printf(".%d", vendrel % 1000); + printf("\n"); + } printf("maximum request size: %ld longwords (%ld bytes)\n", FSMaxRequestSize(svr), FSMaxRequestSize(svr) * sizeof(long)); print_catalogue_info(svr); 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/xfsinfo-1.0.3/xfsinfo.man new/xfsinfo-1.0.4/xfsinfo.man --- old/xfsinfo-1.0.3/xfsinfo.man 2009-10-16 23:39:22.000000000 +0200 +++ new/xfsinfo-1.0.4/xfsinfo.man 1970-01-01 01:00:00.000000000 +0100 @@ -1,93 +0,0 @@ -.\" $TOG: fsinfo.man /main/10 1998/02/09 13:43:12 kaleb $ -.\" Copyright 1991, Network Computing Devices, Inc -.\" Copyright 1993, 1998 The Open Group -.\" -.\" Permission to use, copy, modify, distribute, and sell this software and its -.\" documentation for any purpose is hereby granted without fee, provided that -.\" the above copyright notice appear in all copies and that both that -.\" copyright notice and this permission notice appear in supporting -.\" documentation. -.\" -.\" The above copyright notice and this permission notice shall be included -.\" in all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -.\" OTHER DEALINGS IN THE SOFTWARE. -.\" -.\" Except as contained in this notice, the name of The Open Group shall -.\" not be used in advertising or otherwise to promote the sale, use or -.\" other dealings in this Software without prior written authorization -.\" from The Open Group. -.\" -.\" $XFree86: xc/programs/xfsinfo/xfsinfo.man,v 1.4 2001/04/18 16:13:23 dawes Exp $ -.\" -.TH XFSINFO __appmansuffix__ __xorgversion__ -.SH NAME -xfsinfo \- X font server information utility -.SH SYNOPSIS -.B "xfsinfo" -[\-server \fIservername\fP] -.SH DESCRIPTION -.PP -.I Xfsinfo -is a utility for displaying information about an X font server. It is used to -examine the -capabilities of a server, the predefined values for various parameters used -in communicating between clients and the server, and the font catalogues -and alternate servers that are available. -.SH "OPTIONS" -.PP -.TP -.B \-server \fIservername\fP -This option specifies the X font server to contact. -.I servername -must be specified in one of the formats defined in the -.I Font Server Names -section of X(__miscmansuffix__). If not specified, the server name in the -.B FONTSERVER -environment variable is used. -.SH HISTORY -.I Xfsinfo -was originally called -.I fsinfo. -It was renamed to avoid a clash with the -.I fsinfo -utility from the Berkeley automounter -.I amd. -.SH EXAMPLE -.PP -The following shows a sample produced by -.IR xfsinfo . -.PP -.nf -example% xfsinfo -server hansen:7100 -name of server: hansen:7100 -version number: 1 -vendor string: Font Server Prototype -vendor release number: 17 -maximum request size: 16384 longwords (65536 bytes) -number of catalogues: 1 - all -Number of alternate servers: 2 -\& #0 hansen:7101 -\& #1 hansen:7102 -number of extensions: 0 -.fi - -.SH ENVIRONMENT -.PP -.TP 8 -.B FONTSERVER -To get the default fontserver. The server name must -be specified in one of the formats defined in the -.I Font Server Names -section of X(__miscmansuffix__). -.SH "SEE ALSO" -xfs(__appmansuffix__), fslsfonts(__appmansuffix__), X(__miscmansuffix__). -.SH AUTHOR -Dave Lemke, Network Computing Devices, Inc -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0