From e94622c319e4307617b202f19d3ec05b21a9bb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 27 Sep 2015 08:20:20 +0200
Subject: merge to 1.0.25+git20150927

---
 testsuite/tools/Makefile.in                  | 4 +++-
 testsuite/tools/data/html-backends-split.ref | 2 +-
 testsuite/tools/data/html-mfgs.ref           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'testsuite/tools')

diff --git a/testsuite/tools/Makefile.in b/testsuite/tools/Makefile.in
index e02349b..677dea2 100644
--- a/testsuite/tools/Makefile.in
+++ b/testsuite/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -205,6 +205,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_LIBS = @PNG_LIBS@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -221,6 +222,7 @@ SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
 SYSLOG_LIBS = @SYSLOG_LIBS@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
 USB_LIBS = @USB_LIBS@
diff --git a/testsuite/tools/data/html-backends-split.ref b/testsuite/tools/data/html-backends-split.ref
index b498c57..72fd949 100644
--- a/testsuite/tools/data/html-backends-split.ref
+++ b/testsuite/tools/data/html-backends-split.ref
@@ -16466,7 +16466,7 @@ Grandtek Scopecam
   <dt><b>Manufacturer:</b></dt>
   <dd>Manufacturer, vendor or brand name of the device.</dd>
   <dt><b>Model:</b></dt>
-  <dd>Name of the the device.</dd>
+  <dd>Name of the device.</dd>
   <dt><b>Interface:</b></dt>
   <dd>How the device is connected to the computer.</dd>
   <dt><b>USB id:</b></dt>
diff --git a/testsuite/tools/data/html-mfgs.ref b/testsuite/tools/data/html-mfgs.ref
index 3cbaaef..5e53ee3 100644
--- a/testsuite/tools/data/html-mfgs.ref
+++ b/testsuite/tools/data/html-mfgs.ref
@@ -23864,7 +23864,7 @@ qcam<br>(unmaintained)
 <blockquote>
 <dl>
   <dt><b>Model:</b></dt>
-  <dd>Name of the the device.</dd>
+  <dd>Name of the device.</dd>
   <dt><b>Interface:</b></dt>
   <dd>How the device is connected to the computer.</dd>
   <dt><b>USB id:</b></dt>
-- 
cgit v1.2.3