sync upstream config

debian/changelog

@@ -1,3 +1,9 @@
+fonts-noto (20201225-ok1) nile; urgency=medium
+
+  * Sync upstream version.
+
+ -- zhouganqing <zhouganqing@kylinos.cn>  Tue, 14 May 2024 16:24:09 +0800
+
 fonts-noto (20200323-ok1) yangtze; urgency=medium
 
   * Build for openKylin.

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -1,28 +1,25 @@
 Source: fonts-noto
 Priority: optional
 Section: fonts
-Build-Depends: 
+Build-Depends:
  cdbs,
  debhelper,
  lcdf-typetools,
-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
+Maintainer: openKylin Developers <packaging@lists.openkylin.top>
-Uploaders: 
- Jonas Smedegaard <dr@jones.dk>,
- Vasudev Kamath <vasudev@copyninja.info>,
 Standards-Version: 4.5.0
 Homepage: https://www.google.com/get/noto/
-Vcs-Git: https://salsa.debian.org/fonts-team/fonts-noto.git
+Vcs-Git: https://gitee.com/openkylin/fonts-noto.git
-Vcs-Browser: https://salsa.debian.org/fonts-team/fonts-noto
+Vcs-Browser: https://gitee.com/openkylin/fonts-noto
 Rules-Requires-Root: no
 
 Package: fonts-noto
 Section: metapackages
 Architecture: all
 Multi-Arch: foreign
-Depends: 
+Depends:
  fonts-noto-core,
  ${misc:Depends},
-Recommends: 
+Recommends:
  fonts-noto-cjk,
  fonts-noto-cjk-extra,
  fonts-noto-color-emoji,
@@ -48,16 +45,17 @@ Description: metapackage to pull in all Noto fonts
 Package: fonts-noto-core
 Architecture: all
 Multi-Arch: foreign
-Depends: 
+Depends:
  ${misc:Depends},
-Breaks: 
+ fonts-noto-mono,
- fonts-noto (<< 2015-05-11+cjk-0),
+Breaks:
- fonts-noto-hinted (<< 20181130-0),
+ fonts-noto (<< 2015-05-11+cjk-1~),
- fonts-noto-unhinted (<< 20181227-0),
+ fonts-noto-hinted (<< 20181130-2~),
-Replaces: 
+ fonts-noto-unhinted (<< 20201027-1~),
- fonts-noto (<< 2015-05-11+cjk-0),
+Replaces:
- fonts-noto-hinted (<< 20181130-0),
+ fonts-noto (<< 2015-05-11+cjk-1~),
- fonts-noto-unhinted (<< 20181227-0),
+ fonts-noto-hinted (<< 20181130-2~),
+ fonts-noto-unhinted (<< 20201027-1~),
 Description: "No Tofu" font families with large Unicode coverage (core)
  Noto is a collection of font families,
  each visually harmonized across scripts.
@@ -66,6 +64,9 @@ Description: "No Tofu" font families with large Unicode coverage (core)
  .
  ${fonts:familylist}
  .
