Package: fonts-open-sans Severity: wishlist Tags: patch
Hello. The attached changes make update procedure a bit safer by preferring HTTPS, refusing to extract directories, and showing any other difference immediately. They can probably be applied to similar packages.
diff --git a/debian/README.Source b/debian/README.Source index 440f2c6..4df60a4 100644 --- a/debian/README.Source +++ b/debian/README.Source @@ -7,31 +7,17 @@ will ever be updated. The font is distributed in the form of a two zip files, open-sans.zip and open-sans-condensed.zip. These need to be repackaged to comply -with debian source package standards. +with Debian source package standards, which forbid this compressor. To find out if an update was released, you should download and unpack the fonts manually, then use otfdump to find out if they have a new version. - -Download the current font packages first: - -$ wget http://www.opensans.com/download/open-sans.zip http://www.opensans.com/download/open-sans-condensed.zip - -Unpack them into the source repository: - -$ unzip -o open-sans.zip -$ unzip -o open-sans-condensed.zip - - -Test if any of the files are tagged with a new version: - -$ for i in *.ttf; do echo $i; otfdump $i | grep '(nameID 5 "Version' ; done +# debian/rules udate-upstream This should print something like: -OpenSans-CondBold.ttf - (nameID 5 "Version 1.11") +OpenSans-Regular.ttf (nameID 5 "Version 1.10") for each of the fonts. Note that they may not all have the same version. @@ -41,7 +27,6 @@ $ git status shows that a file has changed, it is recommended to prepare a new release. - To accomplish this, debian/rules includes a script that does most of the work for you. Update the changelog first: @@ -52,10 +37,10 @@ or increment <PATCHLEVEL> if only some fonts have changed and the highest font version is still the same. Add a suitable changelog line. For example: New upstream release -Then save and run the tarball script (it uses wget and unzip): - -$ debian/rules get-orig-source +# debian/rules repack-orig This should produce a new ../fonts-open-sans_<version>.tar.xz file. Commit the updated TTFs and Debian changelog, then release the new package. + + -- Nicolas Boulenguez <nico...@debian.org>, Tue, 19 Nov 2019 15:20:15 +0100 diff --git a/debian/changelog b/debian/changelog index ecce744..23b7048 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +fonts-open-sans (1.11-2) unstable; urgency=medium + + [ Nicolas Boulenguez <nico...@debian.org> ] + * Improve script checking upstream versions. + * Update VCS-* fields to reference salsa.debian.org. + * Standards-Version: 4.4.1. Rules-Requires-Root: no. + HTTPS URL for copyright format. + * Debhelper: 12. + + -- Gregor Riepl <onit...@gmail.com> Tue, 19 Nov 2019 15:31:55 +0100 + fonts-open-sans (1.11-1) unstable; urgency=medium * Initial release. (Closes: #754785) diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index b867e5e..209d9a0 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,15 @@ Source: fonts-open-sans Section: fonts Priority: optional Build-Depends: - debhelper (>= 10) + debhelper-compat (= 12) Maintainer: Debian Fonts Task Force <pkg-fonts-de...@lists.alioth.debian.org> Uploaders: Gregor Riepl <onit...@gmail.com> -Standards-Version: 3.9.8 +Standards-Version: 4.4.1 Homepage: http://www.opensans.com/ -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-fonts/fonts-open-sans.git/ -Vcs-Git: https://anonscm.debian.org/git/pkg-fonts/fonts-open-sans.git +Rules-Requires-Root: no +Vcs-Browser: https://salsa.debian.org/pkg-fonts/fonts-open-sans +Vcs-Git: https://salsa.debian.org/pkg-fonts/fonts-open-sans.git Package: fonts-open-sans Architecture: all diff --git a/debian/copyright b/debian/copyright index 00a4d88..2d0ce8d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Open Sans Source: http://www.opensans.com/ @@ -9,7 +9,8 @@ License: Apache-2.0 Files: debian/* Copyright: - Copyright (c) 2017, Gregor Riepl <onit...@gmail.com> + 2017-2019 Gregor Riepl <onit...@gmail.com> + 2019 Nicolas Boulenguez <nico...@debian.org> License: Apache-2.0 License: Apache-2.0 diff --git a/debian/rules b/debian/rules index a20e681..441b1e1 100755 --- a/debian/rules +++ b/debian/rules @@ -4,11 +4,35 @@ include /usr/share/dpkg/pkg-info.mk %: dh $@ -.PHONY: get-orig-source -get-orig-source: - mkdir $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM) - wget http://www.opensans.com/download/open-sans.zip http://www.opensans.com/download/open-sans-condensed.zip - unzip -o open-sans.zip -d $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM) - unzip -o open-sans-condensed.zip -d $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM) -x "Apache License.txt" - tar -Jcf ../$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.xz $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM) - rm -rf $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM) open-sans.zip open-sans-condensed.zip +url := https://www.opensans.com/download +license := 'Apache License.txt' + +.PHONY: update-upstream +update-upstream: + # Quickly check the working directory before deleting files. + test -d debian -a -d .git + + wget $(url)/open-sans.zip $(url)/open-sans-condensed.zip + + # Report suspicious archive contents instead of extracting. + unzip -l open-sans.zip '*/*'; test $$? = 11 + unzip -l open-sans-condensed.zip '*/*'; test $$? = 11 + + rm $(license) *.ttf + unzip open-sans.zip + rm $(license) + unzip open-sans-condensed.zip + + rm open-sans.zip open-sans-condensed.zip + + for i in *.ttf; do \ + echo -n $$i; \ + otfdump $$i | grep 'nameID 5 "Version '; \ + done + git status + +.PHONY: repack-orig +repack--orig: + tar -caf ../$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.xz \ + --transform='s_^\._$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)_' \ + --exclude='debian' --exclude-vcs .
