Hello community, here is the log from the commit of package kdiff3 checked in at Mon Nov 17 17:08:58 CET 2008. -------- --- KDE/kdiff3/kdiff3.changes 2007-06-13 23:36:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdiff3/kdiff3.changes 2008-11-17 10:06:20.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 17 09:58:09 CET 2008 - stbinner@suse.de + +- install translations for kdiff3 menu plugin (bnc#442527) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- kdiff3plugin-po.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ --- /var/tmp/diff_new_pack.D28249/_old 2008-11-17 17:08:25.000000000 +0100 +++ /var/tmp/diff_new_pack.D28249/_new 2008-11-17 17:08:25.000000000 +0100 @@ -1,15 +1,23 @@ # # spec file for package kdiff3 (Version 0.9.92) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: kdiff3 BuildRequires: kdebase3-devel %if %suse_version < 1010 @@ -18,15 +26,16 @@ %if %suse_version > 1020 BuildRequires: fdupes %endif -License: GNU General Public License (GPL) -URL: http://kdiff3.sourceforge.net/ +License: GPL v2 or later +Url: http://kdiff3.sourceforge.net/ Group: Development/Tools/Version Control Summary: Feature-Rich Code Comparison Utility Version: 0.9.92 -Release: 33 +Release: 236 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.gz Patch0: %name.diff +Patch1: kdiff3plugin-po.diff %description KDiff3 is a program that: @@ -51,6 +60,7 @@ %prep %setup -q %patch0 -p0 +%patch1 . /etc/opt/kde3/common_options update_admin @@ -65,9 +75,9 @@ rm -rf $RPM_BUILD_ROOT/usr rm -rf $RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/kdiff3/README %suse_update_desktop_file %name Development RevisionControl -%find_lang %name +%find_lang %name %name.lang +%find_lang kdiff3_plugin %name.lang %if %suse_version > 1020 - %fdupes -s $RPM_BUILD_ROOT %endif @@ -84,9 +94,11 @@ /opt/kde3/share/services/kdiff3_plugin.desktop %changelog -* Wed Jun 13 2007 - stbinner@suse.de +* Mon Nov 17 2008 stbinner@suse.de +- install translations for kdiff3 menu plugin (bnc#442527) +* Wed Jun 13 2007 stbinner@suse.de - running fdupes makes kdiff3.rpm 348KB smaller -* Sun Apr 15 2007 - stbinner@suse.de +* Sun Apr 15 2007 stbinner@suse.de - update to version 0.9.92: * KDE-Konqueror plugin: Launch KDiff3 from Konqueror. * Temp file names use process id in file name for several instances. @@ -96,7 +108,7 @@ * New option for history merge: Max number of history entries * New option "Auto save and quit on merge without conflicts" * Several Bugfixes -* Sun Nov 05 2006 - stbinner@suse.de +* Sun Nov 05 2006 stbinner@suse.de - update to version 0.9.91: * Unicode autodetection based on byte-order-mark. * Fix for crash after double click below last line @@ -107,23 +119,23 @@ * Drawing in directory view fixed. * When specifying a separate output dir then for equal files a copy operation will also be offered. -* Wed May 24 2006 - adrian@suse.de +* Wed May 24 2006 adrian@suse.de - fix build for < 10.1 -* Tue May 16 2006 - stbinner@suse.de +* Tue May 16 2006 stbinner@suse.de - update to version 0.9.90 * Fixed KIO-problems of type "File exists" with tempfiles. * Fix for manual alignment with 3 files which caused crash. * Preserve executable bit when overwriting an existing file. * Documentation and translations updated. -* Mon Apr 10 2006 - stbinner@suse.de +* Mon Apr 10 2006 stbinner@suse.de - update to version 0.9.89 -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Tue Oct 25 2005 - stbinner@suse.de +* Tue Oct 25 2005 stbinner@suse.de - update to version 0.9.88 (unicode support) -* Thu Feb 17 2005 - adrian@suse.de +* Thu Feb 17 2005 adrian@suse.de - menu entry moved to xdg dir -* Sat Sep 04 2004 - coolo@suse.de +* Sat Sep 04 2004 coolo@suse.de - fixing Makefile problems -* Sat Aug 28 2004 - adrian@suse.de +* Sat Aug 28 2004 adrian@suse.de - initial package of version 0.9.86 ++++++ kdiff3plugin-po.diff ++++++ --- kdiff3plugin/Makefile.am 2008/11/17 08:56:49 1.1 +++ kdiff3plugin/Makefile.am 2008/11/17 08:57:11 @@ -18,3 +18,5 @@ messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/kdiff3_plugin.pot + +SUBDIRS = po ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org