diff -Nru python-rjsmin-1.0.12+dfsg1/debian/changelog python-rjsmin-1.0.12+dfsg1/debian/changelog
--- python-rjsmin-1.0.12+dfsg1/debian/changelog	2018-11-03 12:09:50.000000000 +0000
+++ python-rjsmin-1.0.12+dfsg1/debian/changelog	2019-02-11 19:51:51.000000000 +0000
@@ -1,3 +1,30 @@
+python-rjsmin (1.0.12+dfsg1-4ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Enable benchmark tests for some level of unit testing:
+      - d/rules: Execute benchmarks for all python versions against a
+        selection of js files.
+      - d/p/skip-jsmin-bench.patch: Disable jsmin benchmark as excluded
+        from source.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 11 Feb 2019 11:51:51 -0800
+
+python-rjsmin (1.0.12+dfsg1-4) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * Fixed VCS URLs (https).
+
+  [ Thomas Goirand ]
+  * Added debian/source.lintian-overrides.
+
+  [ Ondřej Nový ]
+  * d/rules: Changed UPSTREAM_GIT protocol to https
+  * d/s/options: extend-diff-ignore of .gitreview
+  * d/control: Using OpenStack's Gerrit as VCS URLs.
+  * Fix typo on long desc (Closes: #839685).
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 10 Mar 2016 10:43:35 +0100
+
 python-rjsmin (1.0.12+dfsg1-2ubuntu5) disco; urgency=medium
 
   * No-change rebuild to build without python3.6 support.
@@ -49,3 +76,4 @@
   * Initial release. (Closes: #808800)
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 22 Dec 2015 10:50:39 +0100
+
diff -Nru python-rjsmin-1.0.12+dfsg1/debian/control python-rjsmin-1.0.12+dfsg1/debian/control
--- python-rjsmin-1.0.12+dfsg1/debian/control	2016-03-09 12:17:37.000000000 +0000
+++ python-rjsmin-1.0.12+dfsg1/debian/control	2018-11-03 15:46:15.000000000 +0000
@@ -13,8 +13,8 @@
                python3-setuptools,
                python3-chardet,
 Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-rjsmin.git
-Vcs-Git: git://anonscm.debian.org/openstack/python-rjsmin.git
+Vcs-Browser: https://git.openstack.org/cgit/openstack/deb-python-rjsmin?h=debian%2Fnewton
+Vcs-Git: https://git.openstack.org/openstack/deb-python-rjsmin -b debian/newton
 Homepage: http://opensource.perlig.de/rjsmin/
 
 Package: python-rjsmin
@@ -33,7 +33,7 @@
   - there is no error detection: unterminated string, regex and comment
     literals are treated as regular javascript code and minified as such.
   - Control characters inside string and regex literals are left untouched; they
-    are not converted to spaces (nor to)
+    are not converted to spaces (nor to CR)
   - Newline characters are not allowed inside string and regex literals, except
     for line continuations in string literals (ECMA-5).
   - "return /regex/" is recognized correctly.
@@ -70,7 +70,7 @@
   - there is no error detection: unterminated string, regex and comment
     literals are treated as regular javascript code and minified as such.
   - Control characters inside string and regex literals are left untouched; they
-    are not converted to spaces (nor to)
+    are not converted to spaces (nor to CR)
   - Newline characters are not allowed inside string and regex literals, except
     for line continuations in string literals (ECMA-5).
   - "return /regex/" is recognized correctly.
diff -Nru python-rjsmin-1.0.12+dfsg1/debian/gbp.conf python-rjsmin-1.0.12+dfsg1/debian/gbp.conf
--- python-rjsmin-1.0.12+dfsg1/debian/gbp.conf	2016-03-09 11:27:49.000000000 +0000
+++ python-rjsmin-1.0.12+dfsg1/debian/gbp.conf	2018-11-03 15:46:15.000000000 +0000
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = master
-debian-branch = debian/unstable
+debian-branch = debian/newton
 upstream-tag = %(version)s
 compression = xz
 
diff -Nru python-rjsmin-1.0.12+dfsg1/debian/rules python-rjsmin-1.0.12+dfsg1/debian/rules
--- python-rjsmin-1.0.12+dfsg1/debian/rules	2016-03-09 15:54:47.000000000 +0000
+++ python-rjsmin-1.0.12+dfsg1/debian/rules	2018-11-03 15:46:15.000000000 +0000
@@ -5,7 +5,7 @@
 ARCH:=$(shell dpkg-architecture -qDEB_TARGET_GNU_CPU)
 OS:=$(shell dpkg-architecture -qDEB_TARGET_ARCH_OS)
 
-UPSTREAM_GIT = git://github.com/ndparker/rjsmin.git
+UPSTREAM_GIT := https://github.com/ndparker/rjsmin.git
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 %:
diff -Nru python-rjsmin-1.0.12+dfsg1/debian/source/options python-rjsmin-1.0.12+dfsg1/debian/source/options
--- python-rjsmin-1.0.12+dfsg1/debian/source/options	2016-03-09 11:27:49.000000000 +0000
+++ python-rjsmin-1.0.12+dfsg1/debian/source/options	2018-11-03 15:46:15.000000000 +0000
@@ -1 +1,2 @@
 extend-diff-ignore = "^[^/]*[.]egg-info/"
+extend-diff-ignore = "^[.]gitreview$"
diff -Nru python-rjsmin-1.0.12+dfsg1/debian/source.lintian-overrides python-rjsmin-1.0.12+dfsg1/debian/source.lintian-overrides
--- python-rjsmin-1.0.12+dfsg1/debian/source.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ python-rjsmin-1.0.12+dfsg1/debian/source.lintian-overrides	2016-03-10 09:43:35.000000000 +0000
@@ -0,0 +1,2 @@
+python-rjsmin source: source-is-missing bench/apiviewer.js line length is 27870 characters (>512)
+python-rjsmin source: source-is-missing bench/knockout-2.0.0.js line length is 518 characters (>512)