diff -Nru xplot-xplot.org-0.90.7.1/debian/changelog xplot-xplot.org-0.90.7.1/debian/changelog
--- xplot-xplot.org-0.90.7.1/debian/changelog	2016-11-24 21:00:18.000000000 +0000
+++ xplot-xplot.org-0.90.7.1/debian/changelog	2018-10-04 05:01:04.000000000 +0000
@@ -1,3 +1,14 @@
+xplot-xplot.org (0.90.7.1-4) unstable; urgency=medium
+
+  * Update Vcs URLs to reflect the alioth -> gitlab migration
+  * tcpdump2xplot: use /usr/bin/perl as the interpreter
+  * Clean up dependencies in debian/rules to fix lintian's
+    build-stamp-in-binary warning
+  * Correct LDFLAGS to properly apply dpkg-buildflags settings
+  * Update standards to 4.2.1
+
+ -- Noah Meyerhans <noahm@debian.org>  Wed, 03 Oct 2018 22:01:04 -0700
+
 xplot-xplot.org (0.90.7.1-3) unstable; urgency=medium
 
   * Add Vcs tags to debian/control
diff -Nru xplot-xplot.org-0.90.7.1/debian/control xplot-xplot.org-0.90.7.1/debian/control
--- xplot-xplot.org-0.90.7.1/debian/control	2016-11-24 21:00:18.000000000 +0000
+++ xplot-xplot.org-0.90.7.1/debian/control	2018-10-04 05:01:04.000000000 +0000
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Noah Meyerhans <noahm@debian.org>
 Build-Depends: debhelper (>= 7), autotools-dev, libx11-dev, quilt
-Standards-Version: 3.9.8
+Standards-Version: 4.2.1
 Homepage: http://www.xplot.org/
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/xplot-xplot.org.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xplot-xplot.org.git
+Vcs-Git: https://salsa.debian.org/debian/xplot-xplot.org.git
+Vcs-Browser: https://salsa.debian.org/debian/xplot-xplot.org
 
 Package: xplot-xplot.org
 Architecture: any
diff -Nru xplot-xplot.org-0.90.7.1/debian/patches/fix-perl-path xplot-xplot.org-0.90.7.1/debian/patches/fix-perl-path
--- xplot-xplot.org-0.90.7.1/debian/patches/fix-perl-path	1970-01-01 00:00:00.000000000 +0000
+++ xplot-xplot.org-0.90.7.1/debian/patches/fix-perl-path	2018-10-04 05:01:04.000000000 +0000
@@ -0,0 +1,10 @@
+Index: xplot-xplot.org-0.90.7.1/tcpdump2xplot.pl
+===================================================================
+--- xplot-xplot.org-0.90.7.1.orig/tcpdump2xplot.pl
++++ xplot-xplot.org-0.90.7.1/tcpdump2xplot.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ # -*- Perl -*-
+ #
+ # Copyright 1996 Massachusetts Institute of Technology
diff -Nru xplot-xplot.org-0.90.7.1/debian/patches/series xplot-xplot.org-0.90.7.1/debian/patches/series
--- xplot-xplot.org-0.90.7.1/debian/patches/series	2016-11-24 21:00:18.000000000 +0000
+++ xplot-xplot.org-0.90.7.1/debian/patches/series	2018-10-04 05:01:04.000000000 +0000
@@ -3,3 +3,4 @@
 refresh-autoconf
 rename-xplot
 fix-manpage-warnings
+fix-perl-path
diff -Nru xplot-xplot.org-0.90.7.1/debian/rules xplot-xplot.org-0.90.7.1/debian/rules
--- xplot-xplot.org-0.90.7.1/debian/rules	2016-11-24 21:00:18.000000000 +0000
+++ xplot-xplot.org-0.90.7.1/debian/rules	2018-10-04 05:01:04.000000000 +0000
@@ -24,12 +24,15 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"
+	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)"
 	touch config-stamp
 
 configure: config-stamp
 
-build: build-arch-stamp build-indep-stamp
+build: build-stamp
+
+build-stamp: build-arch-stamp build-indep-stamp
+	touch build-stamp
 
 build-arch: build-arch-stamp
 build-arch-stamp:  configure
@@ -45,7 +48,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f config-stamp build-indep-stamp build-arch-stamp
+	rm -f config-stamp build-indep-stamp build-arch-stamp build-stamp
 
 	[ ! -f Makefile ] || $(MAKE) clean
 	-rm -rf .pc
@@ -53,7 +56,7 @@
 
 	dh_clean 
 
-install: build
+install: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -61,9 +64,9 @@
 	$(MAKE) prefix=$(CURDIR)/debian/xplot-xplot.org/usr install
 
 
-binary-indep: build install
+binary-indep: build-stamp install
 
-binary-arch: build install
+binary-arch: install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs