~ubuntu-branches/debian/jessie/sane-backends/jessie

« back to all changes in this revision

Viewing changes to debian/patches/trim-libraries-in-sane-backends.pc.in.patch

  • Committer: Package Import Robot
  • Author(s): Markus Koschany
  • Date: 2013-07-04 17:41:47 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20130704174147-tl5tzd8bwvmctka2
Tags: 1.0.23-1
* QA upload.
* New upstream release.
* This package has been orphaned. Set maintainer to the Debian QA Group.
* Bump compat level to 9 (was 5) and require debhelper >= 9.
* debian/control:
  - sane-utils: Inherit Section: graphics from source package sane-backends.
  - Remove versioned dependencies. They are trivially satisfied.
* Drop the following patches. They are merged upstream now.
  - fix_v4l_build.patch
  - hurd_path_max_fix.patch
  - sane_desc_udev+acl.patch
  - scanimage_man_batch_start.patch
  - udev_usb_suspend.patch
  - xerox_mfp_add_scx_4623fw.patch
  - xerox_mfp_fix_usb_device.patch
* Drop disable_rpath.patch because the RPATH is already removed by chrpath
  in debian/rules.
* Rebase and refresh all other patches against the new upstream relase.
* debian/rules:
  - Simplify debian/rules by using dh sequencer.
  - Build with --parallel and with autotools_dev.
  - Enable all hardening build flags.
  - Install umax_pp with sane-utils.install.
* Build-Depend on libtiff5-dev. Thanks to Michael Terry for the patch.
  (Closes: #681079)
* Build-Depend on libusb-1.0-0-dev and enable libusb1.0 support in
  debian/rules. Thanks to Martin Pitt for the report and Whoopie for the
  patch. (Closes: #687137)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
From: Markus Koschany <apo@gambaru.de>
 
2
Date: Sun, 30 Jun 2013 19:13:54 +0200
 
3
Subject: trim libraries in sane-backends.pc.in
 
4
 
 
5
Update the original sane-config_and_pkg-config_fixes.patch from Julien BLACHE.
 
6
Patching RPATH related flags is no longer necessary. Still trim the libraries
 
7
in sane-backends.pc.in to the bare minimum for what is needed for libsane.
 
8
---
 
9
 tools/sane-backends.pc.in | 4 ++--
 
10
 1 file changed, 2 insertions(+), 2 deletions(-)
 
11
 
 
12
diff --git a/tools/sane-backends.pc.in b/tools/sane-backends.pc.in
 
13
index b4d9731..6124747 100644
 
14
--- a/tools/sane-backends.pc.in
 
15
+++ b/tools/sane-backends.pc.in
 
16
@@ -2,8 +2,8 @@ prefix=@prefix@
 
17
 exec_prefix=@exec_prefix@
 
18
 libdir=@libdir@
 
19
 includedir=@includedir@
 
20
-ldflags=@LDFLAGS@ @GPHOTO2_LDFLAGS@
 
21
-libs=@LIBS@ @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @AVAHI_LIBS@ @USB_LIBS@ @SCSI_LIBS@ @RESMGR_LIBS@
 
22
+ldflags=@LDFLAGS@
 
23
+libs=@LIBS@
 
24
 
 
25
 Name: SANE Backends
 
26
 Description: Backends for SANE, the universal scanner interface