diff --git a/sane-backends.changes b/sane-backends.changes index 7b6b564..cf017f4 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 23 09:24:52 UTC 2012 - cfarrell@suse.com + +- license update: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and + SUSE-Public-Domain + The LICENSE file in the sane-backends packages explains the licensing of + the package. Added SUSE-GPL-2.0+-with-sane-exception to the spreadsheet + linked from license.opensuse.org as that license is not yet upstream at + http://www.spdx.org/licenses (hence the SUSE- proprietary extension) + ------------------------------------------------------------------- Fri Apr 20 12:24:49 CEST 2012 - jsmeix@suse.de diff --git a/sane-backends.spec b/sane-backends.spec index 40285a4..b4264af 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: sane-backends BuildRequires: libgphoto2-devel %if 0%{?suse_version} > 1130 @@ -36,7 +35,7 @@ BuildRequires: pkg-config BuildRequires: texlive-latex #!BuildIgnore: ghostscript-x11 Summary: SANE (Scanner Access Now Easy) Scanner Drivers -License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain +License: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and SUSE-Public-Domain Group: Hardware/Scanner Version: 1.0.22 Release: 0 @@ -186,22 +185,22 @@ Obsoletes: sane < %{version} # skip-check-libtool-deps %description -The software consists of SANE scanner drivers, "scanimage," and the -"saned" daemon. +The software consists of SANE scanner drivers, +"scanimage," and the "saned" daemon. -A SANE scanner driver is used via a SANE front-end. This package -contains the command line front-end "scanimage". There are various -graphical front-ends like "xscanimage" (package sane-frontends), XSane -(package xsane), and the KDE front-end Kooka (package -kdegraphics3-scan). +A SANE scanner driver is used via a SANE front-end. +This package contains the command line front-end "scanimage". +There are graphical front-ends in other packages like +XSane (package xsane), Skanlite for KDE4 (package skanlite), +and Kooka for KDE3 (package kdegraphics3-scan). -The "saned" daemon provides the service "sane-port" to access scanners -that are connected to a server via network from client hosts that run -the "net" meta driver. +The "saned" daemon provides the service "sane-port" +to access scanners that are connected to a server +via network from client hosts that run the "net" meta driver. %package devel Summary: Development files for sane-backends -License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain +License: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and SUSE-Public-Domain Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: net-snmp-devel