diff -Nru ga-5.4~beta~r10636+dfsg/debian/changelog ga-5.4~beta~r10636+dfsg/debian/changelog
--- ga-5.4~beta~r10636+dfsg/debian/changelog	2017-03-05 14:16:36.000000000 +0200
+++ ga-5.4~beta~r10636+dfsg/debian/changelog	2017-03-13 15:45:36.000000000 +0200
@@ -1,3 +1,18 @@
+ga (5.4~beta~r10636+dfsg-5) unstable; urgency=medium
+
+  * Team upload
+  * debian/control (Build-Depends): Drop versioned dependency
+    on libarmci-mpi-dev binNMU
+  * debian/clean: Add bltz.gmv to fix FTBFSx2
+  * debian/rules (override_dh_auto_configure): Link with -lblacs-openmpi
+    to avoid undefined reference to symbol 'blacs_gridexit_' (Closes: #857177)
+  * debian/rules (override_dh_auto_test): Set ARMCI_USE_WIN_ALLOCATE=1
+    to fix test failures (Closes: #846273)
+  * debian/control: Use secure URI for Vcs-Browser and
+    canonical URI for Vcs-Svn
+
+ -- Graham Inggs <ginggs@debian.org>  Mon, 13 Mar 2017 15:45:36 +0200
+
 ga (5.4~beta~r10636+dfsg-4) unstable; urgency=medium
 
   * debian/control (Build-Depends): Added libarmci-mpi-dev.
diff -Nru ga-5.4~beta~r10636+dfsg/debian/clean ga-5.4~beta~r10636+dfsg/debian/clean
--- ga-5.4~beta~r10636+dfsg/debian/clean	1970-01-01 02:00:00.000000000 +0200
+++ ga-5.4~beta~r10636+dfsg/debian/clean	2017-03-08 12:53:00.000000000 +0200
@@ -0,0 +1 @@
+bltz.gmv
diff -Nru ga-5.4~beta~r10636+dfsg/debian/control ga-5.4~beta~r10636+dfsg/debian/control
--- ga-5.4~beta~r10636+dfsg/debian/control	2017-03-05 14:15:52.000000000 +0200
+++ ga-5.4~beta~r10636+dfsg/debian/control	2017-03-13 15:45:36.000000000 +0200
@@ -6,7 +6,7 @@
 Build-Depends: autotools-dev,
                debhelper (>= 9.0~),
                gfortran,
-               libarmci-mpi-dev (>= 0.0~git20160222-1+b1),
+               libarmci-mpi-dev,
                libblas-dev,
                liblapack-dev,
                libscalapack-mpi-dev,
@@ -14,8 +14,8 @@
                openssh-client
 Standards-Version: 3.9.6
 Homepage: http://www.emsl.pnl.gov/docs/global/
-Vcs-Browser: http://svn.debian.org/wsvn/debichem/unstable/ga/
-Vcs-Svn: svn://svn.debian.org/svn/debichem/unstable/ga/
+Vcs-Browser: https://anonscm.debian.org/viewvc/debichem/unstable/ga/
+Vcs-Svn: svn://anonscm.debian.org/debichem/unstable/ga/
 
 Package: libglobalarrays-dev
 Architecture: any
diff -Nru ga-5.4~beta~r10636+dfsg/debian/rules ga-5.4~beta~r10636+dfsg/debian/rules
--- ga-5.4~beta~r10636+dfsg/debian/rules	2017-03-05 12:26:49.000000000 +0200
+++ ga-5.4~beta~r10636+dfsg/debian/rules	2017-03-13 11:58:00.000000000 +0200
@@ -9,7 +9,7 @@
 	dh_auto_configure -- 				\
 		--enable-cxx 				\
 		--with-tcgmsg				\
-		--with-scalapack=-lscalapack-openmpi	\
+		--with-scalapack="-lscalapack-openmpi -lblacs-openmpi" \
 		--with-blas=-lblas 			\
 		--with-lapack=-llapack			\
 		--with-mpi				\
@@ -25,5 +25,5 @@
 	
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	-dh_auto_test -- -j1 -k || cat armci/test-suite.log test-suite.log
+	-dh_auto_test -- -j1 -k ARMCI_USE_WIN_ALLOCATE=1 || cat test-suite.log
 endif