Migrate to debhelper 10

5 files changed, 84 insertions, 0 deletions

diff --git a/debian/patches/0005-libsane_deps.patch b/debian/patches/0005-libsane_deps.patch
index 4a38952..9ff0617 100644
--- a/debian/patches/0005-libsane_deps.patch
+++ b/debian/patches/0005-libsane_deps.patch
@@ -27,3 +27,17 @@ Index: trunk/backend/Makefile.in
  all: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) all-am
  
+Index: trunk/backend/Makefile.am
+===================================================================
+--- trunk.orig/backend/Makefile.am
++++ trunk/backend/Makefile.am
+@@ -1142,7 +1142,7 @@ EXTRA_DIST += dll.aliases
+ nodist_libsane_la_SOURCES =  dll-s.c
+ libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
+ libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
+-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.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_magic.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)
++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)
+ 
+ # WARNING: Automake is getting this wrong so have to do it ourselves.
+-libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.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_magic.lo @SANEI_SANEI_JPEG_LO@
++libsane_la_DEPENDENCIES = libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo
diff --git a/debian/patches/0010-unneeded_doc.patch b/debian/patches/0010-unneeded_doc.patch
index e3c346a..f24378e 100644
--- a/debian/patches/0010-unneeded_doc.patch
+++ b/debian/patches/0010-unneeded_doc.patch
@@ -43,3 +43,34 @@ Index: trunk/doc/Makefile.in
  
  beman5dir = $(mandir)/man5
  BEDOCS = canon/canon.changes canon/canon.install2700F.txt \
+Index: trunk/Makefile.am
+===================================================================
+--- trunk.orig/Makefile.am
++++ trunk/Makefile.am
+@@ -7,11 +7,7 @@
+ SUBDIRS = include lib sanei backend frontend tools doc po testsuite
+ DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite
+ 
+-dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \
+- README README.aix README.beos README.darwin README.djpeg README.freebsd \
+- README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
+- README.solaris README.unixware2 README.unixware7 README.windows \
+- README.zeta
++dist_doc_DATA = README AUTHORS NEWS PROBLEMS PROJECTS
+ EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1  ChangeLog-1.0.2 \
+  ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 ChangeLog-1.0.6 \
+  ChangeLog-1.0.7 ChangeLog-1.0.8 ChangeLog-1.0.9 ChangeLog-1.0.10 \
+Index: trunk/doc/Makefile.am
+===================================================================
+--- trunk.orig/doc/Makefile.am
++++ trunk/doc/Makefile.am
+@@ -101,8 +101,7 @@ DLH	= TEXINPUTS="$(srcdir):$$TEXINPUTS"
+ MAN2HTML= nroff -c -man |\
+ 	  man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \
+           -cgiurl '$$title.$$section.html'|\
+-	  sed 's,<BODY>,<BODY BGCOLOR=\#FFFFFF TEXT=\#000000><H1 ALIGN=CENTER><IMG SRC="/images/sane.png" HEIGHT=117 WIDTH=346></H1>,'
+-
++	  sed 's,<BODY>,<BODY BGCOLOR=\#FFFFFF TEXT=\#000000></H1>,'
+ %.1 %.5 %.7 %.8: %.man
+ 	@echo "Generating manpage $@...";
+ 	@sed -e 's|@DATADIR@|$(datadir)|g' \
diff --git a/debian/patches/0015-frontend_libs.patch b/debian/patches/0015-frontend_libs.patch
index 31411bf..d408b3d 100644
--- a/debian/patches/0015-frontend_libs.patch
+++ b/debian/patches/0015-frontend_libs.patch
@@ -31,3 +31,16 @@ Index: trunk/frontend/Makefile.in
  
  test_SOURCES = test.c
  test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
+Index: trunk/frontend/Makefile.am
+===================================================================
+--- trunk.orig/frontend/Makefile.am
++++ trunk/frontend/Makefile.am
+@@ -22,7 +22,7 @@ scanimage_LDADD = ../backend/libsane.la
+ 
+ saned_SOURCES = saned.c
+ saned_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
+-             ../lib/libfelib.la @SYSLOG_LIBS@ @SYSTEMD_LIBS@
++             ../lib/libfelib.la @SYSLOG_LIBS@ @SYSTEMD_LIBS@ @AVAHI_LIBS@
+ 
+ test_SOURCES = test.c
+ test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
diff --git a/debian/patches/0025-multiarch_manpages_libdir.patch b/debian/patches/0025-multiarch_manpages_libdir.patch
index 142d501..d0b262d 100644
--- a/debian/patches/0025-multiarch_manpages_libdir.patch
+++ b/debian/patches/0025-multiarch_manpages_libdir.patch
@@ -16,3 +16,16 @@ Index: trunk/doc/Makefile.in
  	  -e 's|@BINDIR@|$(bindir)|g' \
  	  -e 's|@SBINDIR@|$(sbindir)|g' \
  	  -e 's|@PACKAGEVERSION@|$(package_version)|g' $^ >$@
+Index: trunk/doc/Makefile.am
+===================================================================
+--- trunk.orig/doc/Makefile.am
++++ trunk/doc/Makefile.am
+@@ -107,7 +107,7 @@ MAN2HTML= nroff -c -man |\
+ 	@sed -e 's|@DATADIR@|$(datadir)|g' \
+ 	  -e 's|@CONFIGDIR@|$(configdir)|g' \
+ 	  -e 's|@DOCDIR@|$(docdir)|g' \
+-	  -e 's|@LIBDIR@|$(libdir)/sane|g' \
++	  -e 's|@LIBDIR@|/usr/lib/arch_triplet/sane|g' \
+ 	  -e 's|@BINDIR@|$(bindir)|g' \
+ 	  -e 's|@SBINDIR@|$(sbindir)|g' \
+ 	  -e 's|@PACKAGEVERSION@|$(package_version)|g' $^ >$@
diff --git a/debian/patches/0125-multiarch_dll_search_path.patch b/debian/patches/0125-multiarch_dll_search_path.patch
index cc63bd6..21c93f6 100644
--- a/debian/patches/0125-multiarch_dll_search_path.patch
+++ b/debian/patches/0125-multiarch_dll_search_path.patch
@@ -44,3 +44,16 @@ Index: trunk/backend/Makefile.in
  AM_LDFLAGS = @STRICT_LDFLAGS@
  # The -rpath option is added because we are creating _LTLIBRARIES based
  # on configure substitution.  This causes automake to not know the
+Index: trunk/backend/Makefile.am
+===================================================================
+--- trunk.orig/backend/Makefile.am
++++ trunk/backend/Makefile.am
+@@ -24,7 +24,7 @@ USB_LIBS = @USB_LIBS@
+ SCSI_LIBS = @SCSI_LIBS@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ 
+-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\""
++AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\"" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\""
+ 
+ V_MAJOR = @V_MAJOR@
+ V_MINOR = @V_MINOR@