May 2010 - openSUSE Commits - openSUSE Mailing Lists

commit nagios-nrpe for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package nagios-nrpe for openSUSE:Factory checked in at Wed May 5 23:10:05 CEST 2010. -------- --- nagios-nrpe/nagios-nrpe.changes 2010-04-29 17:35:40.000000000 +0200 +++ nagios-nrpe/nagios-nrpe.changes 2010-05-05 17:45:44.000000000 +0200 @@ -1,0 +2,21 @@ +Wed May 5 15:45:05 UTC 2010 - lars(a)linux-schulserver.de + +- set default values in init script + +------------------------------------------------------------------- +Mon May 3 09:36:34 UTC 2010 - lars(a)linux-schulserver.de + +- fix file ownership in /etc +- added nrpe manpage from debian +- added adapted patches from Debian: + + nrpe-more_random.patch (overwrite the buffer with better + randomness) + + nrpe-improved_help.patch (list additional commandline options) + + nrpe-weird_output.patch (null the buffer before using it) + + nrpe-drop_privileges_before_writing_pidfile.patch (name says all) +- added the following patches to fix compilation warnings: + + nrpe-return_value.patch + + nrpe-uninitialized_variable.patch + + nrpe-unused_variable.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nrpe-drop_privileges_before_writing_pidfile.patch nrpe-improved_help.patch nrpe-more_random.patch nrpe-return_value.patch nrpe-uninitialized_variable.patch nrpe-unused_variable.patch nrpe-weird_output.patch nrpe.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-nrpe.spec ++++++ --- /var/tmp/diff_new_pack.fj8cvr/_old 2010-05-05 23:07:58.000000000 +0200 +++ /var/tmp/diff_new_pack.fj8cvr/_new 2010-05-05 23:07:58.000000000 +0200 @@ -17,35 +17,38 @@ # norootforbuild -%define realname nrpe -# to enable support for really long plugin-output (available since nagios v3) -# set the macro below to 1. -# Note: this change is incompatible to old versions, therefore disabled per # default %define nagios3only 0 # Macro that print mesages to syslog at package (un)install time %define nnmmsg logger -t %{name}/rpm %define nsusr nagios %define nsgrp nagios -%define cmdgrp nagcmd %define nrpeport 5666 %define _libexecdir %{_prefix}/lib/nagios/plugins Name: nagios-nrpe Summary: Nagios Remote Plug-In Executor Version: 2.12 -Release: 6 +Release: 7 License: GPLv2+ Group: System/Monitoring Url: http://www.nagios.org/ -Source0: %realname-%version.tar.bz2 +Source0: nrpe-%version.tar.bz2 Source1: nrpe.init Source2: nagios-nrpe-rpmlintrc Source3: nagios-nrpe-SuSEfirewall2 +Source4: nrpe.8 Source10: README.SuSE Patch0: nrpe-2.12-Makefile.patch Patch1: nrpe-2.12-xinetd.patch Patch2: nagios-nrpe-buffersize.patch +Patch3: nrpe-more_random.patch +Patch4: nrpe-improved_help.patch +Patch5: nrpe-weird_output.patch +Patch6: nrpe-drop_privileges_before_writing_pidfile.patch +Patch7: nrpe-unused_variable.patch +Patch8: nrpe-return_value.patch +Patch9: nrpe-uninitialized_variable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq PreReq: coreutils grep pwdutils sed @@ -74,7 +77,7 @@ %endif # Provides: %{name}-client = %{version} -Obsoletes: %{name}-client <= %{version} +Obsoletes: %{name}-client < %{version} %description NRPE can be used to run nagios plug-ins on a remote machine for @@ -111,7 +114,7 @@ Recommends: nagios %endif Provides: %{name}-server = %{version} -Obsoletes: %{name}-server <= %{version} +Obsoletes: %{name}-server < %{version} %description -n nagios-plugins-nrpe This package contains the plug-in for the host runing the Nagios @@ -131,12 +134,19 @@ Ethan Galstad <nagios(a)nagios.org> %prep -%setup -n %realname-%version +%setup -n nrpe-%version %patch0 -p1 %patch1 -p1 %if %{nagios3only} %patch2 %endif +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p0 +%patch7 -p0 +%patch8 -p0 +%patch9 -p0 %{__cp} -a %{S:10} . %build @@ -171,6 +181,7 @@ INIT_OPTS="" %{__install} -d %buildroot/var/run/nagios +%{__install} -Dm 644 %{S:4} %buildroot%_mandir/man8/nrpe.8 %{__install} -Dm 755 %{S:1} %buildroot%_sysconfdir/init.d/nrpe %{__ln_s} -f ../../etc/init.d/nrpe %buildroot%_sbindir/rcnrpe @@ -230,15 +241,16 @@ %files %defattr(-,root,root) %doc README.SuSE -%dir %attr(775,%{nsusr},%{cmdgrp}) %_sysconfdir/nagios/ -%dir %attr(755,%{nsusr},%{nsgrp}) /var/run/nagios -%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/nagios/nrpe.cfg +%_mandir/man8/nrpe.8* +%dir %_sysconfdir/nagios/ +%config(noreplace) %_sysconfdir/nagios/nrpe.cfg %config(noreplace) %_sysconfdir/xinetd.d/nrpe %if 0%{?suse_version} > 1020 %config %_sysconfdir/sysconfig/SuSEfirewall2.d/services/nrpe-service %endif %_sysconfdir/init.d/nrpe -%_sbindir/*nrpe +%_sbindir/nrpe +%_sbindir/rcnrpe %ghost %dir /var/run/nrpe %ghost /var/run/nrpe/nrpe.pid ++++++ nrpe-drop_privileges_before_writing_pidfile.patch ++++++ Index: src/nrpe.c =================================================================== --- src/nrpe.c.orig +++ src/nrpe.c @@ -297,13 +297,13 @@ int main(int argc, char **argv){ /* log info to syslog facility */ syslog(LOG_NOTICE,"Starting up daemon"); + /* drop privileges */ + drop_privileges(nrpe_user,nrpe_group); + /* write pid file */ if(write_pid_file()==ERROR) return STATE_CRITICAL; - /* drop privileges */ - drop_privileges(nrpe_user,nrpe_group); - /* make sure we're not root */ check_privileges(); ++++++ nrpe-improved_help.patch ++++++ Index: src/check_nrpe.c =================================================================== --- src/check_nrpe.c.orig +++ src/check_nrpe.c @@ -96,6 +96,9 @@ int main(int argc, char **argv){ printf(" [arglist] = Optional arguments that should be passed to the command. Multiple\n"); printf(" arguments should be separated by a space. If provided, this must be\n"); printf(" the last option supplied on the command line.\n"); + printf(" -h, --help Print this short help.\n"); + printf(" -l,--license Print licensing information.\n"); + printf(" -n,--no-ssl Do not initial an ssl handshake with the server, talk in plaintext.\n"); printf("\n"); printf("Note:\n"); printf("This plugin requires that you have the NRPE daemon running on the remote host.\n"); Index: src/nrpe.c =================================================================== --- src/nrpe.c.orig +++ src/nrpe.c @@ -138,14 +138,17 @@ int main(int argc, char **argv){ else if(result!=OK || show_help==TRUE){ - printf("Usage: nrpe [-n] -c <config_file> <mode>\n"); + printf("Usage: nrpe [-n] -c <config_file> <mode> [--help] [--license] [--no-ssl]\n"); printf("\n"); printf("Options:\n"); printf(" -n = Do not use SSL\n"); printf(" <config_file> = Name of config file to use\n"); printf(" <mode> = One of the following two operating modes:\n"); - printf(" -i = Run as a service under inetd or xinetd\n"); - printf(" -d = Run as a standalone daemon\n"); + printf(" -i, --inetd Run as a service under inetd or xinetd\n"); + printf(" -d, --daemon Run as a standalone daemon\n"); + printf(" -h, --help = Print this short help.\n"); + printf(" -l, --license = Print licensing information.\n"); + printf(" -n, --no-ssl = Do not initial an ssl handshake with the server, talk in plaintext.\n"); printf("\n"); printf("Notes:\n"); printf("This program is designed to process requests from the check_nrpe\n"); ++++++ nrpe-more_random.patch ++++++ Index: src/utils.c =================================================================== --- src/utils.c.orig +++ src/utils.c @@ -90,17 +90,13 @@ void randomize_buffer(char *buffer,int b ends and the rest of the buffer (padded randomly) starts. ***************************************************************/ - /* try to get seed value from /dev/urandom, as its a better source of entropy */ - fp=fopen("/dev/urandom","r"); - if(fp!=NULL){ - seed=fgetc(fp); - fclose(fp); - } - - /* else fallback to using the current time as the seed */ - else - seed=(int)time(NULL); - + /*************************************************************** + The randomness, produced by the original version, is just + between 0 and 255. The randomness generated by the line below + produces more randomness and does not reduce the amount of + entropy that the linux kernel thinks it has. + ***************************************************************/ + seed=(int)time(NULL)*311-getpid()*359+getppid()*383; srand(seed); for(x=0;x<buffer_size;x++) buffer[x]=(int)'0'+(int)(72.0*rand()/(RAND_MAX+1.0)); ++++++ nrpe-return_value.patch ++++++ Index: src/nrpe.c =================================================================== --- src/nrpe.c.orig +++ src/nrpe.c @@ -94,9 +94,15 @@ int main(int argc, char **argv){ #endif /* set some environment variables */ - asprintf(&env_string,"NRPE_MULTILINESUPPORT=1"); + if (asprintf(&env_string,"NRPE_MULTILINESUPPORT=1") == -1){ + fprintf(stderr, "Failed to allocate string for NRPE_MULTILINESUPPORT\n"); + return STATE_CRITICAL; + } putenv(env_string); - asprintf(&env_string,"NRPE_PROGRAMVERSION=%s",PROGRAM_VERSION); + if (asprintf(&env_string,"NRPE_PROGRAMVERSION=%s",PROGRAM_VERSION) == -1){ + fprintf(stderr,"Failed to allocate string for NRPE_PROGRAMVERSION\n"); + return STATE_CRITICAL; + } putenv(env_string); /* process command-line args */ @@ -179,7 +185,10 @@ int main(int argc, char **argv){ /* get absolute path of current working directory */ strcpy(config_file,""); - getcwd(config_file,sizeof(config_file)); + if (getcwd(config_file,sizeof(config_file)) == NULL){ + fprintf(stderr,"Failed to get absolute path of current working directory\n"); + return STATE_CRITICAL; + } /* append a forward slash */ strncat(config_file,"/",sizeof(config_file)-2); @@ -286,7 +295,10 @@ int main(int argc, char **argv){ open("/dev/null",O_WRONLY); open("/dev/null",O_WRONLY); - chdir("/"); + if (chdir("/") == -1){ + fprintf(stderr,"Failed to chdir into /\n"); + return STATE_CRITICAL; + } /*umask(0);*/ /* handle signals */ @@ -1343,7 +1355,10 @@ int my_system(char *command,int timeout, return STATE_OK; /* create a pipe */ - pipe(fd); + if (pipe(fd) == -1){ + fprintf(stderr,"Faiiled to create a pipe\n"); + return STATE_CRITICAL; + } /* make the pipe non-blocking */ fcntl(fd[0],F_SETFL,O_NONBLOCK); @@ -1396,7 +1411,10 @@ int my_system(char *command,int timeout, buffer[sizeof(buffer)-1]='\x0'; /* write the error back to the parent process */ - write(fd[1],buffer,strlen(buffer)+1); + if (write(fd[1],buffer,strlen(buffer)+1) == -1){ + fprintf(stderr,"Failed to write the error back to the parent process\n"); + return STATE_CRITICAL; + } result=STATE_CRITICAL; } @@ -1406,7 +1424,10 @@ int my_system(char *command,int timeout, while((bytes_read=fread(buffer,1,sizeof(buffer)-1,fp))>0){ /* write the output back to the parent process */ - write(fd[1],buffer,bytes_read); + if (write(fd[1],buffer,bytes_read) == -1){ + fprintf(stderr,"Failed to write the output back to the parent process\n"); + return STATE_CRITICAL; + } } /* close the command and get termination status */ @@ -1618,7 +1639,10 @@ int write_pid_file(void){ /* write new pid file */ if((fd=open(pid_file,O_WRONLY | O_CREAT,0644))>=0){ sprintf(pbuf,"%d\n",(int)getpid()); - write(fd,pbuf,strlen(pbuf)); + if (write(fd,pbuf,strlen(pbuf)) == -1){ + fprintf(stderr,"Failed to write new pid file\n"); + return STATE_CRITICAL; + } close(fd); wrote_pid_file=TRUE; } ++++++ nrpe-uninitialized_variable.patch ++++++ Index: src/nrpe.c =================================================================== --- src/nrpe.c.orig +++ src/nrpe.c @@ -724,6 +724,9 @@ void wait_for_connections(void){ struct request_info req; #endif + /* default: failed */ + new_sd=-1; + /* create a socket for listening */ sock=socket(AF_INET,SOCK_STREAM,0); ++++++ nrpe-unused_variable.patch ++++++ Index: src/utils.c =================================================================== --- src/utils.c.orig +++ src/utils.c @@ -76,7 +76,6 @@ unsigned long calculate_crc32(char *buff /* fill a buffer with semi-random data */ void randomize_buffer(char *buffer,int buffer_size){ - FILE *fp; int x; int seed; ++++++ nrpe-weird_output.patch ++++++ Index: src/nrpe.c =================================================================== --- src/nrpe.c.orig +++ src/nrpe.c @@ -1166,6 +1166,9 @@ void handle_connection(int sock){ /* disable connection alarm - a new alarm will be setup during my_system */ alarm(0); + // null buffer before using it - Debian Patch by <luk@luknote> + memset(buffer,0,sizeof(buffer)); + /* if this is the version check command, just spew it out */ if(!strcmp(command_name,NRPE_HELLO_COMMAND)){ ++++++ nrpe.8 ++++++ .\" Hey, EMACS: -*- nroff -*- .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) .TH NAGIOS-NRPE 8 "January 14, 2004" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: .\" .nh disable hyphenation .\" .hy enable hyphenation .\" .ad l left justify .\" .ad b justify to both left and right margins .\" .nf disable filling .\" .fi enable filling .\" .br insert line break .\" .sp <n> insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME nrpe \- Nagios Remote Plugin Executor - Server .SH SYNOPSIS .B nagios-nrpe \fI-c <config_file> <mode>\fR .SH DESCRIPTION .PP The purpose of this addon is to allow you to execute Nagios plugins on a remote host in as transparent a manner as possible. .PP This program runs as a background process on the remote host and processes command execution requests from the check_nrpe plugin on the Nagios host. .SH OPTIONS .IP <config_file> = Name of config file to use .IP <mode> = One of the following two operating modes: .TP \fB\-i\fR = Run as a service under inetd or xinetd .TP \fB\-d\fR = Run as a standalone daemon .PP Notes: This program is designed to process requests from the check_nrpe plugin on the host(s) running Nagios. It can run as a service under inetd or xinetd (read the docs for info on this), or as a standalone daemon. Once a request is received from an authorized host, NRPE will execute the command/plugin (as defined in the config file) and return the plugin output and return code to the check_nrpe plugin. .SH AUTHOR This manual page was written by Jason Thomas <jason(a)debian.org>, for the Debian project (but may be used by others). ++++++ nrpe.init ++++++ --- /var/tmp/diff_new_pack.fj8cvr/_old 2010-05-05 23:07:58.000000000 +0200 +++ /var/tmp/diff_new_pack.fj8cvr/_new 2010-05-05 23:07:58.000000000 +0200 @@ -53,27 +53,30 @@ start) # Start daemons. echo -n "Starting Nagios NRPE " - pid_file="$(get_value pid_file)" - nrpe_group="$(get_value nrpe_group)" - nrpe_user="$(get_value nrpe_user)" - PIDDIR=$(dirname $pid_file) - case "$PIDDIR" in - /var/run) - if [ x"$nrpe_user" != x"root" ]; then - DATESTRING=`date +"%Y%m%d"` - mv -f "$NRPE_CONFIG" "$NRPE_CONFIG-$DATESTRING" - sed -e "s|^pid_file.*|pid_file=$DEFAULT_PIDFILE|g" "$NRPE_CONFIG-$DATESTRING" > "$NRPE_CONFIG" - /bin/logger -t rcnrpe "Configured $pid_file in $NRPE_CONFIG moved to $DEFAULT_PIDFILE. Backup is $NRPE_CONFIG-$DATESTRING" - test -f "$pid_file" && rm "$pid_file" - install -d -m755 -o$nrpe_user -g$nrpe_group $(dirname "$DEFAULT_PIDFILE") - else - test -d "$PIDDIR" || mkdir -p "$PIDDIR" - fi - ;; - *) - test -d $(dirname "$DEFAULT_PIDFILE") || install -d -m755 -o$nrpe_user -g$nrpe_group $(dirname "$DEFAULT_PIDFILE") - ;; - esac + pid_file="$(get_value pid_file)" + nrpe_group="$(get_value nrpe_group)" + nrpe_user="$(get_value nrpe_user)" + : ${pid_file=:=$DEFAULT_PIDFILE} + : ${nrpe_group:=nagios} + : ${nrpe_user:=nagios} + PIDDIR=$(dirname $pid_file) + case "$PIDDIR" in + /var/run) + if [ x"$nrpe_user" != x"root" ]; then + DATESTRING=`date +"%Y%m%d"` + mv -f "$NRPE_CONFIG" "$NRPE_CONFIG-$DATESTRING" + sed -e "s|^pid_file.*|pid_file=$DEFAULT_PIDFILE|g" "$NRPE_CONFIG-$DATESTRING" > "$NRPE_CONFIG" + /bin/logger -t rcnrpe "Configured $pid_file in $NRPE_CONFIG moved to $DEFAULT_PIDFILE. Backup is $NRPE_CONFIG-$DATESTRING" + test -f "$pid_file" && rm "$pid_file" + install -d -m755 -o$nrpe_user -g$nrpe_group $(dirname "$DEFAULT_PIDFILE") + else + test -d "$PIDDIR" || mkdir -p "$PIDDIR" + fi + ;; + *) + test -d $(dirname "$DEFAULT_PIDFILE") || install -d -m755 -o$nrpe_user -g$nrpe_group $(dirname "$DEFAULT_PIDFILE") + ;; + esac /sbin/startproc $NRPE_BIN -c $NRPE_CONFIG -d # Remember status and be verbose ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit susedoc-buildbook for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package susedoc-buildbook for openSUSE:Factory checked in at Wed May 5 23:07:42 CEST 2010. -------- --- susedoc-buildbook/susedoc-buildbook.changes 2010-04-22 08:59:32.000000000 +0200 +++ susedoc-buildbook/susedoc-buildbook.changes 2010-05-05 09:39:38.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 5 09:37:53 CEST 2010 - ke(a)suse.de + +- 0.5: +* Prepare local build without submitting to the OBS/IBS (--prep-local). +* Remove spurious "as" in .document; drop + susedoc-build-dot-document.patch. +* Add obsoletes for slepos-guide; bnc#602450. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- susedoc-build-dot-document.patch susedoc-buildbook-0.4.tar.bz2 New: ---- susedoc-buildbook-0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susedoc-buildbook.spec ++++++ --- /var/tmp/diff_new_pack.aMDIRO/_old 2010-05-05 23:06:57.000000000 +0200 +++ /var/tmp/diff_new_pack.aMDIRO/_new 2010-05-05 23:06:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package susedoc-buildbook (Version 0.4) +# spec file for package susedoc-buildbook (Version 0.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,10 +23,9 @@ Group: Documentation/SuSE AutoReqProv: on Summary: susedoc Book Build Script -Version: 0.4 -Release: 2 +Version: 0.5 +Release: 1 Source: %{name}-%{version}.tar.bz2 -Patch: susedoc-build-dot-document.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,7 +40,6 @@ %prep %setup -q -%patch -p 0 ./configure --prefix=%{_prefix} %build ++++++ susedoc-buildbook-0.4.tar.bz2 -> susedoc-buildbook-0.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.4/NEWS new/susedoc-buildbook-0.5/NEWS --- old/susedoc-buildbook-0.4/NEWS 2010-04-01 14:08:28.000000000 +0200 +++ new/susedoc-buildbook-0.5/NEWS 2010-05-05 09:32:43.000000000 +0200 @@ -1,3 +1,8 @@ +0.5: +* Prepare local build without submitting to the OBS/IBS (--prep-local). +* Remove spurious "as" in .document. +* Add obsoletes for slepos-guide. + 0.4: * Provide default .changes entry. * Remove obsolete buildbook.sh script. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.4/book.spec.in new/susedoc-buildbook-0.5/book.spec.in --- old/susedoc-buildbook-0.4/book.spec.in 2010-04-01 13:36:00.000000000 +0200 +++ new/susedoc-buildbook-0.5/book.spec.in 2010-04-22 08:52:44.000000000 +0200 @@ -144,7 +144,8 @@ s/^X-DOC-Identifier=/DocIdentifier=com.novell./ s/^X-DOC-Weight/DocWeight/ " $f > ../%{name}.document - my_title=$(echo "%{summary}" | sed 's/[Pp][Dd][Ff]//;s/(.*)//') + my_title=$(echo "%{summary}" \ + | sed 's/$as $*[Pp][Dd][Ff]//;s/ *(.*)//') #if grep -s -q '^Name *= *$' ../%{name}.document; then sed -i " s/^$Name.*$=$.*$/\1=$my_title \2/" ../%{name}.document diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.4/buildbook.sh new/susedoc-buildbook-0.5/buildbook.sh --- old/susedoc-buildbook-0.4/buildbook.sh 2010-04-01 14:06:03.000000000 +0200 +++ new/susedoc-buildbook-0.5/buildbook.sh 2010-05-05 09:17:08.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/bash TEMP=$(getopt -o e:d:l:n:p:s:u:x \ - --long debug,def:,extdir:,lang:,name:,obsuser:,product:,pdf:,spec:,user: \ + --long debug,def:,extdir:,lang:,prep-local,name:,obsuser:,product:,pdf:,spec:,user: \ -n "$0" -- "$@") # Note the quotes around `$TEMP': they are essential! eval set -- "$TEMP" @@ -26,6 +26,7 @@ -d|--def) product_file=$2 ; check_file $product_file; shift 2 ;; -l|--lang) LL=$2 ; shift 2 ;; -p|--pdf) pdf=$2 ; check_file $pdf; shift 2 ;; + --prep-local) prep_local=yes ; shift 1 ;; -s|--spec) spec_in=$2; shift 2 ;; -n|--name|--product) product=$2 ; shift 2 ;; -u|--user|--obsuser) obsuser=$2 ; shift 2;; @@ -135,11 +136,22 @@ Summary: -\\ #Provides: locale(desktop-data-openSUSE:$LL)\\ ###PDFOBS" $spec +### hack slepos 11 sp1 FIXME + if [ $product = slepos-guide ]; then + sed -i "s/^###PDFOBS/#PDFOBS/" $spec + fi + if [ -n "$pdfobs" ]; then + sed -i "\ +/^#PDFOBS/i\\ +Obsoletes: $pdfobs\\ +Provides: $pdfobs +" $spec + fi if [ "$pdf_obs" != "" ]; then sed -i "/^#PDFSUB/i\\ $pdf_prov\\ $pdf_obs" $spec - fi + fi sed -i "/^#PDFSUB/i\\ \\ \%description -n ${book}_$LL-pdf\\ @@ -170,7 +182,7 @@ \%defattr(-, root, root)\\ \%doc ${BOOK}_$LL.pdf\\ \%doc $3/LICENSE.txt\\ -/usr/share/help/${book}_$LL-pdf.document\\ +\%{_datadir}/help/${book}_$LL-pdf.document\\ \%dir %{_datadir}/kde4/apps/khelpcenter/plugins\\ \%dir %{_datadir}/kde4/apps/khelpcenter\\ \%dir %{_datadir}/kde4/apps\\ @@ -460,6 +472,10 @@ Obsoletes: $obs\\ Provides: $obs " $spec + ### does not work here; see hack above FIXME + if [ $product = slepos-guide ]; then + sed -i "s/^###PDFOBS/#PDFOBS/" $spec + fi if [ -n "$pdfobs" ]; then sed -i "\ /^#PDFOBS/i\\ @@ -484,8 +500,10 @@ for l in $obs; do # skip books shipped as stand-alone PDFs since 11.1 case $l in - opensuse-kdequick_$LL|opensuse-gnomequick_$LL|apparmor-admin_$LL|opensuse-gnomeuser_$LL|opensuse-kdeuser_$LL) true ;; - *) pdfobs="$pdfobs ${l}-pdf" ;; + opensuse-kdequick_$LL|opensuse-gnomequick_$LL|apparmor-admin_$LL|opensuse-gnomeuser_$LL|opensuse-kdeuser_$LL) true + ;; + *) pdfobs="$pdfobs ${l}-pdf" + ;; esac done # 11.3: opensuse-manuals_$LL-pdf is gone; use the base package @@ -497,6 +515,11 @@ obs="$obs sled-deployment_$LL sled-gnome-user_$LL sled-kde-user_$LL" obs="$obs sled-desktop-qs_$LL sled-install-qs_$LL" set_obs_in_spec + elif [ $product = slepos-guide ]; then + # obsolete since sle11 sp1; see bnc#602450 + obs="slepos-admin_$LL slepos-install_$LL SLEPOS_$LL" + pdfobs="slepos-united_$LL-pdf" + set_obs_in_spec else # gnomeuser and similar books sed -i '/.*my_prov_obs.*/d' $spec @@ -585,6 +608,14 @@ sed -i "\ s:@version@:${PACK_VER:-$version}: " $spec + ## FIXME: + if [ $LL != en ]; then + sed -i "\ +s:^%dir %{_datadir}/help:%dir %{_datadir}/help\n%dir %{_datadir}/help/LOCALE\n%dir %{_datadir}/help/LOCALE/$LL: +s:^%{_datadir}/help/:%{_datadir}/help/LOCALE/$LL/: +/^$%dir $*%{_datadir}\/kde4/d +" $spec + fi cp -vp autobuild/* home:$obsuser:branches:$repo/$package ### cd home:$obsuser:branches:$repo/$package @@ -621,6 +652,6 @@ echo $((no++)) >/dev/null done < <(grep -v ^# $product_file) -prep_xbs $xbs_server $xbs_prj +[ -n "$prep_local" ] || prep_xbs $xbs_server $xbs_prj exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.4/configure new/susedoc-buildbook-0.5/configure --- old/susedoc-buildbook-0.4/configure 2010-04-01 13:51:04.000000000 +0200 +++ new/susedoc-buildbook-0.5/configure 2010-05-05 09:34:08.000000000 +0200 @@ -2205,7 +2205,7 @@ # Define the identity of the package. PACKAGE=susedoc-buildbook - VERSION=0.4 + VERSION=0.5 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.4/configure.ac new/susedoc-buildbook-0.5/configure.ac --- old/susedoc-buildbook-0.4/configure.ac 2010-04-01 13:43:13.000000000 +0200 +++ new/susedoc-buildbook-0.5/configure.ac 2010-04-22 08:46:25.000000000 +0200 @@ -1,4 +1,4 @@ AC_INIT([book.spec.in]) -AM_INIT_AUTOMAKE([susedoc-buildbook], [0.4]) +AM_INIT_AUTOMAKE([susedoc-buildbook], [0.5]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ufraw for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package ufraw for openSUSE:Factory checked in at Wed May 5 23:06:05 CEST 2010. -------- --- ufraw/ufraw.changes 2009-08-31 13:18:49.000000000 +0200 +++ ufraw/ufraw.changes 2010-05-02 00:32:11.000000000 +0200 @@ -1,0 +2,19 @@ +Sun May 2 00:21:09 CEST 2010 - postadal(a)suse.cz + +- updated to 0.17, based on DCRaw v 8.99 + * Lens distortion corrections using lensfun is enabled by default + * Added a despeckling/denoising algorithm to solve issues with images + taken under very difficult lighting conditions + * Added support for hot pixel elimination + * Calculate live histogram from working color-space instead of display + color-space + * Calculate live histogram from cropped area only + * Added auto-crop option + * Allow upto 400% zoom + * Added lightness adjustmens by hue + * Added --color-smoothing, --maximize-window command line options + * Configurable frame lines overlay + * OpenMP support for preview redrawing and VNG interpolation + * Added rotation control to the transformations page of the GUI + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ufraw-0.15.tar.bz2 New: ---- ufraw-0.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ufraw.spec ++++++ --- /var/tmp/diff_new_pack.o5vNNS/_old 2010-05-05 23:03:59.000000000 +0200 +++ /var/tmp/diff_new_pack.o5vNNS/_new 2010-05-05 23:03:59.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ufraw (Version 0.15) +# spec file for package ufraw (Version 0.17) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,12 +24,12 @@ Url: http://ufraw.sourceforge.net/ # gimptool-2.0 --gimpplugindir %define _gimpplugindir %(gimptool-2.0 --gimpplugindir) -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Graphics/Other AutoReqProv: on -Version: 0.15 -Release: 6 -%define vversion 0.15 +Version: 0.17 +Release: 1 +%define vversion 0.17 Summary: The Unidentified Flying Raw Source: %{name}-%{version}.tar.bz2 Patch: %{name}-desktop.patch @@ -51,7 +51,7 @@ Udi Fuchs UdiFuchs(a)gmail.com %package -n gimp-ufraw -License: GPL v2 or later +License: GPLv2+ Summary: Raw photo loader plugin for The GIMP Group: Productivity/Graphics/Other Obsoletes: rawphoto ufraw-gimp ++++++ ufraw-0.15.tar.bz2 -> ufraw-0.17.tar.bz2 ++++++ ++++ 64228 lines of diff (skipped) ++++++ ufraw-boundary.patch ++++++ --- /var/tmp/diff_new_pack.o5vNNS/_old 2010-05-05 23:03:59.000000000 +0200 +++ /var/tmp/diff_new_pack.o5vNNS/_new 2010-05-05 23:03:59.000000000 +0200 @@ -1,8 +1,8 @@ ---- dcraw.cc -+++ dcraw.cc -@@ -6513,9 +6513,9 @@ - if (!strncmp (make,"KODAK",5)) - make[16] = model[16] = 0; +--- dcraw.cc.orig 2010-03-29 22:18:13.000000000 +0200 ++++ dcraw.cc 2010-05-02 01:14:52.000000000 +0200 +@@ -6875,9 +6875,9 @@ + (cp = strstr(model,"FILE VERSION")))) + *cp = 0; cp = make + strlen(make); /* Remove trailing spaces */ - while (*--cp == ' ') *cp = 0; + while (cp > make && *--cp == ' ') *cp = 0; ++++++ ufraw-desktop.patch ++++++ --- /var/tmp/diff_new_pack.o5vNNS/_old 2010-05-05 23:03:59.000000000 +0200 +++ /var/tmp/diff_new_pack.o5vNNS/_new 2010-05-05 23:03:59.000000000 +0200 @@ -1,19 +1,10 @@ ---- ufraw.desktop -+++ ufraw.desktop +--- ufraw.desktop.orig 2010-03-10 04:28:27.000000000 +0100 ++++ ufraw.desktop 2010-05-02 00:42:40.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Name=UFRaw -GenericName=Raw image converter +GenericName=Raw Image Converter + GenericName[ca]=Convertidor d'imatges Raw GenericName[cs]=Konvertor raw snímků - GenericName[da]=Raw-billedbehandler - GenericName[es]=Conversor de imágenes raw -@@ -39,6 +39,6 @@ TryExec=ufraw - Terminal=false - StartupNotify=true - --MimeType=application/x-ufraw;image/x-dcraw -+MimeType=application/x-ufraw;image/x-dcraw; - --Icon=ufraw.png -+Icon=ufraw + GenericName[da]=Råbilledbehandler ++++++ ufraw-glibc210.patch ++++++ --- /var/tmp/diff_new_pack.o5vNNS/_old 2010-05-05 23:03:59.000000000 +0200 +++ /var/tmp/diff_new_pack.o5vNNS/_new 2010-05-05 23:03:59.000000000 +0200 @@ -1,16 +1,7 @@ -Index: ufraw-0.15/dcraw.cc +Index: ufraw-0.17/dcraw.cc =================================================================== ---- ufraw-0.15.orig/dcraw.cc -+++ ufraw-0.15/dcraw.cc -@@ -8401,7 +8401,7 @@ int CLASS main (int argc, const char **a - argv[argc] = ""; - for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) { - opt = argv[arg++][1]; -- if ((cp = strchr (sp="nbrkStqmHAC", opt))) -+ if ((cp = (char*)strchr (sp="nbrkStqmHAC", opt))) - for (i=0; i < "11411111142"[cp-sp]-'0'; i++) - if (!isdigit(argv[arg+i][0])) { - dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"), opt); +--- ufraw-0.17.orig/dcraw.cc ++++ ufraw-0.17/dcraw.cc @@ -8670,7 +8670,7 @@ thumbnail: strcpy (ofname,_("standard output")); else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at Wed May 5 23:03:46 CEST 2010. -------- --- KDE/kdebase4-openSUSE/kdebase4-openSUSE.changes 2010-04-23 14:45:17.000000000 +0200 +++ kdebase4-openSUSE/kdebase4-openSUSE.changes 2010-04-30 16:17:11.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 30 14:16:22 UTC 2010 - llunak(a)novell.com + +- remove setting up of gtk style, done by kcm_gtk now + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.pe65Yv/_old 2010-05-05 23:03:28.000000000 +0200 +++ /var/tmp/diff_new_pack.pe65Yv/_new 2010-05-05 23:03:28.000000000 +0200 @@ -26,7 +26,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.3 -Release: 1 +Release: 2 # git clone git://git.opensuse.org/projects/desktop/kdebase4-openSUSE.git Source0: kdebase4-openSUSE-%{version}.tar.bz2 Source2: devel-splash.tar.bz2 ++++++ kdebase4-openSUSE-11.3.tar.bz2 ++++++ KDE/kdebase4-openSUSE/kdebase4-openSUSE-11.3.tar.bz2 kdebase4-openSUSE/kdebase4-openSUSE-11.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegames4 for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package kdegames4 for openSUSE:Factory checked in at Wed May 5 23:02:07 CEST 2010. -------- --- KDE/kdegames4/kdegames4-carddecks.changes 2010-04-01 17:44:42.000000000 +0200 +++ kdegames4/kdegames4-carddecks.changes 2010-05-05 23:01:17.277167000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 29 22:39:35 CEST 2010 - dmueller(a)suse.de + +- update to 4.4.3 + * bugfixes over 4.4.2 + * see http://kde.org/announcements/changelogs/changelog4_4_2to4_4_3.php for details + +------------------------------------------------------------------- kdegames4-palapeli-data.changes: same change kdegames4.changes: same change calling whatdependson for head-i586 Old: ---- kdegames-4.4.2.tar.bz2 New: ---- kdegames-4.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegames4-carddecks.spec ++++++ --- /var/tmp/diff_new_pack.z8riSE/_old 2010-05-05 23:01:53.000000000 +0200 +++ /var/tmp/diff_new_pack.z8riSE/_new 2010-05-05 23:01:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegames4-carddecks (Version 4.4.2) +# spec file for package kdegames4-carddecks (Version 4.4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: System/GUI/KDE Summary: Default Card Decks for KDE Games Url: http://www.kde.org -Version: 4.4.2 +Version: 4.4.3 Release: 1 Source0: kdegames-%version.tar.bz2 Patch0: 4_4_BRANCH.diff ++++++ kdegames4-palapeli-data.spec ++++++ --- /var/tmp/diff_new_pack.z8riSE/_old 2010-05-05 23:01:53.000000000 +0200 +++ /var/tmp/diff_new_pack.z8riSE/_new 2010-05-05 23:01:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegames4-palapeli-data (Version 4.4.2) +# spec file for package kdegames4-palapeli-data (Version 4.4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: kdegames4-palapeli-data Summary: Palapeli's standard puzzle files -Version: 4.4.2 +Version: 4.4.3 Release: 1 License: GPLv2+ Group: System/GUI/KDE ++++++ kdegames4.spec ++++++ --- /var/tmp/diff_new_pack.z8riSE/_old 2010-05-05 23:01:53.000000000 +0200 +++ /var/tmp/diff_new_pack.z8riSE/_new 2010-05-05 23:01:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegames4 (Version 4.4.2) +# spec file for package kdegames4 (Version 4.4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ Group: System/GUI/KDE Summary: General Data for KDE Games Url: http://www.kde.org -Version: 4.4.2 +Version: 4.4.3 Release: 1 Source0: kdegames-%version.tar.bz2 Patch: 4_4_BRANCH.diff ++++++ kdegames-4.4.2.tar.bz2 -> kdegames-4.4.3.tar.bz2 ++++++ KDE/kdegames4/kdegames-4.4.2.tar.bz2 kdegames4/kdegames-4.4.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdenetwork4 for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package kdenetwork4 for openSUSE:Factory checked in at Wed May 5 23:01:06 CEST 2010. -------- --- KDE/kdenetwork4/kdenetwork4.changes 2010-03-26 19:24:00.000000000 +0100 +++ kdenetwork4/kdenetwork4.changes 2010-04-29 22:40:48.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 29 22:40:44 CEST 2010 - dmueller(a)suse.de + +- update to 4.4.3 + * bugfixes over 4.4.2 + * see http://kde.org/announcements/changelogs/changelog4_4_2to4_4_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdenetwork-4.4.2.tar.bz2 New: ---- kdenetwork-4.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.5qa5z0/_old 2010-05-05 23:00:45.000000000 +0200 +++ /var/tmp/diff_new_pack.5qa5z0/_new 2010-05-05 23:00:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdenetwork4 (Version 4.4.2) +# spec file for package kdenetwork4 (Version 4.4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -34,7 +34,7 @@ Group: Productivity/Networking/Other Summary: KDE Network Base Package Url: http://www.kde.org -Version: 4.4.2 +Version: 4.4.3 Release: 1 Source0: kdenetwork-%version.tar.bz2 Patch: 4_4_BRANCH.diff ++++++ kdenetwork-4.4.2.tar.bz2 -> kdenetwork-4.4.3.tar.bz2 ++++++ KDE/kdenetwork4/kdenetwork-4.4.2.tar.bz2 kdenetwork4/kdenetwork-4.4.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4-runtime for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at Wed May 5 23:00:27 CEST 2010. -------- --- KDE/kdepim4-runtime/kdepim4-runtime.changes 2010-03-26 19:20:12.000000000 +0100 +++ kdepim4-runtime/kdepim4-runtime.changes 2010-04-29 22:41:26.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 29 22:41:21 CEST 2010 - dmueller(a)suse.de + +- update to 4.4.3 + * bugfixes over 4.4.2 + * see http://kde.org/announcements/changelogs/changelog4_4_2to4_4_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepim-runtime-4.4.2.tar.bz2 New: ---- kdepim-runtime-4.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.vP5Haf/_old 2010-05-05 23:00:00.000000000 +0200 +++ /var/tmp/diff_new_pack.vP5Haf/_new 2010-05-05 23:00:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdepim4-runtime (Version 4.4.2) +# spec file for package kdepim4-runtime (Version 4.4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -36,7 +36,7 @@ Group: System/GUI/KDE Summary: Base package of kdepim Url: http://www.kde.org -Version: 4.4.2 +Version: 4.4.3 Release: 1 Source0: kdepim-runtime-%version.tar.bz2 Patch: 4_4_BRANCH.diff ++++++ kdepim-runtime-4.4.2.tar.bz2 -> kdepim-runtime-4.4.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/agents/maildispatcher/maildispatcheragent.desktop new/kdepim-runtime-4.4.3/agents/maildispatcher/maildispatcheragent.desktop --- old/kdepim-runtime-4.4.2/agents/maildispatcher/maildispatcheragent.desktop 2010-03-26 18:29:02.000000000 +0100 +++ new/kdepim-runtime-4.4.3/agents/maildispatcher/maildispatcheragent.desktop 2010-04-29 21:57:16.000000000 +0200 @@ -10,10 +10,10 @@ Name[et]=Kirjade edastamise agent Name[fr]=Agent de distribution de messages Name[gl]=Axente de Despacho de Correo +Name[hu]=Levél dicspécser ügynök Name[it]=Agente per la consegna della posta Name[ja]=メール送信エージェント Name[km]=ភ្នាក់ងារកម្មវិធីបញ្ជូនសំបុត្រ -Name[lt]=Laiškų skirstytuvė Name[lv]=Pasta nosūtīšanas aģents Name[nb]=Agent for e-postsending Name[nds]=Nettpostverdeel-Hölper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/agents/nepomuk_calendar_feeder/nepomukcalendarfeeder.desktop new/kdepim-runtime-4.4.3/agents/nepomuk_calendar_feeder/nepomukcalendarfeeder.desktop --- old/kdepim-runtime-4.4.2/agents/nepomuk_calendar_feeder/nepomukcalendarfeeder.desktop 2010-03-26 18:29:02.000000000 +0100 +++ new/kdepim-runtime-4.4.3/agents/nepomuk_calendar_feeder/nepomukcalendarfeeder.desktop 2010-04-29 21:57:16.000000000 +0200 @@ -9,11 +9,12 @@ Name[es]=Proveedor de calendarios de Nepomuk Name[et]=Nepomuki kalendri söötur Name[fr]=Connecteur Nepomuk pour les contacts +Name[ga]=Fothaire Féilire Nepomuk Name[gl]=Fornecedor de calendario do Nepomuk +Name[hu]=Nepomuk naptár feeder Name[it]=Fornitore di calendario per Nepomuk Name[ja]=Nepomuk カレンダーフィーダー Name[km]=កម្មវិធីមតិព័ត៌មានប្រតិទិនរបស់ Nepomuk -Name[lt]=Nepomuk kalendoriaus šaltinis Name[lv]=Nepomuk kalendāru barotājs Name[nb]=Kalendersender til Nepomuk Name[nds]=Nepomuk-Kalenneringaav @@ -40,10 +41,10 @@ Comment[et]=Laiendus sündmuste, päevikute ja ülesannete edastamiseks Nepomukile Comment[fr]=Extension pour envoyer les évènements, les journaux et les tâches à Nepomuk Comment[gl]=Engadido para lle pasar os enventos, os diarios e as tarefas ao Nepomuk +Comment[hu]=Kiterjesztés események, naplók és feladatok áttöltéséhez a Nepomuk szolgáltatás számára Comment[it]=Estensione per inserire eventi, diari e cose da fare in Nepomuk Comment[ja]=Nepomuk にイベント、日記、To-Do を提供するエクステンション Comment[km]=ផ្នែកបន្ថែមត្រូវចុចព្រឹត្តិការណ៍ ទិនានុប្ប ទិនានុប្បវត្តិ និងការងារត្រូវធ្វើនៅក្នុង Nepomuk -Comment[lt]=Praplėtimas skirtas kontaktų, žurnalo įrašų ir užduočių perdavimui į Nepomuk Comment[lv]=Paplašinājums, kas iesūta dienasgrāmatas un darbus Nepomuk Comment[nb]=Utvidelse som sender hendelser, dagboksnotater og gjøremål inn til Nepomuk Comment[nds]=Verwiedern, mit de sik Begeefnissen, Daagböker un Opgaven na Nepomuk överdregen laat @@ -53,6 +54,7 @@ Comment[pt_BR]=Extensão para enviar eventos, diários e tarefas para o Nepomuk Comment[sl]=Razširitev, ki posreduje dogodke, dnevnike in opravila v Nepomuk Comment[sv]=Utökning för att skicka händelser, journalanteckningar och uppgifter till Nepomuk +Comment[tr]=Olayları, günlükleri ve yapılacak işleri Nepomuk'a göndermek için eklenti Comment[uk]=Додаток для передачі записів подій, журналу та завдань до Nepomuk Comment[x-test]=xxExtension to push events, journals and todos into Nepomukxx Comment[zh_CN]=用于将事件、日历和待办事宜推送到 Nepomuk 的扩展 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/agents/nepomukfeeder/nepomukfeederagentbase.cpp new/kdepim-runtime-4.4.3/agents/nepomukfeeder/nepomukfeederagentbase.cpp --- old/kdepim-runtime-4.4.2/agents/nepomukfeeder/nepomukfeederagentbase.cpp 2010-02-26 19:34:04.000000000 +0100 +++ new/kdepim-runtime-4.4.3/agents/nepomukfeeder/nepomukfeederagentbase.cpp 2010-04-29 21:57:16.000000000 +0200 @@ -33,6 +33,7 @@ #include <akonadi/itemfetchjob.h> #include <akonadi/itemfetchscope.h> #include <akonadi/mimetypechecker.h> +#include <akonadi/itemsearchjob.h> #include <nepomuk/resource.h> #include <nepomuk/tag.h> @@ -104,8 +105,13 @@ { if ( entityIsHidden( collection ) ) return; - if ( item.hasPayload() ) - updateItem( item, createGraphForEntity( item ) ); + + if ( item.hasPayload() ) { + const QUrl graph = createGraphForEntity( item ); + mNrlModel->addStatement( item.url(), Akonadi::ItemSearchJob::akonadiItemIdUri(), + QUrl( QString::number( item.id() ) ), graph ); + updateItem( item, graph ); + } } void NepomukFeederAgentBase::itemChanged(const Akonadi::Item& item, const QSet< QByteArray >&) @@ -115,7 +121,11 @@ // TODO: check part identfiers if anything interesting changed at all if ( item.hasPayload() ) { removeEntityFromNepomuk( item ); - updateItem( item, createGraphForEntity( item ) ); + + const QUrl graph = createGraphForEntity( item ); + mNrlModel->addStatement( item.url(), Akonadi::ItemSearchJob::akonadiItemIdUri(), + QUrl( QString::number( item.id() ) ), graph ); + updateItem( item, graph ); } } @@ -200,6 +210,15 @@ // update item if it does not exist if ( !Nepomuk::ResourceManager::instance()->mainModel()->containsAnyStatement( item.url(), Soprano::Node(), Soprano::Node() ) ) itemsToUpdate.append( item ); + + // the item exists. Check if it has an item ID property, otherwise re-index it. + else { + if ( !Nepomuk::ResourceManager::instance()->mainModel()->containsAnyStatement( item.url(), + Akonadi::ItemSearchJob::akonadiItemIdUri(), Soprano::Node() ) ) { + removeEntityFromNepomuk( item ); + itemsToUpdate.append( item ); + } + } } if ( !itemsToUpdate.isEmpty() ) { @@ -232,7 +251,10 @@ foreach ( Item item, items ) { // we only get here if the item is not anywhere in Nepomuk yet, so no need to delete it item.setParentCollection( mCurrentCollection ); - updateItem( item, createGraphForEntity( item ) ); + const QUrl graph = createGraphForEntity( item ); + mNrlModel->addStatement( item.url(), Akonadi::ItemSearchJob::akonadiItemIdUri(), + QUrl( QString::number( item.id() ) ), graph ); + updateItem( item, graph ); } mProcessedAmount += items.count(); emit percent( (mProcessedAmount * 100) / (mTotalAmount * 100) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/kcm/kcm_akonadi.desktop new/kdepim-runtime-4.4.3/kcm/kcm_akonadi.desktop --- old/kdepim-runtime-4.4.2/kcm/kcm_akonadi.desktop 2010-03-26 18:29:03.000000000 +0100 +++ new/kdepim-runtime-4.4.3/kcm/kcm_akonadi.desktop 2010-04-29 21:57:16.000000000 +0200 @@ -24,13 +24,13 @@ Name[es]=Configuración de Akonadi Name[et]=Akonadi seadistused Name[fr]=Configuration d'Akonadi +Name[ga]=Cumraíocht Akonadi Name[gl]=Configuración do Akonadi Name[hu]=Akonadi-beállítások Name[it]=Configurazione di Akonadi Name[ja]=Akonadi の設定 Name[km]=ការកំណត់រចនាសម្ព័ន្ធ Akonadi Name[ko]=Akonadi 설정 -Name[lt]=Akonadi konfigūravimas Name[lv]=Akonadi konfigurācija Name[nb]=Akonadi-oppsett Name[nds]=Akonadi-Instellen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/migration/kaddressbook/kaddressbookmigrator.desktop new/kdepim-runtime-4.4.3/migration/kaddressbook/kaddressbookmigrator.desktop --- old/kdepim-runtime-4.4.2/migration/kaddressbook/kaddressbookmigrator.desktop 2010-03-26 18:29:03.000000000 +0100 +++ new/kdepim-runtime-4.4.3/migration/kaddressbook/kaddressbookmigrator.desktop 2010-04-29 21:57:16.000000000 +0200 @@ -9,7 +9,9 @@ Name[es]=kaddressbookmigrator Name[et]=KDE aadressiraamatu migreerija Name[fr]=kaddressbookmigrator +Name[ga]=kaddressbookmigrator Name[gl]=kaddressbookmigrator +Name[hu]=kaddressbookmigrator Name[it]=kaddressbookmigrator Name[ja]=アドレス帳移行ツール Name[km]=kaddressbookmigrator @@ -18,6 +20,7 @@ Name[nb]=kaddressbookmigrator Name[nds]=KAdressbook-Överföhren Name[nl]=kaddressbookmigrator +Name[nn]=kaddressbookmigrator Name[pa]=kaddressbookmigrator Name[pl]=kaddressbookmigrator Name[pt]=kaddressbookmigrator @@ -42,6 +45,7 @@ Comment[et]=Tööriist vana KResource'i põhise aadressiraamatu migreerimiseks Akonadisse. Comment[fr]=Outil permettant de convertir les carnets d'adresses utilisant kressource vers Akonadi Comment[gl]=Ferramenta para migrar o caderno de enderezos antigo baseado en kresource para Akonadi. +Comment[hu]=Címjegyzék alapú, régi kresource-t Akonadi-ra költöztető eszköz Comment[it]=Strumento per migrare in Akonadi la rubrica del vecchio tipo kresource. Comment[ja]=KDE の以前のリソースによるアドレス帳を Akonadi へ移行するツール Comment[km]=ឧបករណ៍ត្រូវប្ដូរ kresource ចាស់ដែលមានមូលដ្ឋានលើសៀវភៅអាសយដ្ឋានទៅកាន់ Akonadi ។ @@ -55,6 +59,7 @@ Comment[pt_BR]=Ferramenta de migração do livro de endereços antigo baseado no kresource para o Akonadi. Comment[sl]=Orodje za selitev starega adresarja, temelječega na KResource, v Akonadi Comment[sv]=Verktyg för att överföra en gammal adressbok baserad på kresource till Akonadi. +Comment[tr]=Kresource tabanlı eski adres defterini Akonadi'ye taşımak için araç Comment[uk]=Інструмент для перетворення старої, заснованої на kresource адресної книги на адресну книгу Akonadi. Comment[x-test]=xxTool to migrate the old kresource based address book to Akonadi.xx Comment[zh_CN]=用于将基于 kresource 的旧地址簿资源迁移到 Akonadi 存储后端的工具。 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/plugins/akonadi_serializer_microblog.desktop new/kdepim-runtime-4.4.3/plugins/akonadi_serializer_microblog.desktop --- old/kdepim-runtime-4.4.2/plugins/akonadi_serializer_microblog.desktop 2010-03-26 18:29:02.000000000 +0100 +++ new/kdepim-runtime-4.4.3/plugins/akonadi_serializer_microblog.desktop 2010-04-29 21:57:16.000000000 +0200 @@ -17,7 +17,6 @@ Name[it]=Serializzatore microblog Name[ja]=マイクロブログ用シリアライザ Name[km]=Microblog Serializer -Name[lt]=Mikrotinklaraščio įrašų įrašymas Name[lv]=Mikroblogu serializētājs Name[nb]=Mikroblogg-serialisator Name[nds]=Lüttdaagbook-Reegmoduul @@ -53,7 +52,6 @@ Comment[it]=Un'estensione di Akonadi per la serializzazione di microblog Comment[ja]=マイクロブログのための Akonadi シリアライザプラグイン Comment[km]=កម្មវិធីជំនួយកម្មវិធីដាក់លេខសៀរៀល Akonadi សម្រាប់ Microblog -Comment[lt]=Akonadi serializatoriaus įskiepis mikrotinklaraščiams Comment[lv]=Akonadi Microblog serializēšanas spraudnis Comment[nb]=Et Akonadi programtillegg for serialisering av Microblog Comment[nds]=Akonadi-Inreegmoduul för Lüttdaagböker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/resources/contacts/contactsresource.desktop new/kdepim-runtime-4.4.3/resources/contacts/contactsresource.desktop --- old/kdepim-runtime-4.4.2/resources/contacts/contactsresource.desktop 2010-03-26 18:29:03.000000000 +0100 +++ new/kdepim-runtime-4.4.3/resources/contacts/contactsresource.desktop 2010-04-29 21:57:17.000000000 +0200 @@ -10,15 +10,17 @@ Name[et]=Isiklikud kontaktid Name[fi]=Henkilökohtaiset yhteystiedot Name[fr]=Contacts personnels +Name[ga]=Teagmhálacha Pearsanta Name[gl]=Contactos persoais +Name[hu]=Személyi adatok Name[it]=Contatti personali Name[ja]=個人の連絡先 Name[km]=ទំនាក់ទំនងផ្ទាល់ខ្លួន -Name[lt]=Asmeniniai kontaktai Name[lv]=Personīgie kontakti Name[nb]=Personlige kontakter Name[nds]=Persöönlich Kontakten Name[nl]=Persoonlijke contacten +Name[nn]=Personlege kontaktar Name[pa]=ਨਿੱਜੀ ਸੰਪਰਕ Name[pl]=Kontakty osobiste Name[pt]=Contactos Pessoais @@ -42,6 +44,7 @@ Comment[fi]=Henkilökohtaisten yhteystietojen osoitekirja Comment[fr]=Le carnet d'adresses avec vos contacts personnels Comment[gl]=O caderno de enderezos cos contactos persoais +Comment[hu]=A címjegyzék személyes kapcsolatokkal Comment[it]=La rubrica con i contatti personali Comment[ja]=個人の連絡先を含むアドレス帳 Comment[km]=សៀវភៅអាសយដ្ឋានដែលមានទំនាក់ទំនងផ្ទាល់ខ្លួន diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/resources/imap/imapresource.desktop new/kdepim-runtime-4.4.3/resources/imap/imapresource.desktop --- old/kdepim-runtime-4.4.2/resources/imap/imapresource.desktop 2010-03-26 18:29:03.000000000 +0100 +++ new/kdepim-runtime-4.4.3/resources/imap/imapresource.desktop 2010-04-29 21:57:17.000000000 +0200 @@ -10,16 +10,17 @@ Name[et]=IMAP e-posti server Name[fi]=IMAP-sähköpostipalvelin Name[fr]=Serveur de courriels IMAP +Name[ga]=Freastalaí Ríomhphoist IMAP Name[gl]=Servidor de correo IMAP +Name[hu]=IMAP E-Mail kiszolgáló Name[it]=Server di posta IMAP Name[ja]=IMAP メールサーバ Name[km]=ម៉ាស៊ីនបម្រើអ៊ីមែល IMAP -Name[lt]=IMAP pašto serveris Name[lv]=IMAP e-pasta serveris Name[nb]=IMAP E-post-tjener Name[nds]=IMAP-Nettpostserver Name[nl]=IMAP e-mailserver -Name[nn]=IMAP e-posttenar +Name[nn]=IMAP-basert e-posttenar Name[pa]=IMAP ਈਮੇਲ ਸਰਵਰ Name[pl]=Serwer poczty IMAP Name[pt]=Servidor de E-Mail IMAP @@ -44,6 +45,7 @@ Comment[fi]=Yhdistää IMAP-sähköpostipalvelimeen. Comment[fr]=Se connecte à un serveur de courriels IMAP Comment[gl]=Conéctase a un servidor de correo IMAP. +Comment[hu]=Csatlakozás egy IMAP e-mail szerverhez. Comment[it]=Si collega ad un server di posta IMAP. Comment[ja]=IMAP のメールサーバに接続します。 Comment[km]=តភ្ជាប់ទៅកាន់ម៉ាស៊ីនបម្រើអ៊ីមែល IMAP ។ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/resources/kabc/kabcresource.desktop new/kdepim-runtime-4.4.3/resources/kabc/kabcresource.desktop --- old/kdepim-runtime-4.4.2/resources/kabc/kabcresource.desktop 2010-03-26 18:29:03.000000000 +0100 +++ new/kdepim-runtime-4.4.3/resources/kabc/kabcresource.desktop 2010-04-29 21:57:17.000000000 +0200 @@ -17,7 +17,6 @@ Name[it]=Rubrica indirizzi di KDE (tradizionale) Name[ja]=KDE アドレス帳 (従来のタイプ) Name[km]=សៀវភៅអាសយដ្ឋាន KDE (បុរាណ) -Name[lt]=KDE adresų knygelė (tradicinis šaltinis) Name[lv]=KDE adrešu grāmata (tradicionālā) Name[nb]=KDE-adressebok (tradisjonell) Name[nds]=KDE-Adressbook (normaal) @@ -54,7 +53,6 @@ Comment[it]=Carica dati da una tradizionale risorsa rubrica di KDE Comment[ja]=従来の KDE アドレス帳リソースからデータを読み込みます Comment[km]=ផ្ទុកទិន្នន័យពីធនធានសៀវភៅអាសយដ្ឋាន KDE បុរាណ -Comment[lt]=Įkelia duomenis iš tradicinės KDE adresų knygelės Comment[lv]=Ielādē datus no tradicionālā KDE adrešu grāmatas resursa Comment[nb]=Laster data fra en tradisjonell KDE adressebok-ressurs Comment[nds]=Laadt Daten ut en normaal KDE-Adressbookressource diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/resources/kolabproxy/kolabproxyresource.desktop new/kdepim-runtime-4.4.3/resources/kolabproxy/kolabproxyresource.desktop --- old/kdepim-runtime-4.4.2/resources/kolabproxy/kolabproxyresource.desktop 2010-03-26 18:29:03.000000000 +0100 +++ new/kdepim-runtime-4.4.3/resources/kolabproxy/kolabproxyresource.desktop 2010-04-29 21:57:17.000000000 +0200 @@ -9,11 +9,12 @@ Name[es]=Servidor de trabajo en grupo Kolab Name[et]=Kolabi grupitöö server Name[fr]=Serveur de travail collaboratif Kolab +Name[ga]=Freastalaí Groupware Kolab Name[gl]=Servidor de traballo en grupo Kolab +Name[hu]=Kolab csoportos használatú kiszolgáló Name[it]=Server di groupware Kolab Name[ja]=Kolab グループウェアサーバ Name[km]=ម៉ាស៊ីនបម្រើ Kolab Groupware -Name[lt]=Kolab grupinio darbo serveris Name[lv]=Kolab grupdarba serveris Name[nb]=Kolab groupware-tjener Name[nds]=Kolab-Arbeitkoppel-Server @@ -41,6 +42,7 @@ Comment[et]=Ligipääsu tagamine Kolabi grupitöökaustadele IMAP serveris (IMAP kontod tuleb eraldi seadistada). Comment[fr]=Fourni l'accès aux dossiers Kolab sur un serveur IMAP (il est nécessaire de configurer les comptes IMAP séparément). Comment[gl]=Fornece acceso aos cartafoles de traballo en grupo de Kolab dun servidor de IMAP (hai que configurar as contas IMAP por separado). +Comment[hu]=Hozzáférés biztosítása a Kolab csoportos alkalmazás könyvtárakhoz egy IMAP kiszolgálón (az IMAP fiókokat elkülönítve kell beállítani). Comment[it]=Fornisce l'accesso a cartelle di groupware Kolab su un server IMAP (gli account IMAP devono essere impostati separatamente). Comment[ja]=IMAP サーバの Kolab グループウェアフォルダへのアクセスを提供します (IMAP アカウントは別に設定する必要があります)。 Comment[km]=ផ្ដល់ការចូលដំណើរការទៅកាន់ថត Kolab groupware នៅលើម៉ាស៊ីនបម្រើ IMAP (គណនី IMAP តម្រូវឲ្យដំឡើងដោយឡែក) ។ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/resources/mailtransport_dummy/mtdummyresource.desktop new/kdepim-runtime-4.4.3/resources/mailtransport_dummy/mtdummyresource.desktop --- old/kdepim-runtime-4.4.2/resources/mailtransport_dummy/mtdummyresource.desktop 2010-03-26 18:29:03.000000000 +0100 +++ new/kdepim-runtime-4.4.3/resources/mailtransport_dummy/mtdummyresource.desktop 2010-04-29 21:57:17.000000000 +0200 @@ -10,6 +10,7 @@ Name[et]=Kirjade edastamine libaressurss Name[fr]=Transport de courriels de test Name[gl]=Recurso de transporte de correo parvo +Name[hu]=Formális LevélSzállítási erőforrás Name[it]=Risorsa MailTransport fittizia Name[km]=ធនធាន MailTransport សម្រាប់អ្នកមិនចេះ Name[lt]=Fiktyvus pašto transporto resursas @@ -17,11 +18,13 @@ Name[nb]=Attrapp-ressurs for e-posttransport Name[nds]=Platzholl-Nettpostöverdreegmetoden-Ressource Name[nl]=Dummy mailtransporthulpmiddel +Name[nn]=Testressurs for e-posttransport Name[pl]=Prosty zasób metody przekazywania poczty Name[pt]=Recurso de Transporte de Correio para Testes Name[pt_BR]=Recurso de transporte de e-mails para testes Name[sl]=Lažen vir MailTransport Name[sv]=E-postsändningsresurs för test +Name[tr]=Boş MailTransport Kaynağı Name[uk]=Тестовий ресурс MailTransport Name[x-test]=xxDummy MailTransport Resourcexx Name[zh_CN]=虚拟邮件传输资源 @@ -37,6 +40,7 @@ Comment[et]=Kirjade edastamise liidese libaressurss Comment[fr]=Ressource de test qui implémente l'interface de transport de courriels Comment[gl]=Recurso parvo que aporta a interface de transporte de correo +Comment[hu]=Formális erőforrás implementáló levél szállítási felület Comment[it]=Risorsa fittizia che implementa l'interfaccia di trasporto della posta Comment[km]=ចំណុចប្រទាក់បញ្ជូនសំបុត្រដោយអនុវត្តធនធានពីដំបូង Comment[lt]=Fiktyvus resursas, įgyvendinantis pašto transporto sąsają @@ -44,11 +48,13 @@ Comment[nb]=Attrappressurs som implementerer grensesnitt for e-posttransport Comment[nds]=Platzhollressource mit inbuut Nettpostöverdreegmetood-Koppelsteed Comment[nl]=Dummy hulpmiddel die een mailtransportinterface implementeert +Comment[nn]=Testressurs som tek i bruk eit grensesnitt for e-posttransport Comment[pl]=Prosty zasób implementujący interfejs do przekazywania poczty Comment[pt]=Uma interface de transporte de correio que implementa um recurso de testes Comment[pt_BR]=Interface de transporte de e-mails que implementa um recurso de testes Comment[sl]=Lažen vir t implementacijo vmesnika za prenos pošte Comment[sv]=Testresurs som implementerar gränssnitt för e-postöverföring +Comment[tr]=Posta nakletme arayüzünü gerçekleyen boş kaynak Comment[uk]=Тестовий ресурс, що реалізує інтерфейс пересилання пошти Comment[x-test]=xxDummy Resource implementing mail transport interfacexx Comment[zh_CN]=实现了邮件传输接口的虚拟资源 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/resources/mbox/mboxresource.desktop new/kdepim-runtime-4.4.3/resources/mbox/mboxresource.desktop --- old/kdepim-runtime-4.4.2/resources/mbox/mboxresource.desktop 2010-03-26 18:29:03.000000000 +0100 +++ new/kdepim-runtime-4.4.3/resources/mbox/mboxresource.desktop 2010-04-29 21:57:17.000000000 +0200 @@ -13,6 +13,7 @@ Name[fr]=Mbox Name[ga]=Mbox Name[gl]=Mbox +Name[hu]=Mbox Name[it]=Mbox Name[ja]=Mbox Name[km]=Mbox @@ -48,10 +49,10 @@ Comment[fr]=Charge des données depuis un fichier mbox Comment[ga]=Breiseán a luchtaíonn sonraí ó chomhad logánta mbox Comment[gl]=Carrega datos desde un ficheiro mbox local +Comment[hu]=Adatok betöltése egy helyi mbox fájlból Comment[it]=Carica dati da una cartella locale mbox Comment[ja]=ローカルの mbox ファイルからデータを読み込みます Comment[km]=ផ្ទុកទិន្នន័យពីឯកសារ mbox មូលដ្ឋាន -Comment[lt]=Įkelia duomenis iš vietinio mbox failo Comment[lv]=Ielādē datus no lokālā mbox faila Comment[nb]=Laster data fra en lokal mbox-fil Comment[nds]=Laadt Daten ut en lokaal Postfach (MBox-Datei) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/resources/microblog/microblog.desktop new/kdepim-runtime-4.4.3/resources/microblog/microblog.desktop --- old/kdepim-runtime-4.4.2/resources/microblog/microblog.desktop 2010-03-26 18:29:03.000000000 +0100 +++ new/kdepim-runtime-4.4.3/resources/microblog/microblog.desktop 2010-04-29 21:57:17.000000000 +0200 @@ -48,6 +48,7 @@ Comment[et]=Näitab mikroblogi andmeid Twitterist või Identi.ca-st Comment[fi]=Näyttää mikroblogitietosi Twitteristä tai Identi.casta. Comment[fr]=Affiche vos informations de Twitter ou Identi.ca +Comment[ga]=Taispeáin do shonraí micreabhlagadóireachta ó Twitter nó Identi.ca. Comment[gl]=Mostra os seus datos de microblog de Twitter ou Identi.ca. Comment[hu]=Megjeleníti a Twitter vagy az Identi.ca adatait. Comment[it]=Mostra i dati di microblog da Twitter o Identi.ca. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.4.2/resources/pop3/pop3resource.desktop new/kdepim-runtime-4.4.3/resources/pop3/pop3resource.desktop --- old/kdepim-runtime-4.4.2/resources/pop3/pop3resource.desktop 2010-03-26 18:29:03.000000000 +0100 +++ new/kdepim-runtime-4.4.3/resources/pop3/pop3resource.desktop 2010-04-29 21:57:16.000000000 +0200 @@ -10,7 +10,9 @@ Name[et]=POP3 Name[fi]=POP3 Name[fr]=POP3 +Name[ga]=POP3 Name[gl]=POP3 +Name[hu]=POP3 Name[it]=POP3 Name[ja]=POP3 Name[km]=POP3 @@ -42,7 +44,9 @@ Comment[et]=Kirjade tõmbamine POP3 serverist Comment[fi]=Noutaa postin POP3-palvelimela Comment[fr]=Récupère les courriels depuis un serveur POP3 +Comment[ga]=Faigheann sé seo ríomhphost ó fhreastalaí POP3 Comment[gl]=Obtén correo dun servidor de POP3 +Comment[hu]=Levél letöltése egy POP3 kiszolgálóról Comment[it]=Scarica messaggi da un server POP3 Comment[ja]=POP3 サーバからメールを取得します Comment[km]=ទៅយកសំបុត្រពីម៉ាស៊ីនបម្រើ POP3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ncpfs for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package ncpfs for openSUSE:Factory checked in at Wed May 5 22:59:46 CEST 2010. -------- --- ncpfs/ncpfs.changes 2010-04-27 12:18:53.000000000 +0200 +++ ncpfs/ncpfs.changes 2010-05-05 11:08:26.000000000 +0200 @@ -1,0 +2,10 @@ +Wed May 5 11:07:55 CEST 2010 - meissner(a)suse.de + +- Fixed information leakage on mount (CVE-2010-0790 / bnc#583536) +- Fixed mtab locking problem (CVE-2010-0791 / bnc#583536) + ncpfs-2_2_6_partial.patch + +- Fixed race condition in ncpfs mounts (CVE-2010-0788 / bnc#550004) + ncpfs-2.2.6-mount-issue-ver2.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ncpfs-2.2.6-mount-issue-ver2.patch ncpfs-2_2_6_partial.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncpfs.spec ++++++ --- /var/tmp/diff_new_pack.lxuxET/_old 2010-05-05 22:55:16.000000000 +0200 +++ /var/tmp/diff_new_pack.lxuxET/_new 2010-05-05 22:55:16.000000000 +0200 @@ -24,7 +24,7 @@ Group: Productivity/Networking/Novell AutoReqProv: on Version: 2.2.6 -Release: 160 +Release: 161 PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Tools for Accessing Novell File Systems @@ -94,6 +94,8 @@ Patch1003: ncpfs.pam_ncp_auth.syslog.patch Patch1005: ncpfs.offsetof.patch Patch1006: ncpfs.mount_hang.patch +Patch1007: ncpfs-2.2.6-mount-issue-ver2.patch +Patch1008: ncpfs-2_2_6_partial.patch # In openSUSE 11.3 there is upstream compliant CUPS 1.4 # which means to have a fixed "/usr/lib/cups/" directory # on all platforms (see Novell/Suse Bugzilla bnc#575544): @@ -196,6 +198,8 @@ %patch1003 -p1 %patch1005 -p1 %patch1006 -p1 +%patch1007 -p1 +%patch1008 -p1 tar xfvj %{SOURCE12} if [ "$UID" = 0 ] ; then chown -R 0:0 . ; fi ++++++ ncpfs-2.2.6-mount-issue-ver2.patch ++++++ Index: ncpfs-2.2.6/sutil/ncpm_common.c =================================================================== --- ncpfs-2.2.6.orig/sutil/ncpm_common.c +++ ncpfs-2.2.6/sutil/ncpm_common.c @@ -444,7 +444,7 @@ static int ncp_mount_v2(const char* moun } datav2.file_mode = data->file_mode; datav2.dir_mode = data->dir_mode; - err = proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*) &datav2); + err = proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*) &datav2); if (err) return errno; return 0; @@ -508,7 +508,7 @@ static int ncp_mount_v3(const char* moun exit(0); /* Should not return from process_connection */ } close(pp[0]); - err=proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*) &datav3); + err=proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*) &datav3); if (err) { err = errno; /* Mount unsuccesful so we have to kill daemon */ @@ -559,7 +559,7 @@ static int ncp_mount_v4(const char* moun sprintf(mountopts, "version=%u,flags=%u,owner=%u,uid=%u,gid=%u,mode=%u,dirmode=%u,timeout=%u,retry=%u,wdogpid=%u,ncpfd=%u,infofd=%u", NCP_MOUNT_VERSION_V5, ncpflags, data->mounted_uid, data->uid, data->gid, data->file_mode, data->dir_mode, data->time_out, data->retry_count, wdog_pid, data->ncp_fd, pp[1]); - err=proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, mountopts); + err=proc_ncpm_mount(mount_name, ".", "ncpfs", flags, mountopts); } else { err=-1; } @@ -577,7 +577,7 @@ static int ncp_mount_v4(const char* moun datav4.file_mode = data->file_mode; datav4.dir_mode = data->dir_mode; datav4.wdog_pid = wdog_pid; - err = proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*)&datav4); + err = proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*)&datav4); if (err) { err = errno; /* Mount unsuccesful so we have to kill daemon */ @@ -1395,6 +1395,17 @@ process_connection (const struct ncp_mou } #endif /* MOUNT3 */ +static int check_name(const char *name) +{ + char *s; + for (s = "\n\t\\"; *s; s++) { + if (strchr(name, *s)) { + return -1; + } + } + return 0; +} + static const struct smntflags { unsigned int flag; const char* name; @@ -1416,6 +1427,9 @@ void add_mnt_entry(char* mount_name, cha int fd; FILE* mtab; + if (check_name(mount_name) == -1 || check_name(mpnt) == -1) + errexit(107, _("Illegal character in mount entry\n")); + ment.mnt_fsname = mount_name; ment.mnt_dir = mpnt; ment.mnt_type = (char*)"ncpfs"; Index: ncpfs-2.2.6/sutil/ncpmount.c =================================================================== --- ncpfs-2.2.6.orig/sutil/ncpmount.c +++ ncpfs-2.2.6/sutil/ncpmount.c @@ -359,11 +359,17 @@ main(int argc, char *argv[]) usage(); return -1; } + realpath(argv[optind], mount_point); - if (stat(mount_point, &st) == -1) + if (chdir(mount_point)) + { + errexit(31, _("Could not change directory into mount target %s: %s\n"), + mount_point, strerror(errno)); + } + if (stat(".", &st) == -1) { - errexit(31, _("Could not find mount point %s: %s\n"), + errexit(31, _("Mount point %s does not exist: %s\n"), mount_point, strerror(errno)); } if (mount_ok(&st) != 0) Index: ncpfs-2.2.6/sutil/ncpumount.c =================================================================== --- ncpfs-2.2.6.orig/sutil/ncpumount.c +++ ncpfs-2.2.6/sutil/ncpumount.c @@ -61,6 +61,8 @@ #include <ctype.h> #include <stdarg.h> #include <signal.h> +#include <sys/types.h> +#include <sys/wait.h> #include <sys/errno.h> #include <ncp/nwcalls.h> @@ -70,10 +72,19 @@ #include <mntent.h> #include <pwd.h> +#include <sched.h> + #include "private/libintl.h" #define _(X) X +#ifndef MS_REC +#define MS_REC 16384 +#endif +#ifndef MS_SLAVE +#define MS_SLAVE (1<<19) +#endif + static char *progname; static int is_ncplogout = 0; @@ -229,11 +240,188 @@ static int clearMtab (const char* mount_ return err; } + +int ncp_mnt_umount(const char *abs_mnt, const char *rel_mnt) +{ + if (umount(rel_mnt) != 0) { + eprintf(_("Could not umount %s: %s\n"), + abs_mnt, strerror(errno)); + return -1; + } + return 0; +} + + +static int check_is_mount_child(void *p) +{ + const char **a = p; + const char *last = a[0]; + const char *mnt = a[1]; + int res; + const char *procmounts = "/proc/mounts"; + int found; + FILE *fp; + struct mntent *entp; + + res = mount("", "/", "", MS_SLAVE | MS_REC, NULL); + if (res == -1) { + eprintf(_("Failed to mark mounts slave: %s\n"), + strerror(errno)); + return 1; + } + + res = mount(".", "/tmp", "", MS_BIND | MS_REC, NULL); + if (res == -1) { + eprintf(_("Failed to bind parent to /tmp: %s\n"), + strerror(errno)); + return 1; + } + + fp = setmntent(procmounts, "r"); + if (fp == NULL) { + eprintf(_("Failed to open %s: %s\n"), + procmounts, strerror(errno)); + return 1; + } + + found = 0; + while ((entp = getmntent(fp)) != NULL) { + if (strncmp(entp->mnt_dir, "/tmp/", 5) == 0 && + strcmp(entp->mnt_dir + 5, last) == 0) { + found = 1; + break; + } + } + endmntent(fp); + + if (!found) { + eprintf(_("%s not mounted\n"), mnt); + return 1; + } + + return 0; +} + + +static int check_is_mount(const char *last, const char *mnt) +{ + char buf[131072]; + pid_t pid, p; + int status; + const char *a[2] = { last, mnt }; + + pid = clone(check_is_mount_child, buf + 65536, CLONE_NEWNS, (void *) a); + if (pid == (pid_t) -1) { + eprintf(_("Failed to clone namespace: %s\n"), + strerror(errno)); + return -1; + } + p = waitpid(pid, &status, __WCLONE); + if (p == (pid_t) -1) { + eprintf(_("Waitpid failed: %s\n"), + strerror(errno)); + return -1; + } + if (!WIFEXITED(status)) { + eprintf(_("Child terminated abnormally (status %i)\n"), + status); + return -1; + } + if (WEXITSTATUS(status) != 0) + return -1; + + return 0; +} + + +static int chdir_to_parent(char *copy, const char **lastp, int *currdir_fd) +{ + char *tmp; + const char *parent; + char buf[PATH_MAX]; + int res; + + tmp = strrchr(copy, '/'); + if (tmp == NULL || tmp[1] == '\0') { + eprintf(_("Internal error: invalid abs path: <%s>\n"), + copy); + return -1; + } + if (tmp != copy) { + *tmp = '\0'; + parent = copy; + *lastp = tmp + 1; + } else if (tmp[1] != '\0') { + *lastp = tmp + 1; + parent = "/"; + } else { + *lastp = "."; + parent = "/"; + } + *currdir_fd = open(".", O_RDONLY); + if (*currdir_fd == -1) { + eprintf(_("Failed to open current directory: %s\n"), + strerror(errno)); + return -1; + } + res = chdir(parent); + if (res == -1) { + eprintf(_("Failed to chdir to %s: %s\n"), + parent, strerror(errno)); + return -1; + } + if (getcwd(buf, sizeof(buf)) == NULL) { + eprintf(_("Failed to obtain current directory: %s\n"), + strerror(errno)); + return -1; + } + if (strcmp(buf, parent) != 0) { + eprintf(_("Mountpoint moved (%s -> %s)\n"), + parent, buf); + return -1; + + } + + return 0; +} + + +static int unmount_ncp(const char *mount_point) +{ + int currdir_fd = -1; + char *copy; + const char *last; + int res; + + copy = strdup(mount_point); + if (copy == NULL) { + eprintf(_("Failed to allocate memory\n")); + return -1; + } + res = chdir_to_parent(copy, &last, &currdir_fd); + if (res == -1) + goto out; + res = check_is_mount(last, mount_point); + if (res == -1) + goto out; + res = ncp_mnt_umount(mount_point, last); + +out: + free(copy); + if (currdir_fd != -1) { + fchdir(currdir_fd); + close(currdir_fd); + } + + return res; +} + static int do_umount(const char *mount_point) { int fid = open(mount_point, O_RDONLY, 0); uid_t mount_uid; + int res; if (fid == -1) { eprintf(_("Could not open %s: %s\n"), @@ -253,12 +441,8 @@ do_umount(const char *mount_point) return -1; } close(fid); - if (umount(mount_point) != 0) { - eprintf(_("Could not umount %s: %s\n"), - mount_point, strerror(errno)); - return -1; - } - return 0; + res = unmount_ncp(mount_point); + return res; } ++++++ ncpfs-2_2_6_partial.patch ++++++ Index: ncpfs-2.2.6/sutil/ncplogin.c =================================================================== --- ncpfs-2.2.6.orig/sutil/ncplogin.c +++ ncpfs-2.2.6/sutil/ncplogin.c @@ -934,7 +934,9 @@ ncpipx:; NWDSFreeContext(ctx); /* ncpmap, ncplogin must write in /etc/mtab */ { + block_sigs(); add_mnt_entry(mount_name, mount_point, info.flags); + unblock_sigs(); } free(mount_name); if (info.echo_mnt_pnt) { Index: ncpfs-2.2.6/sutil/ncpm_common.c =================================================================== --- ncpfs-2.2.6.orig/sutil/ncpm_common.c +++ ncpfs-2.2.6/sutil/ncpm_common.c @@ -360,7 +360,7 @@ void verify_argv(int argc, char* argv[]) #endif static inline int ncpm_suser(void) { - return setreuid(-1, 0); + return setresuid(0, 0, myuid); } static int ncpm_normal(void) { @@ -368,11 +368,31 @@ static int ncpm_normal(void) { int v; e = errno; - v = setreuid(-1, myuid); + v = setresuid(myuid, myuid, 0); errno = e; return v; } +void block_sigs(void) { + + sigset_t mask, orig_mask; + sigfillset(&mask); + + if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) { + errexit(-1, _("Blocking signals failed.\n")); + } +} + +void unblock_sigs(void) { + + sigset_t mask, orig_mask; + sigemptyset(&mask); + + if (sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) { + errexit(-1, _("Un-blocking signals failed.\n")); + } +} + static int proc_ncpm_mount(const char* source, const char* target, const char* filesystem, unsigned long mountflags, const void* data) { int v; int e; Index: ncpfs-2.2.6/sutil/ncpm_common.h =================================================================== --- ncpfs-2.2.6.orig/sutil/ncpm_common.h +++ ncpfs-2.2.6/sutil/ncpm_common.h @@ -121,6 +121,9 @@ int proc_buildconn(struct ncp_mount_info int proc_aftermount(const struct ncp_mount_info* info, NWCONN_HANDLE* conn); int proc_ncpm_umount(const char* dir); +void block_sigs(void); +void unblock_sigs(void); + #define UNUSED(x) x __attribute__((unused)) #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) Index: ncpfs-2.2.6/sutil/ncpmount.c =================================================================== --- ncpfs-2.2.6.orig/sutil/ncpmount.c +++ ncpfs-2.2.6/sutil/ncpmount.c @@ -720,7 +720,9 @@ ncpipx:; ncp_close(conn); if (!opt_n) { + block_sigs(); add_mnt_entry(mount_name, mount_point, info.flags); + unblock_sigs(); } return 0; } Index: ncpfs-2.2.6/sutil/ncpumount.c =================================================================== --- ncpfs-2.2.6.orig/sutil/ncpumount.c +++ ncpfs-2.2.6/sutil/ncpumount.c @@ -86,6 +86,8 @@ static char *progname; static int is_ncplogout = 0; +uid_t uid; + static void usage(void) { @@ -126,6 +128,40 @@ static void eprintf(const char* message, va_end(ap); } +/* Mostly copied from ncpm_common.c */ +void block_sigs(void) { + + sigset_t mask, orig_mask; + sigfillset(&mask); + sigdelset(&mask, SIGALRM); /* Need SIGALRM for ncpumount */ + + if(setresuid(0, 0, uid) < 0) { + eprintf("Failed to raise privileges.\n"); + exit(-1); + } + + if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) { + eprintf("Blocking signals failed.\n"); + exit(-1); + } +} + +void unblock_sigs(void) { + + sigset_t mask, orig_mask; + sigemptyset(&mask); + + if(setresuid(uid, uid, 0) < 0) { + eprintf("Failed to drop privileges.\n"); + exit(-1); + } + + if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) { + eprintf("Un-blocking signals failed.\n"); + exit(-1); + } +} + static void alarmSignal(int sig) { (void)sig; } @@ -201,10 +237,13 @@ static int clearMtab (const char* mount_ if (!numEntries) return 0; /* don't waste time ! */ + block_sigs(); + while ((fd = open(MOUNTED "~", O_RDWR | O_CREAT | O_EXCL, 0600)) == -1) { struct timespec tm; if (errno != EEXIST || retries == 0) { + unblock_sigs(); eprintf(_("Can't get %s~ lock file: %s\n"), MOUNTED, strerror(errno)); return 1; } @@ -215,6 +254,7 @@ static int clearMtab (const char* mount_ alarm(0); close(fd); if (err) { + unblock_sigs(); eprintf(_("Can't lock lock file %s~: %s\n"), MOUNTED, _("Lock timed out")); return 1; } @@ -232,9 +272,11 @@ static int clearMtab (const char* mount_ err = __clearMtab(mount_points, numEntries); if ((unlink(MOUNTED "~") == -1) && (err == 0)){ + unblock_sigs(); eprintf(_("Can't remove %s~"), MOUNTED); return 1; } + unblock_sigs(); return err; } @@ -422,13 +464,13 @@ do_umount(const char *mount_point) int res; if (fid == -1) { - eprintf(_("Could not open %s: %s\n"), - mount_point, strerror(errno)); + eprintf(_("Invalid or unauthorized mountpoint %s\n"), + mount_point); return -1; } if (ncp_get_mount_uid(fid, &mount_uid) != 0) { close(fid); - eprintf(_("%s probably not ncp-filesystem\n"), + eprintf(_("Invalid or unauthorized mountpoint %s\n"), mount_point); return -1; } @@ -591,7 +633,8 @@ main(int argc, char *argv[]) int allConns = 0; const char *serverName = NULL; const char *treeName = NULL; - uid_t uid = getuid(); + + uid = getuid(); progname = strrchr(argv[0], '/'); if (progname) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeedu4 for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package kdeedu4 for openSUSE:Factory checked in at Wed May 5 22:54:58 CEST 2010. -------- --- KDE/kdeedu4/kdeedu4-noarch.changes 2010-04-01 16:10:30.000000000 +0200 +++ kdeedu4/kdeedu4-noarch.changes 2010-05-05 22:54:24.004867000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 29 22:38:54 CEST 2010 - dmueller(a)suse.de + +- update to 4.4.3 + * bugfixes over 4.4.2 + * see http://kde.org/announcements/changelogs/changelog4_4_2to4_4_3.php for details + +------------------------------------------------------------------- kdeedu4.changes: same change calling whatdependson for head-i586 Old: ---- kdeedu-4.4.2.tar.bz2 New: ---- kdeedu-4.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu4-noarch.spec ++++++ --- /var/tmp/diff_new_pack.TnXlMI/_old 2010-05-05 22:54:48.000000000 +0200 +++ /var/tmp/diff_new_pack.TnXlMI/_new 2010-05-05 22:54:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeedu4-noarch (Version 4.4.2) +# spec file for package kdeedu4-noarch (Version 4.4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,7 +27,7 @@ Group: System/GUI/KDE Summary: General Data for KDE Education Applications Url: http://edu.kde.org -Version: 4.4.2 +Version: 4.4.3 Release: 1 Source0: kdeedu-%version.tar.bz2 Patch0: 4_4_BRANCH.diff kdeedu4.spec: same change ++++++ kdeedu-4.4.2.tar.bz2 -> kdeedu-4.4.3.tar.bz2 ++++++ KDE/kdeedu4/kdeedu-4.4.2.tar.bz2 kdeedu4/kdeedu-4.4.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdesdk4 for openSUSE:Factory
by root＠hilbert.suse.de 05 May '10

