Hello community, here is the log from the commit of package libksane for openSUSE:Factory checked in at 2011-12-08 12:12:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksane (Old) and /work/SRC/openSUSE:Factory/.libksane.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libksane", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libksane/libksane.changes 2011-11-16 17:19:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libksane.new/libksane.changes 2011-12-08 12:12:51.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Dec 7 11:32:15 UTC 2011 - coolo@suse.com + +- fix license to be in spdx.org format + +------------------------------------------------------------------- +Fri Dec 2 02:01:31 CET 2011 - dmueller@suse.de + +- update to 4.7.4 + * see http://kde.org/announcements/changelogs/changelog4_7_3to4_7_4.php for details + +------------------------------------------------------------------- Old: ---- libksane-4.7.3.tar.bz2 New: ---- libksane-4.7.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksane.spec ++++++ --- /var/tmp/diff_new_pack.HAMNRM/_old 2011-12-08 12:12:58.000000000 +0100 +++ /var/tmp/diff_new_pack.HAMNRM/_new 2011-12-08 12:12:58.000000000 +0100 @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: libksane BuildRequires: chmlib-devel BuildRequires: fribidi-devel @@ -37,12 +35,12 @@ %else BuildRequires: sane-backends %endif -License: GPLv2+ -Group: Development/Libraries/KDE Summary: KDE Image Plugin Interface +License: GPL-2.0+ +Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 4.7.3 -Release: 1 +Version: 4.7.4 +Release: 0 Source0: %{name}-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -67,9 +65,8 @@ rm -rf $RPM_BUILD_ROOT %package -n libksane0 -License: GPLv2+ -Group: Productivity/Graphics/Other Summary: KDE scan library +Group: Productivity/Graphics/Other Provides: libksane0-devel = 3.95.1 Obsoletes: libksane0-devel < 3.95.1 @@ -87,9 +84,8 @@ %_kde4_libdir/libksane.so.* %package devel -License: GPLv2+ -Group: Development/Libraries/KDE Summary: KDE scan library - Development Files +Group: Development/Libraries/KDE Requires: libksane0 = %version Requires: libkde4-devel %if 0%{?suse_version} > 1130 ++++++ libksane-4.7.3.tar.bz2 -> libksane-4.7.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.7.3/libksane/options/ksane_opt_button.cpp new/libksane-4.7.4/libksane/options/ksane_opt_button.cpp --- old/libksane-4.7.3/libksane/options/ksane_opt_button.cpp 2011-05-20 22:36:12.000000000 +0200 +++ new/libksane-4.7.4/libksane/options/ksane_opt_button.cpp 2011-12-02 00:26:29.000000000 +0100 @@ -48,7 +48,11 @@ readOption(); - if (!m_optDesc) return; + if (!m_optDesc) { + kDebug() << "This is a bug"; + m_widget = new KSaneOptionWidget(parent, ""); + return; + } m_widget = m_button = new KSaneButton(parent, i18n(m_optDesc->title)); m_widget->setToolTip(i18n(m_optDesc->desc)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.7.3/libksane/options/ksane_opt_checkbox.cpp new/libksane-4.7.4/libksane/options/ksane_opt_checkbox.cpp --- old/libksane-4.7.3/libksane/options/ksane_opt_checkbox.cpp 2011-07-19 23:34:54.000000000 +0200 +++ new/libksane-4.7.4/libksane/options/ksane_opt_checkbox.cpp 2011-12-02 00:26:29.000000000 +0100 @@ -51,7 +51,11 @@ readOption(); - if (!m_optDesc) return; + if (!m_optDesc) { + kDebug() << "This is a bug"; + m_widget = new KSaneOptionWidget(parent, ""); + return; + } m_widget = m_checkbox = new LabeledCheckbox(parent, i18n(m_optDesc->title)); m_widget->setToolTip(i18n(m_optDesc->desc)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.7.3/libksane/options/ksane_opt_entry.cpp new/libksane-4.7.4/libksane/options/ksane_opt_entry.cpp --- old/libksane-4.7.3/libksane/options/ksane_opt_entry.cpp 2011-05-20 22:36:12.000000000 +0200 +++ new/libksane-4.7.4/libksane/options/ksane_opt_entry.cpp 2011-12-02 00:26:29.000000000 +0100 @@ -51,7 +51,11 @@ readOption(); - if (!m_optDesc) return; + if (!m_optDesc) { + kDebug() << "This is a bug"; + m_widget = new KSaneOptionWidget(parent, ""); + return; + } m_widget = m_entry = new LabeledEntry(parent, i18n(m_optDesc->title)); m_widget->setToolTip(i18n(m_optDesc->desc)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.7.3/libksane/options/ksane_opt_gamma.cpp new/libksane-4.7.4/libksane/options/ksane_opt_gamma.cpp --- old/libksane-4.7.3/libksane/options/ksane_opt_gamma.cpp 2011-05-20 22:36:12.000000000 +0200 +++ new/libksane-4.7.4/libksane/options/ksane_opt_gamma.cpp 2011-12-02 00:26:29.000000000 +0100 @@ -51,7 +51,11 @@ readOption(); - if (!m_optDesc) return; + if (!m_optDesc) { + kDebug() << "This is a bug"; + m_widget = new KSaneOptionWidget(parent, ""); + return; + } m_widget = m_gamma = new LabeledGamma(parent, i18n(m_optDesc->title), m_optDesc->size/sizeof(SANE_Word)); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org