Merge branch 'release/debian/1.2.1-3'debian/1.2.1-3

2 files changed, 9 insertions, 9 deletions

diff --git a/debian/patches/0040-remove_git.patch b/debian/patches/0040-remove_git.patch
index 6cbe5f7..cc70771 100644
--- a/debian/patches/0040-remove_git.patch
+++ b/debian/patches/0040-remove_git.patch
@@ -9,4 +9,4 @@ Index: trunk/.tarball-version
 --- /dev/null
 +++ trunk/.tarball-version
 @@ -0,0 +1 @@
-+1.1.1-debian
++1.2.1-debian
diff --git a/debian/patches/0175-fix_tests.patch b/debian/patches/0175-fix_tests.patch
index 612d851..4b9f4f9 100644
--- a/debian/patches/0175-fix_tests.patch
+++ b/debian/patches/0175-fix_tests.patch
@@ -11,7 +11,7 @@ Index: trunk/testsuite/tools/data/db.ref
 @@ -1,5 +1,5 @@
  # This file was generated from description files (*.desc)
 -# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
-+# by sane-desc 3.6 from sane-backends 1.1.1-debian
++# by sane-desc 3.6 from sane-backends 1.2.1-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
@@ -24,7 +24,7 @@ Index: trunk/testsuite/tools/data/html-backends-split.ref
  </address>
  <font size=-1>
 -This page was created by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
-+This page was created by sane-desc 3.6 from sane-backends 1.1.1-debian
++This page was created by sane-desc 3.6 from sane-backends 1.2.1-debian
  </font>
  </body> </html>
 Index: trunk/testsuite/tools/data/html-mfgs.ref
@@ -36,7 +36,7 @@ Index: trunk/testsuite/tools/data/html-mfgs.ref
  </address>
  <font size=-1>
 -This page was created by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
-+This page was created by sane-desc 3.6 from sane-backends 1.1.1-debian
++This page was created by sane-desc 3.6 from sane-backends 1.2.1-debian
  </font>
  </body> </html>
 Index: trunk/testsuite/tools/data/hwdb.ref
@@ -46,7 +46,7 @@ Index: trunk/testsuite/tools/data/hwdb.ref
 @@ -1,5 +1,5 @@
  # This file was generated from description files (*.desc)
 -# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
-+# by sane-desc 3.6 from sane-backends 1.1.1-debian
++# by sane-desc 3.6 from sane-backends 1.2.1-debian
  #
  # hwdb file for supported USB devices
  #
@@ -57,7 +57,7 @@ Index: trunk/testsuite/tools/data/udev+acl.ref
 @@ -1,5 +1,5 @@
  # This file was generated from description files (*.desc)
 -# by sane-desc 3.6 from sane-backends 1.0.31-118-g5d3ce7806
-+# by sane-desc 3.6 from sane-backends 1.1.1-debian
++# by sane-desc 3.6 from sane-backends 1.2.1-debian
  #
  # udev rules file for supported USB and SCSI devices
  #
@@ -68,7 +68,7 @@ Index: trunk/testsuite/tools/data/udev+hwdb.ref
 @@ -1,5 +1,5 @@
  # This file was generated from description files (*.desc)
 -# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
-+# by sane-desc 3.6 from sane-backends 1.1.1-debian
++# by sane-desc 3.6 from sane-backends 1.2.1-debian
  #
  # udev rules file for supported USB and SCSI devices
  #
@@ -79,7 +79,7 @@ Index: trunk/testsuite/tools/data/udev.ref
 @@ -1,5 +1,5 @@
  # This file was generated from description files (*.desc)
 -# by sane-desc 3.6 from sane-backends 1.0.31-118-g5d3ce7806
-+# by sane-desc 3.6 from sane-backends 1.1.1-debian
++# by sane-desc 3.6 from sane-backends 1.2.1-debian
  #
  # udev rules file for supported USB and SCSI devices
  #
@@ -90,7 +90,7 @@ Index: trunk/testsuite/tools/data/usermap.ref
 @@ -1,5 +1,5 @@
  # This file was generated from description files (*.desc)
 -# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
-+# by sane-desc 3.6 from sane-backends 1.1.1-debian
++# by sane-desc 3.6 from sane-backends 1.2.1-debian
  #
  # The entries below are used to detect a USB device and change owner
  # and permissions on the "device node" used by libusb.