diff -Nru aisleriot-3.22.4/debian/changelog aisleriot-3.22.4/debian/changelog
--- aisleriot-3.22.4/debian/changelog	2017-12-21 20:33:25.000000000 +0000
+++ aisleriot-3.22.4/debian/changelog	2018-01-25 12:59:31.000000000 +0000
@@ -1,3 +1,12 @@
+aisleriot (1:3.22.4-3) unstable; urgency=medium
+
+  * Update Vcs fields for migration to https://salsa.debian.org/
+  * Disable gconf support (Closes: #886088, #887317)
+  * Add debian/NEWS to notify users that previous statistics and preferences
+    will not be available after upgrading.
+
+ -- Jeremy Bicha <jbicha@debian.org>  Thu, 25 Jan 2018 07:59:31 -0500
+
 aisleriot (1:3.22.4-2) unstable; urgency=medium
 
   * Update Vcs fields for conversion to git
diff -Nru aisleriot-3.22.4/debian/control aisleriot-3.22.4/debian/control
--- aisleriot-3.22.4/debian/control	2017-12-21 20:33:25.000000000 +0000
+++ aisleriot-3.22.4/debian/control	2018-01-25 12:59:31.000000000 +0000
@@ -18,15 +18,14 @@
                libcanberra-gtk3-dev (>= 0.26),
                gobject-introspection (>= 0.6.3),
                libgirepository1.0-dev (>= 0.6.3),
-               libgconf2-dev,
                libglib2.0-dev (>= 2.32.0),
                libgtk-3-dev (>= 3.20.0),
                librsvg2-dev (>= 2.32.0),
                libsm-dev,
                pkg-config (>= 0.15)
 Standards-Version: 4.1.2
-Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/aisleriot.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/aisleriot.git
+Vcs-Browser: https://salsa.debian.org/gnome-team/aisleriot
+Vcs-Git: https://salsa.debian.org/gnome-team/aisleriot.git
 Homepage: https://wiki.gnome.org/Apps/Aisleriot
 
 Package: aisleriot
diff -Nru aisleriot-3.22.4/debian/control.in aisleriot-3.22.4/debian/control.in
--- aisleriot-3.22.4/debian/control.in	2017-12-21 20:33:25.000000000 +0000
+++ aisleriot-3.22.4/debian/control.in	2018-01-25 12:59:31.000000000 +0000
@@ -14,15 +14,14 @@
                libcanberra-gtk3-dev (>= 0.26),
                gobject-introspection (>= 0.6.3),
                libgirepository1.0-dev (>= 0.6.3),
-               libgconf2-dev,
                libglib2.0-dev (>= 2.32.0),
                libgtk-3-dev (>= 3.20.0),
                librsvg2-dev (>= 2.32.0),
                libsm-dev,
                pkg-config (>= 0.15)
 Standards-Version: 4.1.2
-Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/aisleriot.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/aisleriot.git
+Vcs-Browser: https://salsa.debian.org/gnome-team/aisleriot
+Vcs-Git: https://salsa.debian.org/gnome-team/aisleriot.git
 Homepage: https://wiki.gnome.org/Apps/Aisleriot
 
 Package: aisleriot
diff -Nru aisleriot-3.22.4/debian/NEWS aisleriot-3.22.4/debian/NEWS
--- aisleriot-3.22.4/debian/NEWS	1970-01-01 00:00:00.000000000 +0000
+++ aisleriot-3.22.4/debian/NEWS	2018-01-25 12:59:31.000000000 +0000
@@ -0,0 +1,6 @@
+aisleriot (1:3.22.4-3) unstable; urgency=medium
+
+  Aisleriot is no longer built with gconf support. Previous statistics and
+  preferences will not be available after upgrading.
+
+ -- Jeremy Bicha <jbicha@debian.org>  Thu, 25 Jan 2018 07:59:31 -0500
diff -Nru aisleriot-3.22.4/debian/rules aisleriot-3.22.4/debian/rules
--- aisleriot-3.22.4/debian/rules	2017-12-21 20:33:25.000000000 +0000
+++ aisleriot-3.22.4/debian/rules	2018-01-25 12:59:31.000000000 +0000
@@ -1,13 +1,8 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed
-
-# Disable gconf on Ubuntu
-ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
-        PLATFORM = --with-platform=gtk-only
-endif
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --with gnome
@@ -16,7 +11,7 @@
 	dh_auto_configure -- \
 		--bindir=\$${prefix}/games \
 		--with-pysol-card-theme-path=/usr/share/games/pysol \
-		$(PLATFORM)
+		-with-platform=gtk-only
 
 override_dh_autoreconf:
 	dh_autoreconf --as-needed
@@ -28,12 +23,5 @@
 	dh_makeshlibs -p aisleriot --no-act
 	dh_makeshlibs --remaining-packages
 
-# Only install gconf schemas if not Ubuntu
-override_dh_install:
-ifneq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
-	dh_install -p aisleriot debian/tmp/etc
-endif
-	dh_install --remaining-packages
-
 override_dh_missing:
 	dh_missing --fail-missing