05 May '10

Hello community, here is the log from the commit of package kdesdk4 for openSUSE:Factory checked in at Wed May 5 22:53:41 CEST 2010. -------- --- KDE/kdesdk4/kdesdk4.changes 2010-03-26 19:37:17.000000000 +0100 +++ kdesdk4/kdesdk4.changes 2010-04-29 22:42:06.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 29 22:42:02 CEST 2010 - dmueller(a)suse.de + +- update to 4.4.3 + * bugfixes over 4.4.2 + * see http://kde.org/announcements/changelogs/changelog4_4_2to4_4_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdesdk-4.4.2.tar.bz2 New: ---- kdesdk-4.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4.spec ++++++ --- /var/tmp/diff_new_pack.SPHvgL/_old 2010-05-05 22:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.SPHvgL/_new 2010-05-05 22:53:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdesdk4 (Version 4.4.2) +# spec file for package kdesdk4 (Version 4.4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,11 +23,11 @@ %if %suse_version > 1100 BuildRequires: hunspell-devel %endif -License: GPLv2 ; GPLv2+ +License: GPLv2+ Group: System/GUI/KDE Summary: KDE SDK Package Url: http://www.kde.org/ -Version: 4.4.2 +Version: 4.4.3 Release: 1 Source0: kdesdk-%version.tar.bz2 Patch: 4_4_BRANCH.diff ++++++ kdesdk-4.4.2.tar.bz2 -> kdesdk-4.4.3.tar.bz2 ++++++ Files old/kdesdk-4.4.2/doc/cervisia/index.cache.bz2 and new/kdesdk-4.4.3/doc/cervisia/index.cache.bz2 differ Files old/kdesdk-4.4.2/doc/kapptemplate/index.cache.bz2 and new/kdesdk-4.4.3/doc/kapptemplate/index.cache.bz2 differ Files old/kdesdk-4.4.2/doc/kate/index.cache.bz2 and new/kdesdk-4.4.3/doc/kate/index.cache.bz2 differ Files old/kdesdk-4.4.2/doc/kbugbuster/index.cache.bz2 and new/kdesdk-4.4.3/doc/kbugbuster/index.cache.bz2 differ Files old/kdesdk-4.4.2/doc/kcachegrind/index.cache.bz2 and new/kdesdk-4.4.3/doc/kcachegrind/index.cache.bz2 differ Files old/kdesdk-4.4.2/doc/kompare/index.cache.bz2 and new/kdesdk-4.4.3/doc/kompare/index.cache.bz2 differ Files old/kdesdk-4.4.2/doc/scripts/kdesvn-build/index.cache.bz2 and new/kdesdk-4.4.3/doc/scripts/kdesvn-build/index.cache.bz2 differ Files old/kdesdk-4.4.2/doc/umbrello/index.cache.bz2 and new/kdesdk-4.4.3/doc/umbrello/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kapptemplate/templates/C++/flake/%{APPNAMELC}shape.desktop new/kdesdk-4.4.3/kapptemplate/templates/C++/flake/%{APPNAMELC}shape.desktop --- old/kdesdk-4.4.2/kapptemplate/templates/C++/flake/%{APPNAMELC}shape.desktop 2010-03-26 18:30:27.000000000 +0100 +++ new/kdesdk-4.4.3/kapptemplate/templates/C++/flake/%{APPNAMELC}shape.desktop 2010-04-29 21:59:02.000000000 +0200 @@ -18,6 +18,7 @@ Name[nb]=%{APPNAME}-form Name[nds]=%{APPNAME}-Form Name[nl]=%{APPNAME}-vorm +Name[nn]=%{APPNAME}-form Name[pa]=%{APPNAME} ਸ਼ਕਲ Name[pt]=Forma %{APPNAME} Name[pt_BR]=Forma %{APPNAME} @@ -47,6 +48,7 @@ Comment[nb]=%{APPNAME}-flakform Comment[nds]=%{APPNAME}-Flakeform Comment[nl]=%{APPNAME}-vlokkenvorm +Comment[nn]=%{APPNAME}-Flake-form Comment[pt]=Forma do Flake %{APPNAME} Comment[pt_BR]=Forma do Flake %{APPNAME} Comment[sr]=Облик за %{APPNAME} (Флејк) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kapptemplate/templates/C++/flake/%{APPNAME}shape.desktop new/kdesdk-4.4.3/kapptemplate/templates/C++/flake/%{APPNAME}shape.desktop --- old/kdesdk-4.4.2/kapptemplate/templates/C++/flake/%{APPNAME}shape.desktop 2010-03-26 18:30:27.000000000 +0100 +++ new/kdesdk-4.4.3/kapptemplate/templates/C++/flake/%{APPNAME}shape.desktop 2010-04-29 21:59:02.000000000 +0200 @@ -18,6 +18,7 @@ Name[nb]=%{APPNAME}-form Name[nds]=%{APPNAME}-Form Name[nl]=%{APPNAME}-vorm +Name[nn]=%{APPNAME}-form Name[pa]=%{APPNAME} ਸ਼ਕਲ Name[pt]=Forma %{APPNAME} Name[pt_BR]=Forma %{APPNAME} @@ -47,6 +48,7 @@ Comment[nb]=%{APPNAME}-flakform Comment[nds]=%{APPNAME}-Flakeform Comment[nl]=%{APPNAME}-vlokkenvorm +Comment[nn]=%{APPNAME}-Flake-form Comment[pt]=Forma do Flake %{APPNAME} Comment[pt_BR]=Forma do Flake %{APPNAME} Comment[sr]=Облик за %{APPNAME} (Флејк) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kapptemplate/templates/C++/flake/flake.kdevtemplate new/kdesdk-4.4.3/kapptemplate/templates/C++/flake/flake.kdevtemplate --- old/kdesdk-4.4.2/kapptemplate/templates/C++/flake/flake.kdevtemplate 2010-03-26 18:30:27.000000000 +0100 +++ new/kdesdk-4.4.3/kapptemplate/templates/C++/flake/flake.kdevtemplate 2010-04-29 21:59:02.000000000 +0200 @@ -17,6 +17,7 @@ Name[nb]=KOffice formmal (flak) Name[nds]=Formvörlaag (Flake) för KOffice Name[nl]=KOffice vormsjabloon (vlok) +Name[nn]=KOffice-formmal (Flake) Name[pt]=Modelo de Formas do KOffice (Flake) Name[pt_BR]=Modelo de Formas do KOffice (Flake) Name[sr]=Шаблон облика за К‑офис (Флејк) @@ -44,6 +45,7 @@ Comment[nb]=En KOffice mal for programtillegg med en form, et verktøy og en dokker (bruk ThisFormat som prosjektnavn). Comment[nds]=En Moduulvörlaag för KOffice mit en Form, en Warktüüch un en Andocker (Bruuk DitFormaat as Projektnaam.) Comment[nl]=Een sjabloonplugin voor KOffice met een vorm, een hulpmiddel en een verankering (gaarne DezeOpmaak gebruiken voor de projectnaam) +Comment[nn]=Programtillegg-mal for KOffice, med ei form, eit verktøy og ein dokk (bruk DetteFormatet for namnet på prosjektet) Comment[pt]=Um modelo de 'plugin' do KOffice com uma forma, uma ferramenta e uma área acoplável (use por favor EsteFormato como nome do projecto) Comment[pt_BR]=Um modelo de plugin do KOffice com uma forma, uma ferramenta e uma área acoplável (use por favor EsteFormato como nome do projeto) Comment[sr]=Шаблон прикључка за К‑офис са обликом, алатком и сидриштем (име пројекта треба да буде OvogOblika) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kapptemplate/templates/C++/kofficetext/kofficetext.kdevtemplate new/kdesdk-4.4.3/kapptemplate/templates/C++/kofficetext/kofficetext.kdevtemplate --- old/kdesdk-4.4.2/kapptemplate/templates/C++/kofficetext/kofficetext.kdevtemplate 2010-03-26 18:30:28.000000000 +0100 +++ new/kdesdk-4.4.3/kapptemplate/templates/C++/kofficetext/kofficetext.kdevtemplate 2010-04-29 21:59:02.000000000 +0200 @@ -17,6 +17,7 @@ Name[nb]=KOffice mal for tekst-programtillegg Name[nds]=Textmoduul-Vörlaag för KOffice Name[nl]=KOffice tekst-plugin-sjabloon +Name[nn]=KOffice-mal for teksttillegg Name[pt]=Modelo de 'Plugin' de Texto do KOffice Name[pt_BR]=Modelo de 'Plugin' de Texto do KOffice Name[sr]=Шаблон текстуалног прикључка за К‑офис @@ -44,6 +45,7 @@ Comment[nb]=En KOffice mal for programtillegg som legger til nye muligheter til å endre tekst (bruk ThisFormat som prosjektnavn). Comment[nds]=En Moduulvörlaag för KOffice, mit de sik niege Mööglichkeiten för Textännern tofögen laat. (Bruuk DitFormaat as Projektnaam.) Comment[nl]=Een plugin voor KOffice met nieuwe functies voor het wijzigen van tekst(gaarne DezeOpmaak gebruiken voor de projectnaam) +Comment[nn]=Programtillegg-mal for KOffice, for nye funksjonar for endring av tekst (bruk DetteFormatet for namnet på prosjektet) Comment[pt]=Um modelo de 'plugin' do KOffice para adicionar novas funcionalidades de modificação de texto (use por favor EsteFormato como nome do projecto) Comment[pt_BR]=Um modelo de plugin do KOffice para adicionar novas funcionalidades de modificação de texto (use por favor EsteFormato como nome do projeto) Comment[sr]=Шаблон прикључка за К‑офис за додавање нових могућности мењања текста (име пројекта треба да буде OvogOblika) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kapptemplate/templates/C++/kofficetext/kotext%{APPNAMELC}.desktop new/kdesdk-4.4.3/kapptemplate/templates/C++/kofficetext/kotext%{APPNAMELC}.desktop --- old/kdesdk-4.4.2/kapptemplate/templates/C++/kofficetext/kotext%{APPNAMELC}.desktop 2010-03-26 18:30:28.000000000 +0100 +++ new/kdesdk-4.4.3/kapptemplate/templates/C++/kofficetext/kotext%{APPNAMELC}.desktop 2010-04-29 21:59:02.000000000 +0200 @@ -10,6 +10,7 @@ Name[et]=%{APPNAME} plugin Name[fi]=%{APPNAME}-liitännäinen Name[fr]=Module externe %{APPNAME} +Name[ga]=Breiseán %{APPNAME} Name[gl]=Extensión para %{APPNAME} Name[hu]=%{APPNAME} plugin Name[it]=Estensione di %{APPNAME} @@ -17,6 +18,7 @@ Name[nb]=%{APPNAME}-programtillegg Name[nds]=%{APPNAME}-Moduul Name[nl]=%{APPNAME}-plugin +Name[nn]=%{APPNAME}-tillegg Name[pa]=%{APPNAME} ਪਲੱਗਇਨ Name[pt]='Plugin' do %{APPNAME} Name[pt_BR]=Plug-in do %{APPNAME} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kapptemplate/templates/C++/ktexteditor/ktexteditor.kdevtemplate new/kdesdk-4.4.3/kapptemplate/templates/C++/ktexteditor/ktexteditor.kdevtemplate --- old/kdesdk-4.4.2/kapptemplate/templates/C++/ktexteditor/ktexteditor.kdevtemplate 2010-03-26 18:30:27.000000000 +0100 +++ new/kdesdk-4.4.3/kapptemplate/templates/C++/ktexteditor/ktexteditor.kdevtemplate 2010-04-29 21:59:02.000000000 +0200 @@ -17,6 +17,7 @@ Name[nb]=KTextEditor mal for programtillegg Name[nds]=KTextEditor-Moduulvörlaag Name[nl]=KTextEditor plugin-sjabloon +Name[nn]=KTextEditor-mal for programtillegg Name[pa]=ਕੇਟੈਕਸਟਐਡੀਟਰ ਪਲੱਗਇਨ ਟੈਪਲੇਟ Name[pt]=Modelo de 'Plugin' do KTextEditor Name[pt_BR]=Modelo de 'Plugin' do KTextEditor @@ -45,6 +46,7 @@ Comment[nb]=En KTextEditor-mal for programtillegg som utfører spesielle handlinger på tekst i KWrite, Kate, KDevelop osv. (bruk ThisFormat som prosjektnavn). Comment[nds]=En KTextEditor-Moduulvörlaag mit de sik in KWrite, Kate, KDevelop usw. besünner Textakschonen utföhren laat. (Bruuk DitFormaat as Projektnaam.) Comment[nl]=Een plugin-sjabloon voor KTextEditor voor het doen van speciale tekstbewerkingen in KWrite, Kate, KDevelop etc. (gaarne DezeOpmaak gebruiken voor de projectnaam) +Comment[nn]=Programtillegg-mal for KTextEditor, for tekstoperasjonar i KWrite, Kate, KDevelop osv. (bruk DetteFormatet for namnet på prosjektet) Comment[pt]=Um modelo de 'plugin' do KTextEditor para efectuar operações especiais sobre o texto no KWrite, Kate, KDevelop, etc. (use por favor EsteFormato como nome do projecto) Comment[pt_BR]=Um modelo de 'plugin' do KTextEditor para efetuar operações especiais sobre o texto no KWrite, Kate, KDevelop, etc. (use por favor EsteFormato como nome do projeto) Comment[sr]=Шаблон прикључка за KTextEditor за извођење специјалних поступака у К‑писању, Кејт, К‑девелопу, итд. (име пројекта треба да буде OvogOblika) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kapptemplate/templates/C++/ktexteditor/ktexteditor_%{APPNAMELC}.desktop new/kdesdk-4.4.3/kapptemplate/templates/C++/ktexteditor/ktexteditor_%{APPNAMELC}.desktop --- old/kdesdk-4.4.2/kapptemplate/templates/C++/ktexteditor/ktexteditor_%{APPNAMELC}.desktop 2010-03-26 18:30:27.000000000 +0100 +++ new/kdesdk-4.4.3/kapptemplate/templates/C++/ktexteditor/ktexteditor_%{APPNAMELC}.desktop 2010-04-29 21:59:02.000000000 +0200 @@ -10,6 +10,7 @@ Comment[et]=%{APPNAME} Comment[fi]=%{APPNAME} Comment[fr]=%{APPNAME} +Comment[ga]=%{APPNAME} Comment[gl]=%{APPNAME} Comment[hu]=%{APPNAME} Comment[it]=%{APPNAME} @@ -17,6 +18,7 @@ Comment[nb]=%{APPNAME} Comment[nds]=%{APPNAME} Comment[nl]=%{APPNAME} +Comment[nn]=%{APPNAME} Comment[pa]=%{APPNAME} Comment[pt]=%{APPNAME} Comment[pt_BR]=%{APPNAME} @@ -80,6 +82,7 @@ GenericName[et]=%{APPNAME} GenericName[fi]=%{APPNAME} GenericName[fr]=%{APPNAME} +GenericName[ga]=%{APPNAME} GenericName[gl]=%{APPNAME} GenericName[hu]=%{APPNAME} GenericName[it]=%{APPNAME} @@ -87,6 +90,7 @@ GenericName[nb]=%{APPNAME} GenericName[nds]=%{APPNAME} GenericName[nl]=%{APPNAME} +GenericName[nn]=%{APPNAME} GenericName[pa]=%{APPNAME} GenericName[pt]=%{APPNAME} GenericName[pt_BR]=%{APPNAME} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kapptemplate/templates/C++/qmake_qt4guiapp/%{PROJECTDIRNAME}.kdev4 new/kdesdk-4.4.3/kapptemplate/templates/C++/qmake_qt4guiapp/%{PROJECTDIRNAME}.kdev4 --- old/kdesdk-4.4.2/kapptemplate/templates/C++/qmake_qt4guiapp/%{PROJECTDIRNAME}.kdev4 2008-05-21 10:33:33.000000000 +0200 +++ new/kdesdk-4.4.3/kapptemplate/templates/C++/qmake_qt4guiapp/%{PROJECTDIRNAME}.kdev4 2010-04-29 21:59:03.000000000 +0200 @@ -1,4 +1,4 @@ [Project] -Manager=KDevQMakeManager +Manager=KDevCustomMakeManager Name=%{APPNAME} VersionControl=%{VERSIONCONTROLPLUGIN} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kate/plugins/kttsd/kate_kttsd.desktop new/kdesdk-4.4.3/kate/plugins/kttsd/kate_kttsd.desktop --- old/kdesdk-4.4.2/kate/plugins/kttsd/kate_kttsd.desktop 2010-03-26 18:30:25.000000000 +0100 +++ new/kdesdk-4.4.3/kate/plugins/kttsd/kate_kttsd.desktop 2010-04-29 21:59:02.000000000 +0200 @@ -16,6 +16,7 @@ Name[et]=KTextEditori KTTSD plugin Name[fi]=KTextEditor-KTTSD-liitännäinen Name[fr]=Module KTTSD pour KTextEditor +Name[ga]=Breiseán KTTSD KTextEditor Name[gl]=Extensión de KTTSD para KTextEditor Name[hu]=KTextEditor KTTSD Plugin Name[it]=Estensione KTTSD di KTextEditor @@ -49,6 +50,7 @@ Comment[es]=Añade una entrada de menú para leer el texto Comment[et]=Lisab menüükirje teksti kõnelemiseks Comment[fr]=Ajoute une ligne de menu pour énoncer le texte +Comment[ga]=Cuir iontráil sa roghchlár chun an téacs a léamh Comment[gl]=Engade unha entrada no menú para falar o texto Comment[hu]=Egy bejegyzés hozzáadása a szöveg elbeszéléséhez Comment[it]=Aggiunge una voce del menu per pronunciare il testo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kate/plugins/mailfiles/katemailfilesplugin.desktop new/kdesdk-4.4.3/kate/plugins/mailfiles/katemailfilesplugin.desktop --- old/kdesdk-4.4.2/kate/plugins/mailfiles/katemailfilesplugin.desktop 2010-03-26 18:30:26.000000000 +0100 +++ new/kdesdk-4.4.3/kate/plugins/mailfiles/katemailfilesplugin.desktop 2010-04-29 21:59:02.000000000 +0200 @@ -56,6 +56,7 @@ Comment[et]=Failide saatmine e-postiga Comment[fi]=Lähetä tiedostoja sähköpostitse Comment[fr]=Envoie des fichiers par courrier électronique +Comment[ga]=Seol comhaid trí ríomhphost Comment[gl]=Envía os ficheiros por correo electrónico Comment[hu]=Fájlok küldése email-en keresztül Comment[it]=Invia file per posta elettronica diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kate/plugins/snippets_tng/editor/data/katesnippetstng_editor.desktop new/kdesdk-4.4.3/kate/plugins/snippets_tng/editor/data/katesnippetstng_editor.desktop --- old/kdesdk-4.4.2/kate/plugins/snippets_tng/editor/data/katesnippetstng_editor.desktop 2010-03-26 18:30:27.000000000 +0100 +++ new/kdesdk-4.4.3/kate/plugins/snippets_tng/editor/data/katesnippetstng_editor.desktop 2010-04-29 21:59:02.000000000 +0200 @@ -15,6 +15,7 @@ GenericName[nb]=TNG datafilredigering for Kate tekstbiter GenericName[nds]=Verbetert Editor för Kate-Snippels GenericName[nl]=Bewerker van Kate-tekstfragmenten TNG-gegevensbestand +GenericName[nn]=Rediger Kate-bitar i TNG-format GenericName[pt]=Editor de ficheiros de dados TNG dos excertos do Kate GenericName[pt_BR]=Editor de arquivos de dados TNG dos trechos de texto do Kate GenericName[ru]=Редактор файлов данных TNG фрагментов текста Kate @@ -44,6 +45,7 @@ Name[nb]=TNG datafilredigering for Kate tekstbiter Name[nds]=Verbetert Editor för Kate-Snippels Name[nl]=Bewerker van Kate-tekstfragmenten TNG-gegevensbestand +Name[nn]=Rediger Kate-bitar i TNG-format Name[pt]=Editor de ficheiros de dados TNG dos excertos do Kate Name[pt_BR]=Editor de arquivos de dados TNG dos trechos de texto do Kate Name[ru]=Редактор файлов данных TNG фрагментов текста Kate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kate/plugins/snippets_tng/katesnippets_tngplugin.desktop new/kdesdk-4.4.3/kate/plugins/snippets_tng/katesnippets_tngplugin.desktop --- old/kdesdk-4.4.2/kate/plugins/snippets_tng/katesnippets_tngplugin.desktop 2010-03-26 18:30:27.000000000 +0100 +++ new/kdesdk-4.4.3/kate/plugins/snippets_tng/katesnippets_tngplugin.desktop 2010-04-29 21:59:02.000000000 +0200 @@ -13,6 +13,7 @@ Name[et]=Kate jupid Name[fi]=Kate-palaset Name[fr]=Fragments de code pour Kate +Name[ga]=Blúirí Kate Name[gl]=Fragmentos para Kate Name[hu]=Kate szövegelemek Name[it]=Frammenti di Kate @@ -20,6 +21,7 @@ Name[nb]=Kate tekstbiter Name[nds]=Kate-Snippels Name[nl]=Kate-fragmenten +Name[nn]=Kate-tekstbitar Name[pa]=ਕੇਟ ਸਨਿੱਪਟ Name[pt]=Excertos do Kate Name[pt_BR]=Trechos do Kate @@ -49,6 +51,7 @@ Comment[nb]=Programtillegg for tekstbiter med støtte for kodefullføring Comment[nds]=Snippelsmoduul mit Ünnerstütten för Kodekompletteren Comment[nl]=Plugin voor fragmenten met ondersteuning voor code aanvullen +Comment[nn]=Tekstbit-tillegg med autofullføring av programkode Comment[pt]='Plugin' de excertos com suporte para a completação de código Comment[pt_BR]=Plugin de trechos de texto com suporte para o completamento de código Comment[ru]=Модуль фрагментов текста с поддержкой дополнения кода diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/kioslave/svn/svnhelper/subversion.desktop new/kdesdk-4.4.3/kioslave/svn/svnhelper/subversion.desktop --- old/kdesdk-4.4.2/kioslave/svn/svnhelper/subversion.desktop 2010-01-31 20:34:13.000000000 +0100 +++ new/kdesdk-4.4.3/kioslave/svn/svnhelper/subversion.desktop 2010-04-29 21:59:03.000000000 +0200 @@ -446,7 +446,7 @@ Comment[fa]=گذاشتن پوشه در مخزن موجود جهت قراردادن آن تحت کنترل بازبینی. Comment[fi]=Laita kansio versionhallintaan viemällä se olemassa olevaan versionhallintavarastoon. Comment[fr]=Introduit le dossier dans un référentiel existant pour le placer sous contrôle de versions. -Comment[ga]=Cuir fillteán isteach i stór at ann más mian leat a chuid athruithe a rialú. +Comment[ga]=Cuir fillteán isteach i stór atá ann más mian leat a chuid athruithe a rialú. Comment[gl]=Pon o cartafol nun repositorio existente para pólo baixo control de versións. Comment[hu]=Könyvtár felvétele a verziókövető rendszer felügyelete alá. Comment[is]=Setja möppu í geymslu sem finnst fyrir til að setja hana undir breytingarstjórn. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/lokalize/src/lokalize.desktop new/kdesdk-4.4.3/lokalize/src/lokalize.desktop --- old/kdesdk-4.4.2/lokalize/src/lokalize.desktop 2010-03-26 18:30:28.000000000 +0100 +++ new/kdesdk-4.4.3/lokalize/src/lokalize.desktop 2010-04-29 21:59:03.000000000 +0200 @@ -60,6 +60,7 @@ GenericName[et]=Tõlkemäluga tõlkimisrakendus GenericName[fi]=Tietokoneavusteinen käännösjärjestelmä GenericName[fr]=Système de traduction assistée par ordinateur +GenericName[ga]=Córas Aistriúcháin Ríomhchuidithe GenericName[gl]=Sistema de tradución asistida por ordenador GenericName[hu]=Számítógép támogatott fordítórendszer GenericName[it]=Sistema di traduzione assistito dal computer @@ -68,7 +69,7 @@ GenericName[nb]=Dataassistert oversettelsessystem GenericName[nds]=Reeknerünnerstütt Översettensysteem GenericName[nl]=Computerondersteund vertaalsysteem -GenericName[nn]=Dataassistert omsetjingssystem +GenericName[nn]=Dataassistert omsetjing GenericName[pa]=ਕੰਪਿਊਟਰ ਅਨੁਵਾਦ ਸਿਸਟਮ GenericName[pl]=System tłumaczeń wspomaganych komputerowo GenericName[pt]=Sistema de Traduções Auxiliado pelo Computador diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/lokalize/src/tm/jobs.cpp new/kdesdk-4.4.3/lokalize/src/tm/jobs.cpp --- old/kdesdk-4.4.2/lokalize/src/tm/jobs.cpp 2009-11-21 10:44:52.000000000 +0100 +++ new/kdesdk-4.4.3/lokalize/src/tm/jobs.cpp 2010-04-29 21:59:03.000000000 +0200 @@ -21,8 +21,6 @@ **************************************************************************** */ -#undef KDE_NO_DEBUG_OUTPUT - #include "jobs.h" #include "catalog.h" #include "project.h" @@ -50,6 +48,10 @@ #define TM_SEPARATOR '\b' #define TM_NOTAPPROVED 0x04 +#ifndef KDE_NO_DEBUG_OUTPUT +#define KDE_NO_DEBUG_OUTPUT +#endif + /** * splits string into words, removing any markup * @@ -132,7 +134,7 @@ static void addToIndex(qlonglong sourceId, QString sourceString, QRegExp& rxClean1, const QString& accel, QSqlDatabase& db) { - kDebug(TM_AREA)<<sourceString; + //kDebug(TM_AREA)<<sourceString; QStringList words; doSplit(sourceString,words,rxClean1,accel); @@ -440,7 +442,7 @@ else { sourceId=query1.value(0).toLongLong(); - kDebug(TM_AREA)<<"SOURCE ALREADY PRESENT"<<source.string<<sourceId; + //kDebug(TM_AREA)<<"SOURCE ALREADY PRESENT"<<source.string<<sourceId; } query1.clear(); //END get sourceId @@ -614,7 +616,7 @@ query1.bindValue(0, targetId); query1.bindValue(1, bits); bool ok=query1.exec(); - kDebug(TM_AREA)<<"ok?"<<ok; + //kDebug(TM_AREA)<<"ok?"<<ok; return ok; } @@ -633,12 +635,12 @@ query1.bindValue(0, sourceId); query1.bindValue(1, targetId); query1.bindValue(2, fileId); - query1.bindValue(3, ctxt); + query1.bindValue(3, ctxt.isEmpty()?QVariant():ctxt); query1.bindValue(4, bits); query1.bindValue(5, priorId!=-1?QVariant(priorId):QVariant()); bool ok=query1.exec(); mainId=query1.lastInsertId().toLongLong(); //TODO postgresql will suck here - kDebug(TM_AREA)<<"ok?"<<ok; + //kDebug(TM_AREA)<<"ok?"<<ok; return ok; } @@ -761,10 +763,7 @@ { if (useCache && tmConfigCache.contains(db.databaseName())) - { - kDebug()<<"using config cache for"<<db.databaseName(); return tmConfigCache.value(db.databaseName()); - } QSqlQuery query(db); query.exec("SELECT key, value FROM tm_config ORDER BY key ASC"); Project& p=*(Project::instance()); @@ -779,6 +778,7 @@ if (KDE_ISUNLIKELY( !f )) //tmConfigCache[db.databaseName()]=c; setConfig(db,c); + tmConfigCache.insert(db.databaseName(), c); return c; } @@ -913,12 +913,12 @@ , m_pos(pos) , m_dbName(dbName) { - kDebug(TM_AREA)<<m_source.string; + //kDebug(TM_AREA)<<m_source.string; } SelectJob::~SelectJob() { - kDebug(TM_AREA)<<m_source.string; + //kDebug(TM_AREA)<<m_source.string; } void SelectJob::aboutToBeDequeued(ThreadWeaver::WeaverInterface*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.4.2/lokalize/src/tm/tmview.cpp new/kdesdk-4.4.3/lokalize/src/tm/tmview.cpp --- old/kdesdk-4.4.2/lokalize/src/tm/tmview.cpp 2010-01-06 18:00:36.000000000 +0100 +++ new/kdesdk-4.4.3/lokalize/src/tm/tmview.cpp 2010-04-29 21:59:03.000000000 +0200 @@ -286,7 +286,7 @@ if (!m_catalog->isApproved(pos.entry)) { ///m_catalog->push(new DelTextCmd(m_catalog,pos,m_catalog->msgstr(pos))); - removeTargetSubstring(m_catalog, pos, 0, m_catalog->sourceWithTags(pos).string.size()); + removeTargetSubstring(m_catalog, pos, 0, m_catalog->targetWithTags(pos).string.size()); if ( ctxtMatches || !(m_markAsFuzzy||forceFuzzy) ) SetStateCmd::push(m_catalog,pos,true); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0