~ubuntu-branches/ubuntu/trusty/sane-backends/trusty

« back to all changes in this revision

Viewing changes to debian/patches-exp/libsane_deps.patch

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona, Artur Rona, Martin Pitt
  • Date: 2011-03-07 15:01:07 UTC
  • mfrom: (2.3.20 sid)
  • Revision ID: james.westby@ubuntu.com-20110307150107-h2cmuy76cxroatv0
Tags: 1.0.22-1ubuntu1
[ Artur Rona ]
* Merge from debian unstable.  Remaining changes: (LP: #729283)
  - debian/control:
    + Demote libsane-extras* from Recommends to Suggests, as long as
      this package is in universe.
    + Demote sane-utils from Recommends to Suggests.
      We do not want to have an init script for saned laying around,
      which is disabled by default anyway.
  - debian/libsane.postinst: Don't create a scanner group.
  - debian/libsane.preinst:
    + Remove the old file if unmodified.
    + Remove the old blacklist-scanner modprobe file.
  - debian/patches/disable_v4l.patch: Disable v4l backend.
  - debian/rules:
    - Link using -Bsymbolic-functions (startup time optimization).
    - Saned init script does not need to be started before gdm
      and does not need to be called on shutdown.
  - debian/sane-utils.*: No longer have scanner group.
  - debian/sane-utils.saned.init: Saned init script does not need to
    be started before gdm and does not need to be called on shutdown.

[ Martin Pitt ]
* Drop ubuntu_udev_noperm.patch. It's superseded by Debian's
  sane-desc_udev+acl.patch. This also brings back the accidentally dropped
  SCSI scanner rules. (LP: #727696)
* debian/rules: Drop "acl" dependency. Current udev releases already
  evaluate the "libsane_matched" property, so we don't need the sane rules
  to do that again. Also drop the alternative "makedev" dependency; we
  only support udev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Description: Reduce libsane.so dependencies to the bare minimum
 
2
 Trim dependencies to keep only what's really required by libsane.so
 
3
 (aka dll backend).
 
4
Author: Julien BLACHE <jblache@debian.org>
 
5
 
 
6
Index: sane-backends-1.0.22~git1.0.21-157-g126c70d/backend/Makefile.in
 
7
===================================================================
 
8
--- sane-backends-1.0.22~git1.0.21-157-g126c70d.orig/backend/Makefile.in        2010-07-15 18:22:34.000000000 +0200
 
9
+++ sane-backends-1.0.22~git1.0.21-157-g126c70d/backend/Makefile.in     2010-07-21 18:28:27.540207358 +0200
 
10
@@ -2381,10 +2381,10 @@
 
11
 nodist_libsane_la_SOURCES = dll-s.c
 
12
 libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
 
13
 libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
 
14
-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
 
15
+libsane_la_LIBADD = $(COMMON_LIBS) libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo ../sanei/sanei_constrain_value.lo $(DL_LIBS)
 
16
 
 
17
 # WARNING: Automake is getting this wrong so have to do it ourselves.
 
18
-libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SANEI_SANEI_JPEG_LO@
 
19
+libsane_la_DEPENDENCIES = libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo
 
20
 all: $(BUILT_SOURCES)
 
21
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
22