From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Patterson Subject: bug#25101: [PATCH 2/3] gnu: Add and use sane-backends-minimal. Date: Wed, 14 Dec 2016 00:03:24 -0500 Message-ID: <20161214050325.6348-3-ajpatter@uwaterloo.ca> References: <87zik0wz24.fsf@gnu.org> <20161214050325.6348-1-ajpatter@uwaterloo.ca> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cH1kZ-0007ZJ-5i for bug-guix@gnu.org; Wed, 14 Dec 2016 00:05:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cH1kU-0000Ba-P9 for bug-guix@gnu.org; Wed, 14 Dec 2016 00:05:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:54149) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cH1kU-0000BV-Md for bug-guix@gnu.org; Wed, 14 Dec 2016 00:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cH1kU-0004Z8-Es for bug-guix@gnu.org; Wed, 14 Dec 2016 00:05:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20161214050325.6348-1-ajpatter@uwaterloo.ca> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 25101@debbugs.gnu.org * gnu/packages/scanner.scm (sane-backends): Rename to... (sane-backends-minimal): this. Adjust name, source, synopsis and description accordingly. * gnu/packages/cups.scm (hplip): Use 'sane-backends-minimal' instead of 'sane-backends'. * gnu/packages/gnome.scm (colord, simple-scan): Likewise. * gnu/packages/libreoffice.scm (libreoffice): Likewise. * gnu/packages/wine.scm (wine): Likewise. --- gnu/packages/cups.scm | 2 +- gnu/packages/gnome.scm | 4 ++-- gnu/packages/libreoffice.scm | 2 +- gnu/packages/scanner.scm | 11 ++++++----- gnu/packages/wine.scm | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 0a8a10ecb..baa77f7aa 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -416,7 +416,7 @@ device-specific programs to convert and print many types of files.") (inputs `(("libjpeg" ,libjpeg) ("cups-minimal" ,cups-minimal) ("libusb" ,libusb) - ("sane-backends" ,sane-backends) + ("sane-backends" ,sane-backends-minimal) ("dbus" ,dbus) ("python-wrapper" ,python-wrapper) ("python" ,python) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1762381cf..7ffe0bc2d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2433,7 +2433,7 @@ keyboard shortcuts.") ("libusb" ,libusb) ("sqlite" ,sqlite) ("polkit" ,polkit) - ("sane-backends" ,sane-backends))) + ("sane-backends" ,sane-backends-minimal))) (home-page "http://www.freedesktop.org/software/colord/") (synopsis "Color management service") (description "Colord is a system service that makes it easy to manage, @@ -3571,7 +3571,7 @@ USB transfers with your high-level application or system daemon.") ("cairo" ,cairo) ("gdk-pixbuf" ,gdk-pixbuf) ("gusb" ,gusb) - ("libsane" ,sane-backends))) + ("libsane" ,sane-backends-minimal))) (native-inputs `(("gettext" ,gettext-minimal) ("itstool" ,itstool) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 279e8e2d2..307a54496 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -784,7 +784,7 @@ and to return information on pronunciations, meanings and synonyms.") ("postgresql" ,postgresql) ("python" ,python) ("redland" ,redland) - ("sane-backends" ,sane-backends) + ("sane-backends" ,sane-backends-minimal) ("unixodbc" ,unixodbc) ("unzip" ,unzip) ("vigra" ,vigra) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 01db5ee21..e913858f5 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -26,15 +26,15 @@ #:use-module ((guix licenses) #:prefix licence:)) -(define-public sane-backends +(define-public sane-backends-minimal (package - (name "sane-backends") + (name "sane-backends-minimal") (version "1.0.25") (source (origin (method url-fetch) (uri (string-append "https://alioth.debian.org/frs/download.php/file/4146/" - name "-" version ".tar.gz")) + "sane-backends-" version ".tar.gz")) (sha256 (base32 "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4")))) @@ -71,9 +71,10 @@ ;; **** File generated for html-backends-split mode is different from reference ;; Makefile:501: recipe for target 'check.local' failed (home-page "http://www.sane-project.org") - (synopsis "Raster image scanner library and drivers") + (synopsis + "Raster image scanner library and drivers, without scanner support") (description "SANE stands for \"Scanner Access Now Easy\" and is an API proving access to any raster image scanner hardware (flatbed scanner, hand-held scanner, video- and still-cameras, frame-grabbers, etc.). The -package contains the library and drivers.") +package contains the library, but no drivers.") (license licence:gpl2+))) ; plus linking exception diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 367f27af5..83b6297f0 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -83,7 +83,7 @@ ("libmpg123" ,mpg123) ("libldap" ,openldap) ("libnetapi" ,samba) - ("libsane" ,sane-backends) + ("libsane" ,sane-backends-minimal) ("libpng" ,libpng) ("libjpeg" ,libjpeg) ("libtiff" ,libtiff) -- 2.11.0