Patches: remove 02 and 05: merged upstream.

4 files changed, 1 insertions, 77 deletions

diff --git a/debian/changelog b/debian/changelog
index 08ea487..1a9051f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sysbench (1.0.8+ds-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Patches: remove 02 and 05: merged upstream.
 
  -- JCF Ploemen (jcfp) <linux@jcf.pm>  Thu, 06 Jul 2017 21:38:27 +0000
 
diff --git a/debian/patches/02_fix_typo.diff b/debian/patches/02_fix_typo.diff
deleted file mode 100644
index 569cdb5..0000000
--- a/debian/patches/02_fix_typo.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-# Correct minor typos causing a lintian hit
-#
-# Forwarded upstream: https://github.com/akopytov/sysbench/pull/135
---- a/src/sb_rand.c
-+++ b/src/sb_rand.c
-@@ -60,7 +60,7 @@
-   SB_OPT("rand-seed",
-          "seed for random number generator. When 0, the current time is "
-          "used as a RNG seed.", "0", INT),
--  SB_OPT("rand-pareto-h", "parameter h for pareto distibution", "0.2", DOUBLE),
-+  SB_OPT("rand-pareto-h", "parameter h for pareto distribution", "0.2", DOUBLE),
- 
-   SB_OPT_END
- };
---- a/tests/t/opt_help.t
-+++ b/tests/t/opt_help.t
-@@ -36,7 +36,7 @@
-     --rand-spec-pct=N  percentage of values to be treated as 'special' (for special distribution) [1]
-     --rand-spec-res=N  percentage of 'special' values to use (for special distribution) [75]
-     --rand-seed=N      seed for random number generator. When 0, the current time is used as a RNG seed. [0]
--    --rand-pareto-h=N  parameter h for pareto distibution [0.2]
-+    --rand-pareto-h=N  parameter h for pareto distribution [0.2]
-   
-   Log options:
-     --verbosity=N verbosity level {5 - debug, 0 - only critical messages} [3]
diff --git a/debian/patches/05_fix_api_report_test_latency_check.diff b/debian/patches/05_fix_api_report_test_latency_check.diff
deleted file mode 100644
index 86b2ee5..0000000
--- a/debian/patches/05_fix_api_report_test_latency_check.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-# Modify test to permit latency values >= 2, preventing test failure when
-# available cpu resources are limited.
-#
-# By using [1-9][0-9]*\.[0-9]* (re) rather than *.* (glob) in place of
-# the previous 1.* (glob) the modified test still requires the latency to
-# have a value >= 1 ms as dictated by the usleep(1000) statement.
-#
-# Forwarded upstream: https://github.com/akopytov/sysbench/pull/136
---- a/tests/t/api_reports.t
-+++ b/tests/t/api_reports.t
-@@ -21,8 +21,8 @@
-   > EOF
- 
-   $ sysbench $SB_ARGS run
--  [ 2s ] thds: 1 tps: *.* qps: 0.00 (r/w/o: 0.00/0.00/0.00) lat (ms,95%): 1.* err/s 0.00 reconn/s: 0.00 (glob)
--  [ 3s ] thds: 0 tps: *.* qps: 0.00 (r/w/o: 0.00/0.00/0.00) lat (ms,95%): 1.* err/s 0.00 reconn/s: 0.00 (glob)
-+  \[ 2s \] thds: 1 tps: [0-9]*\.[0-9]* qps: 0\.00 \(r\/w\/o: 0\.00\/0\.00\/0\.00\) lat \(ms,95%\): [1-9][0-9]*\.[0-9]* err\/s 0\.00 reconn\/s: 0\.00 (re)
-+  \[ 3s \] thds: 0 tps: [0-9]*\.[0-9]* qps: 0\.00 \(r\/w\/o: 0\.00\/0\.00\/0\.00\) lat \(ms,95%\): [1-9][0-9]*\.[0-9]* err\/s 0\.00 reconn\/s: 0\.00 (re)
- 
- ########################################################################
- # CSV format via a custom hook
-@@ -40,8 +40,8 @@
-   > EOF
- 
-   $ sysbench $SB_ARGS run
--  2,1,*.*,0.00,0.00,0.00,0.00,1.*,0.00,0.00 (glob)
--  3,0,*.*,0.00,0.00,0.00,0.00,1.*,0.00,0.00 (glob)
-+  2,1,[0-9]*\.[0-9]*,0\.00,0\.00,0\.00,0\.00,[1-9][0-9]*\.[0-9]*,0\.00,0\.00 (re)
-+  3,0,[0-9]*\.[0-9]*,0\.00,0\.00,0\.00,0\.00,[1-9][0-9]*\.[0-9]*,0\.00,0\.00 (re)
- 
- ########################################################################
- # JSON format via a custom hook
-@@ -69,7 +69,7 @@
-       "writes": 0.00,
-       "other": 0.00,
-     },
--    "latency": 1.*, (glob)
-+    "latency": [1-9][0-9]*\.[0-9]*, (re)
-     "errors": 0.00,
-     "reconnects": 0.00
-   },
-@@ -83,7 +83,7 @@
-       "writes": 0.00,
-       "other": 0.00,
-     },
--    "latency": 1.*, (glob)
-+    "latency": [1-9][0-9]*\.[0-9]*, (re)
-     "errors": 0.00,
-     "reconnects": 0.00
-   },
diff --git a/debian/patches/series b/debian/patches/series
index 1b35551..097749e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 01_dont_require_third_party.diff
-02_fix_typo.diff
 03_dont_install_tests_in_binary_pkg.diff
 04_strip_env_from_shebang.diff
-05_fix_api_report_test_latency_check.diff