Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at Mon Jun 15 16:20:33 CEST 2009. -------- --- yast2-devtools/yast2-devtools.changes 2009-06-08 14:04:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-devtools/yast2-devtools.changes 2009-06-15 15:51:45.000000000 +0200 @@ -1,0 +2,20 @@ +Mon Jun 15 15:33:00 CEST 2009 - mvidner@suse.cz + +- Fixed makefile includes (*.ami) to work with "install" calls changed + via automake-1.11. +- 2.18.7 + +------------------------------------------------------------------- +Thu Jun 11 17:47:42 CEST 2009 - lslezak@suse.cz + +- added float::tolstring builtin to the vim syntax file + (added in yast2-core-2.18.12) +- rest-plugin skeleton - define and use 'id' member + +------------------------------------------------------------------- +Tue Jun 9 16:28:38 CEST 2009 - mvidner@suse.cz + +- Take advantage of AM_SILENT_RULES and AUTOMAKE_JOBS if supported + (in automake-1.11) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-devtools-2.18.6.tar.bz2 New: ---- yast2-devtools-2.18.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.qe4826/_old 2009-06-15 16:20:20.000000000 +0200 +++ /var/tmp/diff_new_pack.qe4826/_new 2009-06-15 16:20:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-devtools (Version 2.18.6) +# spec file for package yast2-devtools (Version 2.18.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-devtools -Version: 2.18.6 +Version: 2.18.7 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-devtools-2.18.6.tar.bz2 +Source0: yast2-devtools-2.18.7.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer pkgconfig sgml-skel Requires: perl @@ -63,7 +63,7 @@ Michal Svec <msvec@suse.cz> %prep -%setup -n yast2-devtools-2.18.6 +%setup -n yast2-devtools-2.18.7 %build autoreconf --force --install @@ -110,6 +110,17 @@ %{prefix}/share/pkgconfig/yast2-devtools.pc %doc %{prefix}/share/doc/packages/yast2-devtools %changelog +* Mon Jun 15 2009 mvidner@suse.cz +- Fixed makefile includes (*.ami) to work with "install" calls changed + via automake-1.11. +- 2.18.7 +* Thu Jun 11 2009 lslezak@suse.cz +- added float::tolstring builtin to the vim syntax file + (added in yast2-core-2.18.12) +- rest-plugin skeleton - define and use 'id' member +* Tue Jun 09 2009 mvidner@suse.cz +- Take advantage of AM_SILENT_RULES and AUTOMAKE_JOBS if supported + (in automake-1.11) * Mon Jun 08 2009 lslezak@suse.cz - 2.18.6 * Mon May 25 2009 lslezak@suse.cz ++++++ yast2-devtools-2.18.6.tar.bz2 -> yast2-devtools-2.18.7.tar.bz2 ++++++ ++++ 14192 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-devtools-2.18.6/configure.in new/yast2-devtools-2.18.7/configure.in --- old/yast2-devtools-2.18.6/configure.in 2009-06-08 13:59:00.000000000 +0200 +++ new/yast2-devtools-2.18.7/configure.in 2009-06-15 15:33:49.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-devtools dnl -dnl -- This file is generated by y2autoconf 2.18.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-devtools, 2.18.6, http://bugs.opensuse.org/, yast2-devtools) +AC_INIT(yast2-devtools, 2.18.7, http://bugs.opensuse.org/, yast2-devtools) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.6" +VERSION="2.18.7" RPMNAME="yast2-devtools" MAINTAINER="Martin Vidner <mvidner@suse.cz>" @@ -90,7 +90,9 @@ [ fillupdir="$fillupdir_d" ]) AC_SUBST(fillupdir) - +dnl Automake 1.11 enables silent compilation, +dnl Disable it by "configure --disable-silent-rules" or "make V=1" +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) YAST2DEVTOOLS=${ydatadir}/devtools 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-devtools-2.18.6/devtools/admin/aminclude/autodocs-cc-base.ami new/yast2-devtools-2.18.7/devtools/admin/aminclude/autodocs-cc-base.ami --- old/yast2-devtools-2.18.6/devtools/admin/aminclude/autodocs-cc-base.ami 2007-05-18 12:48:58.000000000 +0200 +++ new/yast2-devtools-2.18.7/devtools/admin/aminclude/autodocs-cc-base.ami 2009-06-15 14:55:14.000000000 +0200 @@ -15,7 +15,7 @@ AUTODOCS_CC ?= $(srcdir)/../../src AUTODOCS_DEPS ?= $(AUTODOCS_CC)/*.h -html_data = index.html $(wildcard *.html *.png) doxygen.css @RPMNAME@.tag +html_data = index.html $(filter-out index.html, $(wildcard *.html *.png)) doxygen.css @RPMNAME@.tag CLEANFILES = $(html_data) doxygen.log doxygen.conf installdox doxygen.css @RPMNAME@.tag: index.html 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-devtools-2.18.6/devtools/admin/aminclude/autodocs-ycp.ami new/yast2-devtools-2.18.7/devtools/admin/aminclude/autodocs-ycp.ami --- old/yast2-devtools-2.18.6/devtools/admin/aminclude/autodocs-ycp.ami 2007-05-18 12:48:58.000000000 +0200 +++ new/yast2-devtools-2.18.7/devtools/admin/aminclude/autodocs-ycp.ami 2009-06-15 15:33:13.000000000 +0200 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 57556 2009-06-15 13:33:12Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -11,7 +11,7 @@ htmldir = $(docdir)/autodocs -html_DATA = index.html $(wildcard *.html) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.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-devtools-2.18.6/devtools/bin/create-spec new/yast2-devtools-2.18.7/devtools/bin/create-spec --- old/yast2-devtools-2.18.6/devtools/bin/create-spec 2008-11-21 14:30:15.000000000 +0100 +++ new/yast2-devtools-2.18.7/devtools/bin/create-spec 2009-06-09 09:55:33.000000000 +0200 @@ -125,7 +125,9 @@ %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs}", +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1", "@BUILD-QT@" => "%build @@ -138,7 +140,9 @@ %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/%{_lib} --mandir=%{_mandir} -make %{?jobs:-j%jobs}", +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1", "@BUILD-PO@" => "%build 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-devtools-2.18.6/devtools/bin/oscsubmit new/yast2-devtools-2.18.7/devtools/bin/oscsubmit --- old/yast2-devtools-2.18.6/devtools/bin/oscsubmit 2009-05-20 17:16:06.000000000 +0200 +++ new/yast2-devtools-2.18.7/devtools/bin/oscsubmit 2009-06-01 09:17:00.000000000 +0200 @@ -24,7 +24,7 @@ echo " -d, --devel-project development project to submit to; default YaST:Head" echo " -p, --project project to create submit request to" echo " -l, --log the logfile, default ~/.y2submitlog" - echo " -e, --empty_log empty the log before starting" + echo " -e, --empty-log empty the log before starting" echo } @@ -108,7 +108,7 @@ if [ -z $OBS_MOVE_PROJECT ]; then echo "To create submit request, run osc sr create --nodevelproject $OBS_PROJECT $PACKAGE <project>, -to sobmit to Factory, run. +to submit to Factory, run. osc sr create --nodevelproject $OBS_PROJECT $PACKAGE openSUSE:Factory 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-devtools-2.18.6/devtools/bin/version new/yast2-devtools-2.18.7/devtools/bin/version --- old/yast2-devtools-2.18.6/devtools/bin/version 2009-06-08 13:59:38.000000000 +0200 +++ new/yast2-devtools-2.18.7/devtools/bin/version 2009-06-15 15:34:29.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/bash -echo 2.18.6 +echo 2.18.7 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-devtools-2.18.6/devtools/bin/y2autoconf new/yast2-devtools-2.18.7/devtools/bin/y2autoconf --- old/yast2-devtools-2.18.6/devtools/bin/y2autoconf 2009-03-10 15:12:50.000000000 +0100 +++ new/yast2-devtools-2.18.7/devtools/bin/y2autoconf 2009-06-09 16:29:07.000000000 +0200 @@ -28,7 +28,7 @@ # Michal Svec <msvec@suse.cz> # Martin Vidner <mvidner@suse.cz> # -# $Id: y2autoconf 55750 2009-02-25 15:56:52Z mvidner $ +# $Id: y2autoconf 57520 2009-06-09 14:29:07Z mvidner $ if ($#ARGV >= 0 && ($ARGV[0] eq "-h" || $ARGV[0] eq "--help")) { @@ -180,7 +180,9 @@ # init: prog '@YAST2-INIT-PROGRAM@' => -'', +'dnl Automake 1.11 enables silent compilation, +dnl Disable it by "configure --disable-silent-rules" or "make V=1" +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])', # init: translation '@YAST2-INIT-PO@' => 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-devtools-2.18.6/devtools/skeletons/rest-plugin/app/controllers/XXpkgXX_controller.rb new/yast2-devtools-2.18.7/devtools/skeletons/rest-plugin/app/controllers/XXpkgXX_controller.rb --- old/yast2-devtools-2.18.6/devtools/skeletons/rest-plugin/app/controllers/XXpkgXX_controller.rb 2009-06-08 14:02:28.000000000 +0200 +++ new/yast2-devtools-2.18.7/devtools/skeletons/rest-plugin/app/controllers/XXpkgXX_controller.rb 2009-06-15 15:39:52.000000000 +0200 @@ -38,7 +38,7 @@ # FIXME: ^^^^ uncomment this block!! @item = XXPkgXX.new - @item.name = params[:id] + @item.id = params[:id] if !@item.find render ErrorResult.error(404, 2, "item not found") and return @@ -66,12 +66,12 @@ render ErrorResult.error(404, 2, "input error") and return end - if !@item.name.blank? + if !@item.id.blank? if !@item.add render ErrorResult.error(404, 3, "adding share failed") and return end else - render ErrorResult.error(404, 4, "empty share name") and return + render ErrorResult.error(404, 4, "empty id") and return end end @@ -92,7 +92,7 @@ render ErrorResult.error(403, 1, "no permission") and return end - @item = XXPkgXX.find(params[:id][:name]) + @item = XXPkgXX.find(params[:id][:id]) render ErrorResult.error(403, 1, "share not found") and return if @item.properties.blank? @@ -122,7 +122,7 @@ end @item = XXPkgXX.new - @item.name = params[:id] + @item.id = params[:id] if !@item.delete render ErrorResult.error(404, 2, "delete failed") and return 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-devtools-2.18.6/devtools/skeletons/rest-plugin/app/models/XXpkgXX.rb new/yast2-devtools-2.18.7/devtools/skeletons/rest-plugin/app/models/XXpkgXX.rb --- old/yast2-devtools-2.18.6/devtools/skeletons/rest-plugin/app/models/XXpkgXX.rb 2009-06-08 14:02:28.000000000 +0200 +++ new/yast2-devtools-2.18.7/devtools/skeletons/rest-plugin/app/models/XXpkgXX.rb 2009-06-15 15:39:52.000000000 +0200 @@ -6,12 +6,12 @@ class XXPkgXX # FIXME: adapt to your model, add members to store all needed properties - attr_accessor :name, + attr_accessor :id, :parameters def initialize # unique identification (name, ID number, ...) - @name = nil + @id = nil # attributes # FIXME: adapt to your model, add as many members as needed... @@ -37,7 +37,7 @@ item = XXPkgXX.new # set only ID, the other parameters should have default or empty values - item.name = p + item.id = p result << item } @@ -47,12 +47,12 @@ def find # cannot find invalid object - return false if @name.blank? + return false if @id.blank? # get properties of the object # FIXME: Use the correct Yast function call, e.g. - # properties = YastService.Call("YaPI::XXPkgXX::Get", @name) + # properties = YastService.Call("YaPI::XXPkgXX::Get", @id) properties = { :p1 => "foo", :p2 => "bar" } # FIXME: remove this dummy line @@ -68,15 +68,15 @@ end def update_attributes(attribs) - if attribs.has_key?(:name) - new_name = attribs[:name] + if attribs.has_key?(:id) + new_name = attribs[:id] # FIXME: valide the option if new_name.class != :String return false end - @name = new_name + @id = new_name end if attribs.has_key?(:parameters) @@ -97,34 +97,34 @@ def add # FIXME: Use the correct Yast function call, e.g. - # return YastService.Call("YaPI::XXPkgXX::Add", @name, @parameters) if !@name.blank? + # return YastService.Call("YaPI::XXPkgXX::Add", @id, @parameters) if !@id.blank? return false end def edit # FIXME: Use the correct Yast function call, e.g. - # return YastService.Call("YaPI::XXPkgXX::Edit", @name, @parameters) if !@name.blank? + # return YastService.Call("YaPI::XXPkgXX::Edit", @id, @parameters) if !@id.blank? return false end def delete # FIXME: Use the correct Yast function call, e.g. - # return YastService.Call("YaPI::XXPkgXX::Delete", @name) if !@name.blank? + # return YastService.Call("YaPI::XXPkgXX::Delete", @id) if !@id.blank? return false end # FIXME: export all members in XML def to_xml( options = {} ) - return nil if @name.nil? + return nil if @id.nil? xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] xml.XXpkgXX do - xml.tag!(:name, @name) + xml.tag!(:id, @id) if !@parameters.blank? # FIXME: Note: the first parameter of tag! is tag name, the second is value, 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-devtools-2.18.6/missing new/yast2-devtools-2.18.7/missing --- old/yast2-devtools-2.18.6/missing 2009-06-08 13:59:18.000000000 +0200 +++ new/yast2-devtools-2.18.7/missing 2009-06-15 15:34:08.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags 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. + Send bug reports to <bug-automake@gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: `tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: `$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + 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 @@ -240,7 +248,7 @@ fi ;; - lex|flex) + 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 @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + 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 @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: 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-devtools-2.18.6/VERSION new/yast2-devtools-2.18.7/VERSION --- old/yast2-devtools-2.18.6/VERSION 2009-06-08 13:58:23.000000000 +0200 +++ new/yast2-devtools-2.18.7/VERSION 2009-06-15 15:32:19.000000000 +0200 @@ -1 +1 @@ -2.18.6 +2.18.7 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-devtools-2.18.6/y2logview/y2log_ana/cgui.moc.cc new/yast2-devtools-2.18.7/y2logview/y2log_ana/cgui.moc.cc --- old/yast2-devtools-2.18.6/y2logview/y2log_ana/cgui.moc.cc 2009-05-20 17:20:57.000000000 +0200 +++ new/yast2-devtools-2.18.7/y2logview/y2log_ana/cgui.moc.cc 2009-02-24 16:35:58.000000000 +0100 @@ -1,8 +1,8 @@ /**************************************************************************** ** Meta object code from reading C++ file 'cgui.h' ** -** Created -** by: The Qt Meta Object Compiler version 61 (Qt 4.5.0) +** Created: Tue Feb 24 16:35:58 2009 +** by: The Qt Meta Object Compiler version 59 (Qt 4.4.3) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -10,8 +10,8 @@ #include "cgui.h" #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'cgui.h' doesn't include <QObject>." -#elif Q_MOC_OUTPUT_REVISION != 61 -#error "This file was generated using the moc from 4.5.0. It" +#elif Q_MOC_OUTPUT_REVISION != 59 +#error "This file was generated using the moc from 4.4.3. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -20,13 +20,12 @@ static const uint qt_meta_data_MyWidget[] = { // content: - 2, // revision + 1, // revision 0, // classname 0, 0, // classinfo - 18, 12, // methods + 18, 10, // methods 0, 0, // properties 0, 0, // enums/sets - 0, 0, // constructors // slots: signature, parameters, type, tag, flags 12, 10, 9, 9, 0x0a, @@ -105,7 +104,6 @@ case 15: showColHex((*reinterpret_cast< const QString(*)>(_a[1]))); break; case 16: colorDialog(); break; case 17: searchAhead((*reinterpret_cast< QTreeWidgetItem*(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - default: ; } _id -= 18; } 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-devtools-2.18.6/yast2/ycp.vim new/yast2-devtools-2.18.7/yast2/ycp.vim --- old/yast2-devtools-2.18.6/yast2/ycp.vim 2009-04-29 10:57:30.000000000 +0200 +++ new/yast2-devtools-2.18.7/yast2/ycp.vim 2009-06-15 15:30:09.000000000 +0200 @@ -2,7 +2,7 @@ " Filename: ycp.vim " Language: YCP: SuSE YaST2 scripting language " Maintainer: Michal Svec <msvec@suse.cz> -" $Id: ycp.vim 57021 2009-04-29 08:57:29Z lslezak $ +" $Id: ycp.vim 57540 2009-06-11 15:51:30Z lslezak $ " Remove any old syntax stuff hanging around if version < 600 @@ -190,6 +190,7 @@ syn keyword ycpBuiltin float::floor syn keyword ycpBuiltin float::pow syn keyword ycpBuiltin float::trunc +syn keyword ycpBuiltin float::tolstring syn keyword ycpBuiltin list::reduce syn keyword ycpBuiltin sublist ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org