diff -Nru libgom-0.3.3/debian/changelog libgom-0.3.3/debian/changelog
--- libgom-0.3.3/debian/changelog	2017-11-13 17:47:13.000000000 +0000
+++ libgom-0.3.3/debian/changelog	2018-01-19 13:20:26.000000000 +0000
@@ -1,3 +1,12 @@
+libgom (0.3.3-4) unstable; urgency=medium
+
+  * Update Vcs fields for move to https://salsa.debian.org/
+  * Update debian/gbp.conf for Debian GNOME team conventions
+  * Bump debhelper compat to 11
+  * Bump Standards-Version to 4.1.3
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 19 Jan 2018 08:20:26 -0500
+
 libgom (0.3.3-3) unstable; urgency=medium
 
   * debian/patches/01_test_timeout.path: Really fix FTBFS by disabling the
diff -Nru libgom-0.3.3/debian/compat libgom-0.3.3/debian/compat
--- libgom-0.3.3/debian/compat	2017-11-13 14:11:19.000000000 +0000
+++ libgom-0.3.3/debian/compat	2018-01-19 13:20:26.000000000 +0000
@@ -1 +1 @@
-10
+11
diff -Nru libgom-0.3.3/debian/control libgom-0.3.3/debian/control
--- libgom-0.3.3/debian/control	2017-11-13 17:47:13.000000000 +0000
+++ libgom-0.3.3/debian/control	2018-01-19 13:20:26.000000000 +0000
@@ -5,8 +5,8 @@
 Source: libgom
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
-Build-Depends: debhelper (>= 10.4),
+Uploaders: Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
+Build-Depends: debhelper (>= 11),
                gnome-pkg-tools,
                gobject-introspection,
                gtk-doc-tools,
@@ -18,11 +18,11 @@
                meson (>= 0.38.1),
                python-gi-dev,
                python3 (>= 3.4)
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Section: libs
 Homepage: https://wiki.gnome.org/Projects/Gom
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libgom.git
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/libgom.git
+Vcs-Browser: https://salsa.debian.org/gnome-team/libgom
+Vcs-Git: https://salsa.debian.org/gnome-team/libgom.git
 
 Package: libgom-1.0-0
 Architecture: any
diff -Nru libgom-0.3.3/debian/control.in libgom-0.3.3/debian/control.in
--- libgom-0.3.3/debian/control.in	2017-11-13 14:11:19.000000000 +0000
+++ libgom-0.3.3/debian/control.in	2018-01-19 13:20:26.000000000 +0000
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 10.4),
+Build-Depends: debhelper (>= 11),
                gnome-pkg-tools,
                gobject-introspection,
                gtk-doc-tools,
@@ -14,11 +14,11 @@
                meson (>= 0.38.1),
                python-gi-dev,
                python3 (>= 3.4)
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Section: libs
 Homepage: https://wiki.gnome.org/Projects/Gom
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libgom.git
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/libgom.git
+Vcs-Browser: https://salsa.debian.org/gnome-team/libgom
+Vcs-Git: https://salsa.debian.org/gnome-team/libgom.git
 
 Package: libgom-1.0-0
 Architecture: any
diff -Nru libgom-0.3.3/debian/gbp.conf libgom-0.3.3/debian/gbp.conf
--- libgom-0.3.3/debian/gbp.conf	2016-04-01 13:57:23.000000000 +0000
+++ libgom-0.3.3/debian/gbp.conf	2018-01-19 13:20:26.000000000 +0000
@@ -1,4 +1,5 @@
 [DEFAULT]
-debian-branch = master
-upstream-branch = upstream
 pristine-tar = True
+debian-branch = debian/master
+upstream-branch = upstream/latest
+upstream-vcs-tag = %(version)s
diff -Nru libgom-0.3.3/debian/rules libgom-0.3.3/debian/rules
--- libgom-0.3.3/debian/rules	2017-11-13 14:11:19.000000000 +0000
+++ libgom-0.3.3/debian/rules	2018-01-19 13:20:26.000000000 +0000
@@ -1,15 +1,8 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-#
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#DH_VERBOSE = 1
-
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
 
 export CONFIG_OPTIONS= \
 	-Denable-introspection=true \
@@ -18,14 +11,20 @@
 %:
 	dh $@ --with gir,gnome
 
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
 override_dh_auto_configure:
 	dh_auto_configure -- ${CONFIG_OPTIONS}
 
 override_dh_install:
 	# Remove *.la files per policy 3.9.1.0
-	rm -fv debian/tmp/usr/lib/*/*.la
-	rm -rfv debian/tmp/usr/lib/python3/dist-packages/gi/overrides/__pycache__
-	dh_install --fail-missing
+	find debian/tmp -name '*.la' -print -delete
+	find debian/tmp -name '__pycache__' -print -delete
+	dh_install
+
+override_dh_missing:
+	dh_missing --fail-missing
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='libgom-1.0-0-dbg (<< 0.3.2-1~)'