+ This package also pulls the fonts-noto-mono package to make up a
+ base package set with Noto fonts.
+ .
  The name "Noto" is short for "No Tofu",
  describing the aim of covering all living Unicode scripts
  (currently ${fonts:scriptcount} are covered, at least partly.
@@ -77,14 +78,15 @@ Description: "No Tofu" font families with large Unicode coverage (core)
 Package: fonts-noto-extra
 Architecture: all
 Multi-Arch: foreign
-Depends: 
+Depends:
  ${misc:Depends},
-Breaks: 
+Breaks:
- fonts-noto-unhinted (<< 20181227-0),
+ fonts-noto-unhinted (<< 20201027-1~),
-Replaces: 
+Replaces:
- fonts-noto-unhinted (<< 20181227-0),
+ fonts-noto-unhinted (<< 20201027-1~),
-Enhances: 
+Enhances:
  fonts-noto-core,
+ fonts-noto-mono,
 Description: "No Tofu" font families with large Unicode coverage (extra)
  Noto is a collection of font families,
  each visually harmonized across scripts.
@@ -104,18 +106,18 @@ Description: "No Tofu" font families with large Unicode coverage (extra)
 Package: fonts-noto-ui-core
 Architecture: all
 Multi-Arch: foreign
-Depends: 
+Depends:
  ${misc:Depends},
-Suggests: 
+Suggests:
  fonts-noto-core,
-Breaks: 
+Breaks:
- fonts-noto (<< 2015-05-11+cjk-0),
+ fonts-noto (<< 2015-05-11+cjk-1~),
- fonts-noto-hinted (<< 20181130-0),
+ fonts-noto-hinted (<< 20181130-2~),
- fonts-noto-unhinted (<< 20181227-0),
+ fonts-noto-unhinted (<< 20181227-2~),
-Replaces: 
+Replaces:
- fonts-noto (<< 2015-05-11+cjk-0),
+ fonts-noto (<< 2015-05-11+cjk-1~),
- fonts-noto-hinted (<< 20181130-0),
+ fonts-noto-hinted (<< 20181130-2~),
- fonts-noto-unhinted (<< 20181227-0),
+ fonts-noto-unhinted (<< 20181227-2~),
 Description: "No Tofu" font families with large Unicode coverage (UI core)
  Noto is a collection of font families,
  each visually harmonized across scripts.
@@ -137,15 +139,15 @@ Description: "No Tofu" font families with large Unicode coverage (UI core)
 Package: fonts-noto-ui-extra
 Architecture: all
 Multi-Arch: foreign
-Depends: 
+Depends:
  ${misc:Depends},
-Suggests: 
+Suggests:
  fonts-noto-extra,
-Breaks: 
+Breaks:
- fonts-noto-unhinted (<< 20181227-0),
+ fonts-noto-unhinted (<< 20201027-1~),
-Replaces: 
+Replaces:
- fonts-noto-unhinted (<< 20181227-0),
+ fonts-noto-unhinted (<< 20201027-1~),
-Enhances: 
+Enhances:
  fonts-noto-ui-core,
 Description: "No Tofu" font families with large Unicode coverage (UI extra)
  Noto is a collection of font families,
@@ -169,7 +171,7 @@ Package: fonts-noto-hinted-udeb
 Package-Type: udeb
 Section: debian-installer
 Architecture: all
-Depends: 
+Depends:
  ${misc:Depends},
 Description: "No Tofu" font families with large Unicode coverage (d-i default)
  Noto is a collection of font families,
@@ -181,17 +183,20 @@ Description: "No Tofu" font families with large Unicode coverage (d-i default)
 Package: fonts-noto-unhinted
 Architecture: all
 Multi-Arch: foreign
-Depends: 
+Depends:
  ${misc:Depends},
-Enhances: 
+Enhances:
- fonts-noto-hinted,
+ fonts-croscore,
+ fonts-noto-core,
+ fonts-noto-extra,
+ fonts-noto-mono,
 Description: "No Tofu" font families with large Unicode coverage (unhinted)
  Noto is a collection of font families,
  each visually harmonized across scripts.
  .
  This package contains Noto font families which lacks hinting:
  .
- ${fonts:familylist}
+ [ currently this package is empty: all Noto families has hinting ]
  .
  The name "Noto" is short for "No Tofu",
  describing the aim of covering all living Unicode scripts
@@ -205,7 +210,7 @@ Package: fonts-noto-unhinted-udeb
 Package-Type: udeb
 Section: debian-installer
 Architecture: all
-Depends: 
+Depends:
  ${misc:Depends},
 Description: "No Tofu" font families with large Unicode coverage (d-i optional)
  Noto is a collection of font families,
@@ -217,16 +222,23 @@ Description: "No Tofu" font families with large Unicode coverage (d-i optional)
 Package: fonts-noto-mono
 Architecture: all
 Multi-Arch: foreign
-Depends: 
+Depends:
  ${misc:Depends},
-Enhances: 
+Breaks:
- fonts-noto-hinted,
+ fonts-noto-core (<< 20201027-2~),
+ fonts-noto-unhinted (<< 20201027-3~),
+Replaces:
+ fonts-noto-core (<< 20201027-2~),
+ fonts-noto-unhinted (<< 20201027-3~),
+Enhances:
+ fonts-noto-core,
 Description: "No Tofu" monospaced font family with large Unicode coverage
  Noto is a collection of font families,
  each visually harmonized across scripts.
  .
- This package contains Noto Mono font family,
+ This package contains Noto Mono font family
- formerly known as Droid Mono.
+ (formerly known as Droid Mono),
+ and core weights for the Noto Sans Mono font family.
  Beware that Noto Mono has a much smaller repertoire
  than Noto Sans or Noto Serif.
  .
@@ -240,9 +252,9 @@ Description: "No Tofu" monospaced font family with large Unicode coverage
 Package: fonts-croscore
 Architecture: all
 Multi-Arch: foreign
-Depends: 
+Depends:
  ${misc:Depends},
-Suggests: 
+Suggests:
  fonts-crosextra-caladea,
  fonts-crosextra-carlito,
 Description: width-compatible fonts for improved on-screen readability
@@ -261,7 +273,7 @@ Package: fonts-noto-hinted
 Section: oldlibs
 Architecture: all
 Multi-Arch: foreign
-Depends: 
+Depends:
  fonts-noto-core,
  fonts-noto-ui-core,
 Description: obsolete metapackage to pull in a subset of Noto fonts

debian/copyright

@@ -3,19 +3,22 @@ Upstream-Name: Noto
 Upstream-Contact: https://github.com/googlei18n/noto-fonts/issues
  http://groups.google.com/group/noto-font
 Source: https://github.com/googlei18n/noto-fonts
- git://github.com/googlei18n/noto-fonts
 
 Files: *
-Copyright: 2010,2012-2020, Google Inc.
+Copyright:
+  2010,2012-2020, Google Inc.
+  2015-2020, Google LLC.
 License-Grant:
  This Font Software is licensed under the SIL Open Font License,
  Version 1.1.
 License: OFL-1.1
 
-Files: debian/*
+Files:
+ debian/*
 Copyright:
+  2013-2020, Jonas Smedegaard <dr@jones.dk>
+  2020, Purism, SPC
   2013, Vasudev Kamath <kamathvasudev@gmail.com>
-  2013-2018, Jonas Smedegaard <dr@jones.dk>
 License-Grant:
  This program is free software;
  you can redistribute it and/or modify it
@@ -24,16 +27,15 @@ License-Grant:
  either version 3, or (at your option) any later version.
 License: GPL-3+
 
-Files: debian/NotoMono/NotoMono-Regular.ttf
+Files:
-Copyright: 2007, Google Inc.
+ debian/NotoMono/NotoMono-Regular.ttf
+Copyright:
+  2007, Google Inc.
 License-Grant:
  This Font Software is licensed under the SIL Open Font License,
  Version 1.1.
 License: OFL-1.1
 
-License: Apache-2.0
-License-Reference: /usr/share/common-licenses/Apache-2.0
-
 License: OFL-1.1
  PREAMBLE
  .

debian/copyright-check

@@ -1,5 +1,6 @@
 #!/bin/sh
-# Copyright © 2016-2017  Jonas Smedegaard <dr@jones.dk>
+# Copyright 2020  Jonas Smedegaard <dr@jones.dk>
+# Copyright 2020  Purism, SPC
 # Description: helper script to update copyright_hints
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,12 +18,70 @@
 
 set -eu
 
-# extract metadata from binary files before copyright check
+SKIPFILES='meta'
-export DEB_COPYRIGHT_EXTRACT_EXTS="gif jpg png ttc"
-export DEB_COPYRIGHT_EXTRACT_PATHS_EXIF=".*.ttf .*.otf"
 
-make -f /usr/share/cdbs/1/rules/utils.mk pre-build || true
+# cleanup stray hint files from a previous run
-make -f /usr/share/cdbs/1/rules/utils.mk clean DEB_COPYRIGHT_CHECK_STRICT=1
+find -type f -regextype posix-egrep -regex "^.*:($SKIPFILES)$" -delete
 
-# unconditionally merge changes - safe to do with git-tracked package
+1>&2 echo 'omit files unlikely to contain copyright or license info ...'
-[ ! -f debian/copyright_newhints ] || mv -f debian/copyright_newhints debian/copyright_hints
+RE_omit='FAQ-KR\.md'
+
+1>&2 echo 'extract metadata from binary files ...'
+RE_meta='.*\.(gif|jpg|otf|png|ttc|ttf)'
+exiftool '-textOut!' %d%f.%e:meta -short -short -recurse -ext gif -ext jpg -ext otf -ext png -ext ttc -ext ttf .
+
+RE_SKIP="$RE_omit|$RE_meta"
+
+# directories more closely aligned
+RE_cmap='Resource/CMap/.*'
+
+# licensing patterns misdetected by licensecheck
+RE_ghostscript=$(grep --files-with-matches --recursive --null \
+ --regexp='license contained in the file LICENSE in this distribution' \
+ | tr '\0' '|' | sed -e 's/|$//')
+
+RE_artifex=$(grep --files-with-matches --recursive --null \
+ --regexp='Refer to licensing information at http://www.artifex.com' \
+ | tr '\0' '|' | sed -e 's/|$//')
+
+# TODO: automate more of this manual cleanup:
+#  * strip garbage copyright holders
+#  * optionally merge equally licensed Files sections
+#  * do "sort -k2 -k1,1 -u" on copyright holders
+#  * merge copyright years for each copyright holder
+# TODO: strip files matching glob in current (only, no later) section
+_licensecheck() {
+	GLOB=$1
+	shift
+	case "$GLOB" in
+		'*') 1>&2 echo "check default section(s) ...";;
+		'') 1>&2 echo "check remaining upstream section(s) ...";;
+		*) 1>&2 echo "check section(s) $GLOB ...";;
+	esac
+	licensecheck --copyright --deb-machine --recursive --lines 0 "$@" -- * \
+		| GLOB=$GLOB SKIPFILES=$SKIPFILES perl -0777 -p \
+		-e 'BEGIN { our $GLOB = join "\n ", split(" ",$ENV{GLOB}) }' \
+		-e 's/^.*?\n\nFiles: \K/$GLOB\n /s if $GLOB;' \
+		-e 's/^.*?\n\nFiles: \K.*?(?=\n\w)/$GLOB/s if $GLOB and $GLOB =~ /^[*]\//;' \
+		-e 's/^.*?\n\n//s unless $GLOB and $GLOB =~ /^[*]$/m;' \
+		-e 's/^Files:\K /\n /mg;' \
+		-e 's/^Copyright:\K /\n  /mg;' \
+		-e 's/(?:(?<=^  )|(?<=\d{4})),\K (?=\d{4})//mg;' \
+		-e 's/:(?:$ENV{SKIPFILES})$//mg;' \
+		>> debian/copyright_hints
+}
+
+rm -f debian/copyright_hints
+
+# initially, check all to know roughly what to group and in which order
+#rm -f debian/copyright_hints
+#_licensecheck '' --check '.*' --ignore "^($RE_SKIP|debian/.*)$"
+#exit 0
+
+# check generally
+#  * omit non-copyright-protected Debian files
+_licensecheck '*' --check '.*' --ignore "^($RE_SKIP|debian/.*)$"
+_licensecheck '*/debian' --check '^debian/' --ignore "^($RE_SKIP|debian/(changelog|copyright(_hints)?|source/lintian-overrides))$"
+
+# cleanup hint files
+find -type f -regextype posix-egrep -regex "^.*:($SKIPFILES)$" -delete

debian/gbp.conf

@@ -1,5 +0,0 @@
-# Configuration file for git-buildpackage and friends
-
-[DEFAULT]
-pristine-tar = False
-sign-tags = True

debian/rules

@@ -34,24 +34,24 @@ weights := $(weights) $(foreach distortion,ExtraCondensed Condensed SemiCondense
  $(patsubst %,$(distortion)%,$(weights)))
 weights := $(patsubst Neutral,Regular,$(weights))
 weights := $(subst Neutral,,$(weights))
-weights-core = Bold BoldItalic Regular Italic
+weights-core = Bold BoldItalic Italic Regular
 weights-extra = $(filter-out $(weights-core),$(weights))
-filter-core = %-Bold.ttf %-BoldItalic.ttf %-Italic.ttf %-Regular.ttf
+filter-core = $(foreach weight,$(weights-core),%-$(weight).ttf)
+filter-mono = $(foreach stem,SansMono,$(foreach weight,$(weights-core),%/Noto$(stem)-$(weight).ttf))
 filter-extra = $(foreach weight,$(weights-extra),%-$(weight).ttf)
 filter-core-ui = $(subst %,%UI,$(filter-core))
 filter-extra-ui = $(subst %,%UI,$(filter-extra))
 _filters = $(filter $(filter-$(1)),\
- $(if $(2),\
+ $(filter-out $(foreach exception,$(2),$(filter-$(exception))),$(3)))
-  $(filter-out $(filter-$(2)),$(3)),\
+fonts-hinted-all = $(wildcard hinted/ttf/*/Noto*.ttf)
-  $(3)))
+fonts-unhinted-all = $(wildcard unhinted/ttf/*/Noto*.ttf)
-fonts-hinted-all = $(wildcard hinted/*/Noto*.ttf)
-fonts-unhinted-all = $(wildcard unhinted/*/Noto*.ttf)
 fonts-ui-core = $(call _filters,core-ui,,$(fonts-hinted-all))
 fonts-ui-extra = $(call _filters,extra-ui,,$(fonts-hinted-all))
-fonts-core = $(call _filters,core,core-ui,$(fonts-hinted-all))
+fonts-core = $(call _filters,core,mono core-ui,$(fonts-hinted-all))
+fonts-mono = $(call _filters,mono,extra,$(fonts-hinted-all))
 fonts-extra = $(call _filters,extra,extra-ui,$(fonts-hinted-all))
-fonts-croscore = $(wildcard hinted/Arimo/Arimo*.ttf hinted/Cousine/Cousine*.ttf hinted/Tinos/Tinos*.ttf)
+fonts-croscore = $(wildcard $(foreach stem,Arimo Cousine Tinos,hinted/ttf/$(stem)/$(stem)*.ttf))
-fonts-shipped-noto = $(fonts-core) $(fonts-extra)
+fonts-shipped-noto = $(fonts-core) $(fonts-extra) $(fonts-mono)
 fonts-shipped-all = $(fonts-shipped-noto) $(fonts-ui-core) $(fonts-ui-extra) $(fonts-croscore) $(fonts-unhinted-all)
 fonts-nothinted = $(filter-out $(subst hinted,unhinted,$(fonts-shipped-all)),$(fonts-unhinted-all))
 fonts-missed = $(filter-out $(notdir $(fonts-shipped-all)),$(notdir $(fonts-hinted-all) $(fonts-unhinted-all)))
@@ -60,10 +60,10 @@ $(if $(fonts-missed),$(warning Fonts missed in Debian packaging: $(fonts-missed)
 
 # use unhinted fonts in udeb, and split by what debian-installer needs
 fonts-udeb-di = $(filter \
- unhinted/NotoSansSinhala/NotoSansSinhala-Bold.ttf \
+ unhinted/ttf/NotoSansSinhala/NotoSansSinhala-Bold.ttf \
- unhinted/NotoSansSinhala/NotoSansSinhala-Regular.ttf \
+ unhinted/ttf/NotoSansSinhala/NotoSansSinhala-Regular.ttf \
- unhinted/NotoSerifGujarati/NotoSerifGujarati-Bold.ttf \
+ unhinted/ttf/NotoSerifGujarati/NotoSerifGujarati-Bold.ttf \
- unhinted/NotoSerifGujarati/NotoSerifGujarati-Regular.ttf \
+ unhinted/ttf/NotoSerifGujarati/NotoSerifGujarati-Regular.ttf \
  ,$(call _filters,core,core-ui,$(fonts-unhinted-all)))
 fonts-udeb-extra = $(call _filters,core,core-ui,$(fonts-unhinted-all))
 
@@ -78,11 +78,13 @@ fonts-scriptcount = $(shell \
  | grep -c .)
 
 # Install fonts
+# TODO: add nothinted when non-empty - and then update long description
+flavors = core mono extra ui-core ui-extra udeb-di udeb-extra
 DEB_DH_INSTALL_ARGS_$(pkg-croscore) = $(fonts-croscore) usr/share/fonts/truetype/croscore/
 define _installvar =
 DEB_DH_INSTALL_ARGS_$$(pkg-$(1)) = $$(fonts-$(1)) usr/share/fonts/truetype/noto/
 endef
-$(foreach flavor,core extra ui-core ui-extra udeb-di nothinted udeb-extra,\
+$(foreach flavor,$(flavors),\
  $(eval $(call _installvar,$(flavor))))
 
 # install bug-* files into all binary packages

debian/source/lintian-overrides

@@ -1,5 +1,3 @@
 # License is in License-Reference field (see bug#786450)
-missing-license-paragraph-in-dep5-copyright apache-2\.0 *
 missing-license-paragraph-in-dep5-copyright gpl-3\+ *
-missing-license-text-in-dep5-copyright Apache-2\.0 *
 missing-license-text-in-dep5-copyright GPL-3\+ *