diff -Nru fonts-ubuntu-0.83/debian/changelog fonts-ubuntu-0.83/debian/changelog --- fonts-ubuntu-0.83/debian/changelog 2020-11-19 14:31:20.000000000 +0000 +++ fonts-ubuntu-0.83/debian/changelog 2021-07-15 16:12:58.000000000 +0000 @@ -1,34 +1,9 @@ -fonts-ubuntu (0.83-4ubuntu2) hirsute; urgency=medium +fonts-ubuntu (0.83-2~16.04.sav0) xenial; urgency=medium - * Change directly the section in the control rather than using a - vendor override of the gencontrol target, that's not upstreamable to - Debian but easier for now. + * Backport to Xenial + * debian/compat: Set compat level to 10 (Launchpad sbuild highest for Xenial) - [ Gunnar Hjalmarsson ] - * debian/rules: - - Don't state section "non-free" when building for Ubuntu, and - prevent with that the packages from getting listed as non-free - when running vrms on Ubuntu (LP: #1754804). - - -- Sebastien Bacher Thu, 19 Nov 2020 15:31:20 +0100 - -fonts-ubuntu (0.83-4ubuntu1) disco; urgency=medium - - * Include Ubuntu-Th.ttf from the newer 0.84 version (lp: #1819135) - - -- Sebastien Bacher Fri, 08 Mar 2019 13:07:43 +0000 - -fonts-ubuntu (0.83-4) unstable; urgency=medium - - * Use dpkg-dev's pkg-info.mk instead of manually parsing dpkg-parsechanglog - - -- Jeremy Bicha Thu, 26 Apr 2018 11:06:04 -0400 - -fonts-ubuntu (0.83-3) unstable; urgency=medium - - * Add XS-Autobuild: yes. See Developer's Reference ยง 5.10.5 - - -- Jeremy Bicha Sat, 17 Mar 2018 18:08:12 -0400 + -- Rob Savoury Thu, 15 Jul 2021 09:12:58 -0700 fonts-ubuntu (0.83-2) unstable; urgency=medium diff -Nru fonts-ubuntu-0.83/debian/compat fonts-ubuntu-0.83/debian/compat --- fonts-ubuntu-0.83/debian/compat 2018-04-26 15:06:04.000000000 +0000 +++ fonts-ubuntu-0.83/debian/compat 2021-07-15 16:12:43.000000000 +0000 @@ -1 +1 @@ -11 +10 diff -Nru fonts-ubuntu-0.83/debian/control fonts-ubuntu-0.83/debian/control --- fonts-ubuntu-0.83/debian/control 2020-11-19 14:29:19.000000000 +0000 +++ fonts-ubuntu-0.83/debian/control 2018-02-28 22:05:22.000000000 +0000 @@ -1,12 +1,9 @@ Source: fonts-ubuntu -Section: fonts +Section: non-free/fonts Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Fonts Task Force +Maintainer: Debian Fonts Task Force Uploaders: Jeremy Bicha -XS-Autobuild: yes Build-Depends: debhelper (>= 11), - dpkg-dev, bdf2psf, otf2bdf Standards-Version: 4.1.3 @@ -45,7 +42,7 @@ Package: fonts-ubuntu-font-family-console Architecture: all Multi-Arch: foreign -Section: oldlibs +Section: non-free/oldlibs Depends: ${misc:Depends}, fonts-ubuntu-console Description: console version of the Ubuntu Mono font (transitional package) The Ubuntu Font Family is a set of contemporary sans-serif fonts developed @@ -62,7 +59,7 @@ Package: ttf-ubuntu-font-family Architecture: all Multi-Arch: foreign -Section: oldlibs +Section: non-free/oldlibs Depends: ${misc:Depends}, fonts-ubuntu Description: sans-serif font set from Ubuntu (transitional package) The Ubuntu Font Family is a set of contemporary sans-serif fonts developed diff -Nru fonts-ubuntu-0.83/debian/copyright fonts-ubuntu-0.83/debian/copyright --- fonts-ubuntu-0.83/debian/copyright 2018-04-26 15:06:04.000000000 +0000 +++ fonts-ubuntu-0.83/debian/copyright 2018-02-28 22:05:22.000000000 +0000 @@ -2,7 +2,7 @@ Upstream-Name: Ubuntu Font Family Upstream-Contact: Paul Sladen Source: https://design.ubuntu.com/font/ -Disclaimer: The Debian Project considers the Ubuntu Font License 1.0 to not be +Comment: The Debian Project considers the Ubuntu Font License 1.0 to not be an acceptable license for inclusion in Debian under the Debian Free Software Guidelines. Therefore, this package is only available in non-free. Also, Debian would prefer the font build from source in Debian instead of diff -Nru fonts-ubuntu-0.83/debian/rules fonts-ubuntu-0.83/debian/rules --- fonts-ubuntu-0.83/debian/rules 2018-04-26 15:06:04.000000000 +0000 +++ fonts-ubuntu-0.83/debian/rules 2018-02-28 22:05:22.000000000 +0000 @@ -1,9 +1,10 @@ #!/usr/bin/make -f -include /usr/share/dpkg/pkg-info.mk %: dh $@ --sourcedirectory=debian/console +DEB_VERSION_UPSTREAM_REVISION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed -e 's/^[0-9]*://') + override_dh_gencontrol: dh_gencontrol -pttf-ubuntu-font-family -- -v1:$(DEB_VERSION_UPSTREAM_REVISION) dh_gencontrol -pfonts-ubuntu-font-family-console -- -v1:$(DEB_VERSION_UPSTREAM_REVISION) diff -Nru fonts-ubuntu-0.83/debian/source/include-binaries fonts-ubuntu-0.83/debian/source/include-binaries --- fonts-ubuntu-0.83/debian/source/include-binaries 2019-03-08 13:07:43.000000000 +0000 +++ fonts-ubuntu-0.83/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -Ubuntu-Th.ttf Binary files /tmp/tmp8nhp5urp/KaSqgST_y9/fonts-ubuntu-0.83/Ubuntu-Th.ttf and /tmp/tmp8nhp5urp/InT7y6_5z8/fonts-ubuntu-0.83/Ubuntu-Th.ttf differ