Hello community, here is the log from the commit of package kdesdk4 for openSUSE:Factory checked in at Wed Jun 8 17:29:37 CEST 2011.
-------- --- KDE/kdesdk4/kdesdk4.changes 2011-04-28 16:16:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdesdk4/kdesdk4.changes 2011-06-03 15:38:27.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jun 3 15:38:26 CEST 2011 - dmuel...@suse.de + +- update to 4.6.4 + * Bugfixes over KDE 4.6.3 + * see http://kde.org/announcements/changelogs/changelog4_6_3to4_6_4.php for details + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdesdk-4.6.3.tar.bz2 New: ---- kdesdk-4.6.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4.spec ++++++ --- /var/tmp/diff_new_pack.cvyTf7/_old 2011-06-08 17:27:37.000000000 +0200 +++ /var/tmp/diff_new_pack.cvyTf7/_new 2011-06-08 17:27:37.000000000 +0200 @@ -27,7 +27,7 @@ Group: System/GUI/KDE Summary: KDE SDK Package Url: http://www.kde.org/ -Version: 4.6.3 +Version: 4.6.4 Release: 1 BuildRequires: db-devel flex kdebase4-workspace-devel >= %version libkonq-devel strigi BuildRequires: hunspell-devel libkdepimlibs4-devel libqca2-devel oxygen-icon-theme subversion-devel ++++++ kdesdk-4.6.3.tar.bz2 -> kdesdk-4.6.4.tar.bz2 ++++++ Files old/kdesdk-4.6.3/doc/cervisia/index.cache.bz2 and new/kdesdk-4.6.4/doc/cervisia/index.cache.bz2 differ Files old/kdesdk-4.6.3/doc/kapptemplate/index.cache.bz2 and new/kdesdk-4.6.4/doc/kapptemplate/index.cache.bz2 differ Files old/kdesdk-4.6.3/doc/kate/index.cache.bz2 and new/kdesdk-4.6.4/doc/kate/index.cache.bz2 differ Files old/kdesdk-4.6.3/doc/kcachegrind/index.cache.bz2 and new/kdesdk-4.6.4/doc/kcachegrind/index.cache.bz2 differ Files old/kdesdk-4.6.3/doc/kompare/index.cache.bz2 and new/kdesdk-4.6.4/doc/kompare/index.cache.bz2 differ Files old/kdesdk-4.6.3/doc/lokalize/index.cache.bz2 and new/kdesdk-4.6.4/doc/lokalize/index.cache.bz2 differ Files old/kdesdk-4.6.3/doc/okteta/index.cache.bz2 and new/kdesdk-4.6.4/doc/okteta/index.cache.bz2 differ Files old/kdesdk-4.6.3/doc/scripts/kdesrc-build/index.cache.bz2 and new/kdesdk-4.6.4/doc/scripts/kdesrc-build/index.cache.bz2 differ Files old/kdesdk-4.6.3/doc/umbrello/index.cache.bz2 and new/kdesdk-4.6.4/doc/umbrello/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.6.3/okteta/program/about.cpp new/kdesdk-4.6.4/okteta/program/about.cpp --- old/kdesdk-4.6.3/okteta/program/about.cpp 2011-04-01 12:59:58.000000000 +0200 +++ new/kdesdk-4.6.4/okteta/program/about.cpp 2011-06-02 12:04:31.000000000 +0200 @@ -28,7 +28,7 @@ // Program static const char ProgramId[] = "okteta"; -static const char ProgramVersion[] = "0.6.2"; +static const char ProgramVersion[] = "0.6.4"; static const char ProgramHomepage[] = "http://utils.kde.org/projects/okteta";; // Author static const char FWHKEmailAddress[] = "kosse...@kde.org"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.6.3/scripts/extractrc new/kdesdk-4.6.4/scripts/extractrc --- old/kdesdk-4.6.3/scripts/extractrc 2011-02-25 22:47:43.000000000 +0100 +++ new/kdesdk-4.6.4/scripts/extractrc 2011-06-02 19:35:24.000000000 +0200 @@ -132,8 +132,9 @@ my $ectx_known_exts = join "|", keys %{&ECTX_SPEC}; ########################################################################################### -# Escape characters in string exactly like uic does. -sub escape_like_uic ($) { + +# Unescape basic XML entities. +sub unescape_xml ($) { my $text = shift; $text =~ s/</</g; @@ -141,6 +142,15 @@ $text =~ s/&/&/g; $text =~ s/"/"/g; + return $text; +} + +# Convert uic to C escaping. +sub escape_uic_to_c ($) { + my $text = shift; + + $text = unescape_xml($text); + $text =~ s/\\/\\\\/g; # escape \ $text =~ s/\"/\\\"/g; # escape " $text =~ s/\r//g; # remove CR (Carriage Return) @@ -157,9 +167,9 @@ print qq|$cstart $cmnt\n|; } if (defined $text) { - $text = escape_like_uic($text); + $text = escape_uic_to_c($text); if (defined $ctxt) { - $ctxt = escape_like_uic($ctxt); + $ctxt = escape_uic_to_c($ctxt); print qq|i18nc("$ctxt", "$text")$stend\n|; } else { print qq|i18n("$text")$stend\n|; @@ -275,12 +285,14 @@ if ( ($tag, $attr) = $string =~ /<$text_string/o ) { - my ($attr_comment) = $attr =~ /\w*comment=\"([^\"]*)\"/ if $attr; + my ($attr_comment) = $attr =~ /\bcomment=\"([^\"]*)\"/ if $attr; $context = $attr_comment if $attr_comment; - my ($attr_context) = $attr =~ /\w*context=\"([^\"]*)\"/ if $attr; + my ($attr_context) = $attr =~ /\bcontext=\"([^\"]*)\"/ if $attr; $context = $attr_context if $attr_context; # It is unlikely that both attributes 'context' and 'comment' # will be present, but if so happens, 'context' has priority. + my ($attr_extracomment) = $attr =~ /\bextracomment=\"([^\"]*)\"/ if $attr; + push @comments, "i18n: $attr_extracomment" if $attr_extracomment; my ($attr_notr) = $attr =~ /\bnotr=\"([^\"]*)\"/ if $attr; $notr = $attr_notr if $attr_notr; @@ -294,6 +306,7 @@ } else { + @comments = (); $string = ""; } } @@ -424,6 +437,7 @@ if ($mline =~ /i18n/) { $dummy_call->(undef, undef, ("i18n: file: $norm_fname:$mlno")); } + $mline = unescape_xml($mline); print "$mline\n"; ++$mlno; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
