Merge branch 'release/experimental/1.0.29-1_experimental2'experimental/1.0.29-1_experimental2

1 files changed, 8 insertions, 8 deletions

diff --git a/debian/patches/0700-mk_reproducible_results.patch b/debian/patches/0700-mk_reproducible_results.patch
index 1b61b49..1b0a7bc 100644
--- a/debian/patches/0700-mk_reproducible_results.patch
+++ b/debian/patches/0700-mk_reproducible_results.patch
@@ -52,7 +52,7 @@ Index: trunk/testsuite/tools/data/html-backends-split.ref
  <font size=-1>
 -This page was last updated on Wed Jul 31 07:52:48 2013
 - by sane-desc 3.5 from sane-backends 1.0.24git
-+This page was last updated by sane-desc 3.5 from sane-backends 1.0.28-debian
++This page was last updated by sane-desc 3.5 from sane-backends 1.0.29-debian
  </font>
  </body> </html>
 Index: trunk/testsuite/tools/data/html-mfgs.ref
@@ -65,7 +65,7 @@ Index: trunk/testsuite/tools/data/html-mfgs.ref
  <font size=-1>
 -This page was last updated on Wed Jul 31 07:52:48 2013
 - by sane-desc 3.5 from sane-backends 1.0.24git
-+This page was last updated by sane-desc 3.5 from sane-backends 1.0.28-debian
++This page was last updated by sane-desc 3.5 from sane-backends 1.0.29-debian
  </font>
  </body> </html>
 Index: trunk/testsuite/tools/data/udev.ref
@@ -75,7 +75,7 @@ Index: trunk/testsuite/tools/data/udev.ref
 @@ -1,5 +1,5 @@
  # This file was automatically created based on description files (*.desc)
 -# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013
-+# by sane-desc 3.5 from sane-backends 1.0.28-debian
++# by sane-desc 3.5 from sane-backends 1.0.29-debian
  #
  # udev rules file for supported USB and SCSI devices
  #
@@ -86,7 +86,7 @@ Index: trunk/testsuite/tools/data/udev+acl.ref
 @@ -1,5 +1,5 @@
  # This file was automatically created based on description files (*.desc)
 -# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:49 2013
-+# by sane-desc 3.5 from sane-backends 1.0.28-debian
++# by sane-desc 3.5 from sane-backends 1.0.29-debian
  #
  # udev rules file for supported USB and SCSI devices
  #
@@ -97,7 +97,7 @@ Index: trunk/testsuite/tools/data/udev+hwdb.ref
 @@ -1,5 +1,5 @@
  # This file was automatically created based on description files (*.desc)
 -# by sane-desc 3.5 from sane-backends 1.0.24git on Thu Aug  1 18:50:15 2013
-+# by sane-desc 3.5 from sane-backends 1.0.28-debian
++# by sane-desc 3.5 from sane-backends 1.0.29-debian
  #
  # udev rules file for supported USB and SCSI devices
  #
@@ -126,7 +126,7 @@ Index: trunk/testsuite/tools/data/db.ref
 @@ -1,5 +1,5 @@
  # This file was automatically created based on description files (*.desc)
 -# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013
-+# by sane-desc 3.5 from sane-backends 1.0.28-debian
++# by sane-desc 3.5 from sane-backends 1.0.29-debian
  #
  # The entries below are used to detect a USB device when it's plugged in
  # and then run a script to change the ownership and
@@ -137,7 +137,7 @@ Index: trunk/testsuite/tools/data/hwdb.ref
 @@ -1,5 +1,5 @@
  # This file was automatically created based on description files (*.desc)
 -# by sane-desc 3.5 from sane-backends 1.0.25git on Tue Dec  3 15:24:46 2013
-+# by sane-desc 3.5 from sane-backends 1.0.28-debian
++# by sane-desc 3.5 from sane-backends 1.0.29-debian
  #
  # hwdb file for supported USB devices
  #
@@ -148,7 +148,7 @@ Index: trunk/testsuite/tools/data/usermap.ref
 @@ -1,5 +1,5 @@
  # This file was automatically created based on description files (*.desc)
 -# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013
-+# by sane-desc 3.5 from sane-backends 1.0.28-debian
++# by sane-desc 3.5 from sane-backends 1.0.29-debian
  #
  # The entries below are used to detect a USB device and change owner
  # and permissions on the "device node" used by libusb.