diff -Nru glom-1.30.4/debian/changelog glom-1.30.4/debian/changelog --- glom-1.30.4/debian/changelog 2020-02-24 03:42:29.000000000 +0000 +++ glom-1.30.4/debian/changelog 2020-03-09 21:12:58.000000000 +0000 @@ -1,9 +1,10 @@ -glom (1.30.4-5ubuntu1) focal; urgency=low +glom (1.30.4-6) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - Use the python3-embed pkg-config module. + * debian/rules: Fix FTBFS with python3.8 (Closes: #952416) + * debian/control.in: Bump Standards-Version to 4.5.0 (no further changes) + * debian/glom.install: Install the appdata file - -- Steve Langasek Sun, 23 Feb 2020 19:42:29 -0800 + -- Laurent Bigonville Mon, 09 Mar 2020 22:12:58 +0100 glom (1.30.4-5) unstable; urgency=medium @@ -12,30 +13,6 @@ -- Andreas Henriksson Mon, 10 Feb 2020 13:11:25 +0100 -glom (1.30.4-4ubuntu3) focal; urgency=medium - - * No-change rebuild against libboost-python1.71.0-py38 - - -- Steve Langasek Sun, 23 Feb 2020 20:47:57 +0000 - -glom (1.30.4-4ubuntu2) focal; urgency=medium - - * No change rebuild against new boost1.71 ABI - - -- Dimitri John Ledkov Mon, 03 Feb 2020 20:28:18 +0000 - -glom (1.30.4-4ubuntu1) focal; urgency=medium - - * Use the python3-embed pkg-config module. - - -- Matthias Klose Tue, 28 Jan 2020 13:04:02 +0100 - -glom (1.30.4-4build1) focal; urgency=medium - - * No-change rebuild to build with python3.8. - - -- Matthias Klose Sat, 25 Jan 2020 06:01:53 +0000 - glom (1.30.4-4) unstable; urgency=medium * Use postgresql-12 instead of postgresql-11 (Closes: #943895) @@ -61,4 +38,3 @@ * Initial release. (Closes: #258096) -- Jeremy Bicha Tue, 10 Apr 2018 14:35:35 -0400 - diff -Nru glom-1.30.4/debian/control glom-1.30.4/debian/control --- glom-1.30.4/debian/control 2020-02-24 02:12:27.000000000 +0000 +++ glom-1.30.4/debian/control 2020-03-09 21:12:58.000000000 +0000 @@ -5,9 +5,8 @@ Source: glom Section: gnome Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Jeremy Bicha +Maintainer: Debian GNOME Maintainers +Uploaders: Jeremy Bicha , Laurent Bigonville Build-Depends: debhelper (>= 11), dh-python, docbook-to-man, @@ -39,12 +38,12 @@ mm-common, postgresql-12, python-gi-dev, - python3-dev, + python3-dev (>= 3.8), python3-sphinx, xauth , xvfb , yelp-tools -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/gnome-team/glom Vcs-Git: https://salsa.debian.org/gnome-team/glom.git Homepage: http://www.glom.org/ diff -Nru glom-1.30.4/debian/control.in glom-1.30.4/debian/control.in --- glom-1.30.4/debian/control.in 2020-02-24 02:12:27.000000000 +0000 +++ glom-1.30.4/debian/control.in 2020-03-09 21:12:58.000000000 +0000 @@ -1,8 +1,7 @@ Source: glom Section: gnome Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian GNOME Maintainers +Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 11), dh-python, @@ -35,12 +34,12 @@ mm-common, postgresql-12, python-gi-dev, - python3-dev, + python3-dev (>= 3.8), python3-sphinx, xauth , xvfb , yelp-tools -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/gnome-team/glom Vcs-Git: https://salsa.debian.org/gnome-team/glom.git Homepage: http://www.glom.org/ diff -Nru glom-1.30.4/debian/glom.install glom-1.30.4/debian/glom.install --- glom-1.30.4/debian/glom.install 2020-02-24 02:12:27.000000000 +0000 +++ glom-1.30.4/debian/glom.install 2020-03-09 21:12:58.000000000 +0000 @@ -1,5 +1,6 @@ usr/bin/glom usr/lib/python* +usr/share/appdata usr/share/applications usr/share/glom usr/share/icons