diff -Nru bsh-2.0b4/debian/changelog bsh-2.0b4/debian/changelog
--- bsh-2.0b4/debian/changelog	2017-11-29 23:39:30.000000000 +0000
+++ bsh-2.0b4/debian/changelog	2019-09-09 12:30:36.000000000 +0000
@@ -1,3 +1,13 @@
+bsh (2.0b4-20) unstable; urgency=medium
+
+  * Normalize the permissions of the files in bsh.tar.gz to make
+    the build reproducible
+  * No longer run the tests if the nocheck build option is specified
+  * Standards-Version updated to 4.4.0
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 09 Sep 2019 14:30:36 +0200
+
 bsh (2.0b4-19) unstable; urgency=medium
 
   * Fixed the build failure with Java 9 (Closes: #875340)
diff -Nru bsh-2.0b4/debian/control bsh-2.0b4/debian/control
--- bsh-2.0b4/debian/control	2017-11-29 23:30:51.000000000 +0000
+++ bsh-2.0b4/debian/control	2019-09-09 12:27:30.000000000 +0000
@@ -14,9 +14,9 @@
  libservlet3.1-java,
  libservlet3.1-java-doc,
  maven-repo-helper
-Standards-Version: 4.1.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/bsh.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/bsh.git
+Standards-Version: 4.4.0
+Vcs-Git: https://salsa.debian.org/java-team/bsh.git
+Vcs-Browser: https://salsa.debian.org/java-team/bsh
 Homepage: http://www.beanshell.org
 
 Package: bsh
diff -Nru bsh-2.0b4/debian/rules bsh-2.0b4/debian/rules
--- bsh-2.0b4/debian/rules	2017-11-29 23:38:03.000000000 +0000
+++ bsh-2.0b4/debian/rules	2019-09-09 12:28:32.000000000 +0000
@@ -11,7 +11,9 @@
 	dh_auto_build -- javadoc jarall -Dcompile.debug=true
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_auto_build -- test
+endif
 
 override_dh_auto_install:
 	mh_installpoms -plibbsh-java
@@ -22,7 +24,8 @@
 	mkdir -p debian/bsh-src/usr/src/bsh-src
 	tar --exclude debian --exclude classes --exclude dist --exclude api \
 	    --clamp-mtime --mtime="@$(SOURCE_DATE_EPOCH)" \
-		-zcf debian/bsh-src/usr/src/bsh-src/bsh.tar.gz *
+	    --mode='u+rw,g+rw,a+X' \
+	    -zcf debian/bsh-src/usr/src/bsh-src/bsh.tar.gz *
 
 get-orig-source:
 	-uscan --download-current-version --force-download --rename --repack