diff -Nru astroid2-1.6.5/debian/changelog astroid2-1.6.5/debian/changelog
--- astroid2-1.6.5/debian/changelog	2018-09-23 12:41:44.000000000 +0000
+++ astroid2-1.6.5/debian/changelog	2018-12-25 23:12:21.000000000 +0000
@@ -1,3 +1,13 @@
+astroid2 (1.6.5-3) unstable; urgency=medium
+
+  * debian/watch
+    - track only 1.x releases
+  * debian/control
+    - setup a proper, independent git repo for src:astroid2
+    - bump Standards-Version to 4.3.0 (no changes needed)
+
+ -- Sandro Tosi <morph@debian.org>  Tue, 25 Dec 2018 18:12:21 -0500
+
 astroid2 (1.6.5-2) unstable; urgency=medium
 
   Team upload.
diff -Nru astroid2-1.6.5/debian/control astroid2-1.6.5/debian/control
--- astroid2-1.6.5/debian/control	2018-09-23 12:41:20.000000000 +0000
+++ astroid2-1.6.5/debian/control	2018-12-25 23:12:21.000000000 +0000
@@ -4,10 +4,10 @@
 Maintainer: Sandro Tosi <morph@debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 9.0.0), python, dh-python, python-setuptools, python-nose, python-wrapt, python-lazy-object-proxy, python-singledispatch, python-enum34
-Standards-Version: 4.1.4
+Standards-Version: 4.3.0
 Homepage: http://www.astroid.org/
-Vcs-Git: https://salsa.debian.org/python-team/modules/astroid.git -b astroid2
-Vcs-Browser: https://salsa.debian.org/python-team/modules/astroid
+Vcs-Git: https://salsa.debian.org/python-team/modules/astroid2.git
+Vcs-Browser: https://salsa.debian.org/python-team/modules/astroid2
 
 Package: python-astroid
 Architecture: all
diff -Nru astroid2-1.6.5/debian/watch astroid2-1.6.5/debian/watch
--- astroid2-1.6.5/debian/watch	2018-08-30 19:45:44.000000000 +0000
+++ astroid2-1.6.5/debian/watch	2018-12-25 23:12:21.000000000 +0000
@@ -1,3 +1,3 @@
 version=3
 opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
-https://pypi.debian.net/astroid/astroid-([0-9.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+https://pypi.debian.net/astroid/astroid-(1.[0-9.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))