← Back to branch summary

~ubuntu-branches/ubuntu/saucy/sane-backends/saucy

« back to all changes in this revision

Viewing changes to debian/patches/sane-config_and_pkg-config_fixes.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2011-02-14 14:28:56 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110214142856-6gxjetg88q9zctid
Tags: 1.0.22-0ubuntu1
* New upstream release
* debian/control:
  - Use standards version 3.9.1
* debian/patches/allow_dll.d_symlinks.patch:
* debian/patches/fix_epson2_cancel.patch:
* debian/patches/fix_epson2_commands.patch:
* debian/patches/fix_xerox_mfp_color_mode.patch:
* debian/patches/genesys_disable_raw_data_log.patch:
* debian/patches/no_translations.patch:
* debian/patches/saned_exit_avahi_process.patch:
* debian/patches/scsi_perfection_2450.patch:
* debian/patches/scsi_scanjet_4c.patch:
* debian/patches/xerox_mfp_new_ids.patch:
  - Applied upstream
* debian/watch:
  - Dropped, the URL is not consistent between releases

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/sane-config_and_pkg-config_fixes.patch
4
4
 backend).
5
5
Author: Julien BLACHE <jblache@debian.org>
6
6
 
7
 
Index: sane-backends-1.0.21/tools/sane-backends.pc.in
 
7
Index: sane-backends-1.0.22~git1.0.21-157-g126c70d/tools/sane-backends.pc.in
8
8
===================================================================
9
 
--- sane-backends-1.0.21.orig/tools/sane-backends.pc.in 2010-04-14 02:52:59.000000000 +0200
10
 
+++ sane-backends-1.0.21/tools/sane-backends.pc.in      2010-04-26 21:10:42.404653655 +0200
11
 
@@ -2,13 +2,13 @@
 
9
--- sane-backends-1.0.22~git1.0.21-157-g126c70d.orig/tools/sane-backends.pc.in  2010-07-15 18:22:34.000000000 +0200
 
10
+++ sane-backends-1.0.22~git1.0.21-157-g126c70d/tools/sane-backends.pc.in       2010-07-21 18:31:32.261207177 +0200
 
11
@@ -2,8 +2,8 @@
12
12
 exec_prefix=@exec_prefix@
13
13
 libdir=@libdir@
14
14
 includedir=@includedir@
19
19
 
20
20
 Name: SANE Backends
21
21
 Description: Backends for SANE, the universal scanner interface
22
 
 Version: @VERSION@
23
 
 Requires:
24
 
-Libs: -L$(libdir) -lsane
25
 
-Libs.private: $(ldflags) $(libs)
26
 
-Cflags: -I$(includedir)
27
 
+Libs: -L${libdir} -lsane
28
 
+Libs.private: ${ldflags} $(libs)
29
 
+Cflags: -I${includedir}
30
 
Index: sane-backends-1.0.21/tools/sane-config.in
 
22
Index: sane-backends-1.0.22~git1.0.21-157-g126c70d/tools/sane-config.in
31
23
===================================================================
32
 
--- sane-backends-1.0.21.orig/tools/sane-config.in      2010-04-26 02:52:48.000000000 +0200
33
 
+++ sane-backends-1.0.21/tools/sane-config.in   2010-04-26 21:08:36.000000000 +0200
 
24
--- sane-backends-1.0.22~git1.0.21-157-g126c70d.orig/tools/sane-config.in       2010-07-15 18:22:34.000000000 +0200
 
25
+++ sane-backends-1.0.22~git1.0.21-157-g126c70d/tools/sane-config.in    2010-07-21 18:31:32.262206993 +0200
34
26
@@ -7,13 +7,13 @@
35
27
 PACKAGE="@PACKAGE@"
36
28
 scriptname="sane-config"