diff -Nru netatalk-3.1.12~ds/debian/changelog netatalk-3.1.12~ds/debian/changelog
--- netatalk-3.1.12~ds/debian/changelog	2019-03-01 23:32:52.000000000 +0000
+++ netatalk-3.1.12~ds/debian/changelog	2019-10-11 17:11:33.000000000 +0000
@@ -1,3 +1,13 @@
+netatalk (3.1.12~ds-4) unstable; urgency=medium
+
+  * Fix Vcs-Git URL.
+  * Extend patch 101 to support cross-building.
+    Closes: Bug#942185. Thanks to Helmut Grohne.
+  * Declare compliance with Debian Policy 4.2.1.
+  * Set Rules-Requires-Root: no.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Fri, 11 Oct 2019 19:11:33 +0200
+
 netatalk (3.1.12~ds-3) unstable; urgency=medium
 
   * Update autopkgtest: Add sbin paths to PATH.
diff -Nru netatalk-3.1.12~ds/debian/control netatalk-3.1.12~ds/debian/control
--- netatalk-3.1.12~ds/debian/control	2019-02-23 10:03:34.000000000 +0000
+++ netatalk-3.1.12~ds/debian/control	2019-10-11 17:10:14.000000000 +0000
@@ -31,10 +31,11 @@
  tracker,
 Build-Conflicts:
  libavahi-compat-libdnssd-dev,
-Vcs-Git: https://salsa.debian.org:netatalk-team/netatalk.git
+Vcs-Git: https://salsa.debian.org/netatalk-team/netatalk.git
 Vcs-Browser: https://salsa.debian.org/netatalk-team/netatalk
-Standards-Version: 4.2.1
+Standards-Version: 4.4.1
 Homepage: http://netatalk.sourceforge.net/
+Rules-Requires-Root: no
 
 Package: netatalk
 Architecture: any
diff -Nru netatalk-3.1.12~ds/debian/copyright_hints netatalk-3.1.12~ds/debian/copyright_hints
--- netatalk-3.1.12~ds/debian/copyright_hints	2019-02-18 11:53:57.000000000 +0000
+++ netatalk-3.1.12~ds/debian/copyright_hints	2019-10-11 17:11:33.000000000 +0000
@@ -48,6 +48,7 @@
  debian/patches/101_shared_libs.patch
  debian/patches/102_python3.patch
  debian/patches/103_fix_typos.patch
+ debian/patches/104_modernize_systemd.patch
  debian/patches/106_fix_BerkeleyDB_multiarch_support.patch
  debian/patches/114_fix_macusers_ps_parsing.patch
  debian/patches/201_embedded_libs.patch
diff -Nru netatalk-3.1.12~ds/debian/patches/101_shared_libs.patch netatalk-3.1.12~ds/debian/patches/101_shared_libs.patch
--- netatalk-3.1.12~ds/debian/patches/101_shared_libs.patch	2019-02-18 10:00:39.000000000 +0000
+++ netatalk-3.1.12~ds/debian/patches/101_shared_libs.patch	2019-10-11 17:06:32.000000000 +0000
@@ -101,7 +101,17 @@
  
 --- a/macros/netatalk.m4
 +++ b/macros/netatalk.m4
-@@ -264,6 +264,31 @@
+@@ -156,7 +156,8 @@
+     AC_ARG_WITH([tracker-prefix],
+       [AS_HELP_STRING([--with-tracker-prefix=PATH],[Prefix of Tracker (default: none)])],
+       [ac_cv_tracker_prefix=$withval],
+-      [ac_cv_tracker_prefix="`pkg-config --variable=prefix tracker-sparql-$ac_cv_tracker_pkg_version`"]
++      [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++       ac_cv_tracker_prefix="`$PKG_CONFIG --variable=prefix tracker-sparql-$ac_cv_tracker_pkg_version`"]
+     )
+ 
+     AC_ARG_WITH([tracker-install-prefix],
+@@ -264,6 +265,31 @@
      AM_CONDITIONAL(USE_BUILTIN_TDB, test x"$use_bundled_tdb" = x"yes")
  ])