← Back to branch summary

~ubuntu-branches/ubuntu/vivid/sane-backends/vivid

« back to all changes in this revision

Viewing changes to sanei/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Julien BLACHE
  • Date: 2011-02-16 19:00:55 UTC
  • mfrom: (1.2.2 upstream) (21.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110216190055-wz0c33eracchkxts
Tags: 1.0.22-1
http://bugs.debian.org/581181
http://bugs.debian.org/591767
http://bugs.debian.org/612815
* New upstream release.
  + epson2: reject scan area settings that would lead to a division by zero
    (closes: #581181).

* debian/control:
  + Bump Standards-Version to 3.9.1 (no changes).
  + Demote libsane-extras-* to Recommends again.
* debian/rules:
  + Add acl (>= 2.2.49-4) to udev substvar for ACL utilities in /bin.
  + Use sane-desc -m udev+acl (closes: #591767, #612815).
* debian/libsane.README.Debian:
  + Update; mention ConsoleKit and the udev rules now using ACLs.

* debian/patches/sane-desc_udev+acl.patch:
  + Added; compared to experimental, setfacl is now in /bin.
* debian/patches/fix_xerox_mfp_color_mode.patch,
  debian/patches/use_libsane_matched_for_scsi.patch,
  debian/patches/allow_dll.d_symlinks.patch,
  debian/patches/saned_exit_avahi_process.patch,
  debian/patches/xerox_mfp_new_ids.patch,
  debian/patches/scsi_perfection_2450.patch,
  debian/patches/scsi_scanjet_4c.patch,
  debian/patches/genesys_disable_raw_data_log.patch,
  debian/patches/fix_epson2_commands.patch,
  debian/patches/fix_epson2_cancel.patch:
  + Removed; merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sanei/Makefile.in
68
68
libsanei_la_OBJECTS = $(am_libsanei_la_OBJECTS)
69
69
am_test_wire_OBJECTS = test_wire.$(OBJEXT)
70
70
test_wire_OBJECTS = $(am_test_wire_OBJECTS)
71
 
test_wire_DEPENDENCIES = libsanei.la
 
71
test_wire_DEPENDENCIES = libsanei.la ../lib/liblib.la
72
72
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/sane
73
73
depcomp = $(SHELL) $(top_srcdir)/depcomp
74
74
am__depfiles_maybe = depfiles
108
108
CFLAGS = @CFLAGS@
109
109
CPP = @CPP@
110
110
CPPFLAGS = @CPPFLAGS@
111
 
CXX = @CXX@
112
 
CXXCPP = @CXXCPP@
113
 
CXXDEPMODE = @CXXDEPMODE@
114
 
CXXFLAGS = @CXXFLAGS@
115
111
CYGPATH_W = @CYGPATH_W@
116
112
DEFS = @DEFS@
117
113
DEPDIR = @DEPDIR@
119
115
DLLTOOL = @DLLTOOL@
120
116
DL_LIBS = @DL_LIBS@
121
117
DSYMUTIL = @DSYMUTIL@
 
118
DUMPBIN = @DUMPBIN@
122
119
DVIPS = @DVIPS@
123
120
DYNAMIC_FLAG = @DYNAMIC_FLAG@
124
 
ECHO = @ECHO@
125
121
ECHO_C = @ECHO_C@
126
122
ECHO_N = @ECHO_N@
127
123
ECHO_T = @ECHO_T@
128
124
EGREP = @EGREP@
129
125
EXEEXT = @EXEEXT@
130
 
F77 = @F77@
131
 
FFLAGS = @FFLAGS@
 
126
FGREP = @FGREP@
132
127
GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
133
128
GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
134
129
GPHOTO2_LIBS = @GPHOTO2_LIBS@
144
139
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
145
140
JPEG_LIBS = @JPEG_LIBS@
146
141
LATEX = @LATEX@
 
142
LD = @LD@
147
143
LDFLAGS = @LDFLAGS@
148
144
LIBOBJS = @LIBOBJS@
149
145
LIBS = @LIBS@
153
149
LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
154
150
LIBV4L_LIBS = @LIBV4L_LIBS@
155
151
LINKER_RPATH = @LINKER_RPATH@
 
152
LIPO = @LIPO@
156
153
LN_S = @LN_S@
157
154
LOCKPATH_GROUP = @LOCKPATH_GROUP@
158
155
LTLIBOBJS = @LTLIBOBJS@
163
160
MKDIR_P = @MKDIR_P@
164
161
MSGFMT = @MSGFMT@
165
162
MSGMERGE = @MSGMERGE@
 
163
NM = @NM@
166
164
NMEDIT = @NMEDIT@
167
165
NUMBER_VERSION = @NUMBER_VERSION@
168
166
OBJDUMP = @OBJDUMP@
169
167
OBJEXT = @OBJEXT@
 
168
OTOOL = @OTOOL@
 
169
OTOOL64 = @OTOOL64@
170
170
PACKAGE = @PACKAGE@
171
171
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
172
172
PACKAGE_NAME = @PACKAGE_NAME@
173
173
PACKAGE_STRING = @PACKAGE_STRING@
174
174
PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
175
PACKAGE_URL = @PACKAGE_URL@
175
176
PACKAGE_VERSION = @PACKAGE_VERSION@
176
177
PATH_SEPARATOR = @PATH_SEPARATOR@
177
178
PKG_CONFIG = @PKG_CONFIG@
 
179
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 
180
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
178
181
PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
179
182
PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
180
183
PTHREAD_LIBS = @PTHREAD_LIBS@
186
189
SED = @SED@
187
190
SET_MAKE = @SET_MAKE@
188
191
SHELL = @SHELL@
 
192
SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
189
193
SOCKET_LIBS = @SOCKET_LIBS@
190
194
STRICT_LDFLAGS = @STRICT_LDFLAGS@
191
195
STRIP = @STRIP@
202
206
abs_top_builddir = @abs_top_builddir@
203
207
abs_top_srcdir = @abs_top_srcdir@
204
208
ac_ct_CC = @ac_ct_CC@
205
 
ac_ct_CXX = @ac_ct_CXX@
206
 
ac_ct_F77 = @ac_ct_F77@
 
209
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
207
210
am__include = @am__include@
208
211
am__leading_dot = @am__leading_dot@
209
212
am__quote = @am__quote@
266
269
        sanei_udp.c sanei_magic.c $(am__append_1)
267
270
EXTRA_DIST = linux_sg3_err.h os2_srb.h sanei_DomainOS.c sanei_DomainOS.h
268
271
test_wire_SOURCES = test_wire.c
269
 
test_wire_LDADD = libsanei.la
 
272
test_wire_LDADD = libsanei.la ../lib/liblib.la
270
273
all: all-am
271
274
 
272
275
.SUFFIXES: