diff -Nru bibtexparser-1.1.0+ds/debian/changelog bibtexparser-1.1.0+ds/debian/changelog
--- bibtexparser-1.1.0+ds/debian/changelog	2019-01-23 08:22:17.000000000 +0000
+++ bibtexparser-1.1.0+ds/debian/changelog	2019-08-01 12:53:24.000000000 +0000
@@ -1,3 +1,15 @@
+bibtexparser (1.1.0+ds-2) unstable; urgency=medium
+
+  * Team upload.
+  * Use debhelper-compat instead of debian/compat.
+  * Bump Standards-Version to 4.4.0.
+  * Use Python 3 for building docs.
+  * Drop Python 2 support.
+  * Bump debhelper compat level to 12.
+  * Fix doc-base.
+
+ -- Ondřej Nový <onovy@debian.org>  Thu, 01 Aug 2019 14:53:24 +0200
+
 bibtexparser (1.1.0+ds-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru bibtexparser-1.1.0+ds/debian/compat bibtexparser-1.1.0+ds/debian/compat
--- bibtexparser-1.1.0+ds/debian/compat	2019-01-23 08:22:17.000000000 +0000
+++ bibtexparser-1.1.0+ds/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru bibtexparser-1.1.0+ds/debian/control bibtexparser-1.1.0+ds/debian/control
--- bibtexparser-1.1.0+ds/debian/control	2019-01-23 08:22:17.000000000 +0000
+++ bibtexparser-1.1.0+ds/debian/control	2019-08-01 12:52:35.000000000 +0000
@@ -3,36 +3,19 @@
 Uploaders: Alexandre Mestiashvili <mestia@debian.org>
 Section: python
 Priority: optional
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 12),
                dh-python,
-               python-all,
-               python-future,
-               python-pyparsing,
-               python-setuptools,
-               python-sphinx,
-               python-unittest2,
                python3-all,
                python3-future,
                python3-pyparsing,
                python3-setuptools,
                python3-sphinx,
                python3-unittest2
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/python-team/modules/bibtexparser
 Vcs-Git: https://salsa.debian.org/python-team/modules/bibtexparser.git
 Homepage: https://github.com/sciunto-org/python-bibtexparser
 
-Package: python-bibtexparser
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Description: Python library to parse bibtex files
- The bibtexparser module provides parsing and writing of BibTeX files
- functionality. The parsed data is returned as a simple BibDatabase object
- with the main attribute being entries representing bibliographic sources
- such as books and journal articles.
- .
- This is the Python 2 version of the package
-
 Package: python3-bibtexparser
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
diff -Nru bibtexparser-1.1.0+ds/debian/python-bibtexparser-doc.doc-base bibtexparser-1.1.0+ds/debian/python-bibtexparser-doc.doc-base
--- bibtexparser-1.1.0+ds/debian/python-bibtexparser-doc.doc-base	2019-01-23 08:22:17.000000000 +0000
+++ bibtexparser-1.1.0+ds/debian/python-bibtexparser-doc.doc-base	2019-08-01 12:52:35.000000000 +0000
@@ -7,5 +7,5 @@
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-bibtexparser/html/index.html
-Files: /usr/share/doc/python-bibtexparser/html/*
+Index: /usr/share/doc/python-bibtexparser-doc/html/index.html
+Files: /usr/share/doc/python-bibtexparser-doc/html/*
diff -Nru bibtexparser-1.1.0+ds/debian/python-bibtexparser.docs bibtexparser-1.1.0+ds/debian/python-bibtexparser.docs
--- bibtexparser-1.1.0+ds/debian/python-bibtexparser.docs	2019-01-23 08:22:17.000000000 +0000
+++ bibtexparser-1.1.0+ds/debian/python-bibtexparser.docs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-CONTRIBUTORS.txt
diff -Nru bibtexparser-1.1.0+ds/debian/rules bibtexparser-1.1.0+ds/debian/rules
--- bibtexparser-1.1.0+ds/debian/rules	2019-01-23 08:22:17.000000000 +0000
+++ bibtexparser-1.1.0+ds/debian/rules	2019-08-01 12:52:19.000000000 +0000
@@ -10,7 +10,7 @@
 export LC_ALL=C.UTF-8
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build
diff -Nru bibtexparser-1.1.0+ds/debian/tests/control bibtexparser-1.1.0+ds/debian/tests/control
--- bibtexparser-1.1.0+ds/debian/tests/control	2019-01-23 08:22:17.000000000 +0000
+++ bibtexparser-1.1.0+ds/debian/tests/control	2019-08-01 12:52:19.000000000 +0000
@@ -1,7 +1,3 @@
-Tests: python-bibtexparser
-Depends: @, python-future, python-unittest2
-Restrictions: allow-stderr
-
 Tests: python3-bibtexparser
 Depends: @, python3-future, python3-unittest2
 Restrictions: allow-stderr
diff -Nru bibtexparser-1.1.0+ds/debian/tests/python-bibtexparser bibtexparser-1.1.0+ds/debian/tests/python-bibtexparser
--- bibtexparser-1.1.0+ds/debian/tests/python-bibtexparser	2019-01-23 08:22:17.000000000 +0000
+++ bibtexparser-1.1.0+ds/debian/tests/python-bibtexparser	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e -u -x
-cp -r bibtexparser/tests/ "$AUTOPKGTEST_TMP"
-cd "$AUTOPKGTEST_TMP/tests/"
-perl -i -pe 's{bibtexparser/tests/(data/?)}{$1}xmsg' *.py
-#export PYTHONWARNINGS=d
-# test suite requires python2.7
-LC_ALL=C.UTF-8 python2.7 -m unittest discover --verbose