diff -Nru golang-github-boltdb-bolt-1.3.1/debian/changelog golang-github-boltdb-bolt-1.3.1/debian/changelog
--- golang-github-boltdb-bolt-1.3.1/debian/changelog	2019-09-15 21:34:04.000000000 +0000
+++ golang-github-boltdb-bolt-1.3.1/debian/changelog	2020-03-22 09:46:56.000000000 +0000
@@ -1,3 +1,14 @@
+golang-github-boltdb-bolt (1.3.1-7) unstable; urgency=medium
+
+  * Team Upload.
+  * Initialize test to fix flag parsing issue (Closes: #952199)
+  * Drop compat, switch to debhelper-compat
+  * Bump standards version to 4.5.0
+  * Add "Rules-Requires-Root:no"
+  * Add upstream/metadata
+
+ -- Nilesh Patra <npatra974@gmail.com>  Sun, 22 Mar 2020 15:16:56 +0530
+
 golang-github-boltdb-bolt (1.3.1-6) unstable; urgency=medium
 
   * Team upload.
diff -Nru golang-github-boltdb-bolt-1.3.1/debian/compat golang-github-boltdb-bolt-1.3.1/debian/compat
--- golang-github-boltdb-bolt-1.3.1/debian/compat	2019-09-15 21:34:04.000000000 +0000
+++ golang-github-boltdb-bolt-1.3.1/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-10
diff -Nru golang-github-boltdb-bolt-1.3.1/debian/control golang-github-boltdb-bolt-1.3.1/debian/control
--- golang-github-boltdb-bolt-1.3.1/debian/control	2019-09-15 21:34:04.000000000 +0000
+++ golang-github-boltdb-bolt-1.3.1/debian/control	2020-03-22 09:46:56.000000000 +0000
@@ -5,14 +5,15 @@
 Maintainer: Debian Go Packaging Team <pkg-go-maintainers@lists.alioth.debian.org>
 Uploaders: Martín Ferrari <tincho@debian.org>,
            Tim Potter <tpot@hpe.com>,
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper-compat (= 12),
                dh-golang (>= 1.17~),
                golang-any,
-Standards-Version: 4.1.1
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-github-boltdb-bolt
 Vcs-Git: https://salsa.debian.org/go-team/packages/golang-github-boltdb-bolt.git
 XS-Go-Import-Path: github.com/boltdb/bolt
 Testsuite: autopkgtest-pkg-go
+Rules-Requires-Root: no
 
 Package: golang-github-boltdb-bolt-dev
 Architecture: all
diff -Nru golang-github-boltdb-bolt-1.3.1/debian/patches/0004-Fix-parsing-flags.patch golang-github-boltdb-bolt-1.3.1/debian/patches/0004-Fix-parsing-flags.patch
--- golang-github-boltdb-bolt-1.3.1/debian/patches/0004-Fix-parsing-flags.patch	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-boltdb-bolt-1.3.1/debian/patches/0004-Fix-parsing-flags.patch	2020-03-22 09:46:56.000000000 +0000
@@ -0,0 +1,23 @@
+Description: Initialize test so that test flags can be parsed during execution.
+--- a/quick_test.go
++++ b/quick_test.go
+@@ -8,6 +8,7 @@
+ 	"os"
+ 	"reflect"
+ 	"testing/quick"
++	"testing"
+ 	"time"
+ )
+ 
+@@ -23,6 +24,11 @@
+ 
+ var qcount, qseed, qmaxitems, qmaxksize, qmaxvsize int
+ 
++var testinit = func() bool {
++	testing.Init()
++	return true
++}()
++
+ func init() {
+ 	flag.IntVar(&qcount, "quick.count", 5, "")
+ 	flag.IntVar(&qseed, "quick.seed", int(time.Now().UnixNano())%100000, "")
diff -Nru golang-github-boltdb-bolt-1.3.1/debian/patches/series golang-github-boltdb-bolt-1.3.1/debian/patches/series
--- golang-github-boltdb-bolt-1.3.1/debian/patches/series	2019-09-15 21:34:04.000000000 +0000
+++ golang-github-boltdb-bolt-1.3.1/debian/patches/series	2020-03-22 09:46:56.000000000 +0000
@@ -1,3 +1,4 @@
 Bug#849663_Fix_32bit_failures.patch
 0002-Increase-write-waiting-time-when-testing.patch
 0003-Add-support-for-mips-mips64.patch
+0004-Fix-parsing-flags.patch
diff -Nru golang-github-boltdb-bolt-1.3.1/debian/upstream/metadata golang-github-boltdb-bolt-1.3.1/debian/upstream/metadata
--- golang-github-boltdb-bolt-1.3.1/debian/upstream/metadata	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-boltdb-bolt-1.3.1/debian/upstream/metadata	2020-03-22 09:46:56.000000000 +0000
@@ -0,0 +1,7 @@
+---
+Archive: GitHub
+Bug-Database: https://github.com/boltdb/bolt/issues
+Bug-Submit: https://github.com/boltdb/bolt/issues/new
+Changelog: https://github.com/boltdb/bolt/tags
+Repository: https://github.com/boltdb/bolt.git
+Repository-Browse: https://github.com/boltdb/bolt