diff -Nru fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/changelog fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/changelog
--- fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/changelog 2022-11-08 15:14:43.000000000 +0800
+++ fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/changelog 2024-10-17 17:20:08.000000000 +0800
@@ -1,3 +1,16 @@
+fonts-font-awesome (5.0.10+really4.7.0~dfsg-ok4) nile; urgency=medium
+
+ * Delete debian/compat
+
+ -- liwenjun <liwenjun@kylinos.cn> Thu, 17 Oct 2024 17:20:08 +0800
+
+fonts-font-awesome (5.0.10+really4.7.0~dfsg-ok3) nile; urgency=medium
+
+ * Backport upstream patch for missing files about sass.
+ * - Need by sphinx-rtd-theme.
+
+ -- liwenjun <liwenjun@kylinos.cn> Thu, 17 Oct 2024 17:06:05 +0800
+
fonts-font-awesome (5.0.10+really4.7.0~dfsg-ok2) yangtze; urgency=medium
* Build for openKylin.
diff -Nru fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/compat fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/compat
--- fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/compat 2022-11-08 15:14:43.000000000 +0800
+++ fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/compat 1970-01-01 08:00:00.000000000 +0800
@@ -1 +0,0 @@
-9
\ No newline at end of file
diff -Nru fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/control fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/control
--- fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/control 2022-11-08 15:14:43.000000000 +0800
+++ fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/control 2024-10-17 17:20:08.000000000 +0800
@@ -2,8 +2,10 @@
Section: fonts
Priority: optional
Maintainer: Openkylin Developers <packaging@lists.openkylin.top>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 4.1.4
+Build-Depends:
+ debhelper-compat (= 12),
+ jq,
+Standards-Version: 4.5.0
Homepage: http://fontawesome.io/
Vcs-Git: https://gitee.com/openkylin/fonts-font-awesome.git
Vcs-Browser: https://gitee.com/openkylin/fonts-font-awesome
@@ -11,8 +13,15 @@
Package: fonts-font-awesome
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}
-Enhances: ruby-sass, node-less, libjs-twitter-bootstrap
+Depends:
+ ${misc:Depends},
+Provides:
+ node-font-awesome (=${nodejs:Version}),
+ sass-stylesheets-fonts-awesome,
+Enhances:
+ libjs-twitter-bootstrap,
+ node-less,
+ sass,
Description: iconic font designed for use with Twitter Bootstrap
This font contains about 249 various icon glyphs. Glyphs are designed
as scalable vector graphics hence display very well at any screen
@@ -21,3 +30,7 @@
.
This package also provides Sass and LESS files to use webfonts from
this package.
+ .
+ Please note that this package provides Font Awesome 4
+ (not Font Awesome 5 or Font Awesome 6
+ which are different fonts with different licensing).
diff -Nru fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/fonts-font-awesome.maintscript fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/fonts-font-awesome.maintscript
--- fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/fonts-font-awesome.maintscript 1970-01-01 08:00:00.000000000 +0800
+++ fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/fonts-font-awesome.maintscript 2024-10-17 17:20:08.000000000 +0800
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/fonts-font-awesome/scss ../sass/font-awesome 5.0.10+really4.7.0~dfsg-5~
diff -Nru fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/install fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/install
--- fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/install 2022-11-08 15:14:43.000000000 +0800
+++ fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/install 2024-10-17 17:20:08.000000000 +0800
@@ -1,10 +1,5 @@
-fonts/fontawesome-webfont.ttf usr/share/fonts/truetype/font-awesome/
-fonts/fontawesome-webfont.svg usr/share/fonts/svg/font-awesome/
-fonts/fontawesome-webfont.eot usr/share/fonts/eot/font-awesome/
-fonts/fontawesome-webfont.woff usr/share/fonts/woff/font-awesome/
-fonts/fontawesome-webfont.woff2 usr/share/fonts/woff/font-awesome/
-fonts/FontAwesome.otf usr/share/fonts/opentype/font-awesome/
-
-less/ usr/share/fonts-font-awesome/
-css/ usr/share/fonts-font-awesome/
-scss/ usr/share/fonts-font-awesome/
\ No newline at end of file
+css fonts less usr/share/fonts-font-awesome
+fonts/FontAwesome.otf usr/share/fonts/opentype/font-awesome
+fonts/fontawesome-webfont.ttf usr/share/fonts/truetype/font-awesome
+package.json usr/share/nodejs/font-awesome
+scss/* usr/share/sass/font-awesome
diff -Nru fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/links fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/links
--- fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/links 2022-11-08 15:14:43.000000000 +0800
+++ fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/links 2024-10-17 17:20:08.000000000 +0800
@@ -1,7 +1,8 @@
-/usr/share/fonts/truetype/font-awesome/fontawesome-webfont.ttf /usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf
-/usr/share/fonts/eot/font-awesome/fontawesome-webfont.eot /usr/share/fonts-font-awesome/fonts/fontawesome-webfont.eot
-/usr/share/fonts/svg/font-awesome/fontawesome-webfont.svg /usr/share/fonts-font-awesome/fonts/fontawesome-webfont.svg
-/usr/share/fonts/woff/font-awesome/fontawesome-webfont.woff /usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff
-/usr/share/fonts/woff/font-awesome/fontawesome-webfont.woff2 /usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff2
-/usr/share/fonts/opentype/font-awesome/FontAwesome.otf /usr/share/fonts-font-awesome/fonts/FontAwesome.otf
-/usr/share/fonts-font-awesome /usr/share/javascript/font-awesome
+/usr/share/fonts-font-awesome /usr/share/javascript/font-awesome
+/usr/share/fonts-font-awesome/css /usr/share/nodejs/font-awesome/css
+/usr/share/fonts-font-awesome/fonts /usr/share/nodejs/font-awesome/fonts
+/usr/share/fonts-font-awesome/less /usr/share/nodejs/font-awesome/less
+/usr/share/fonts/opentype/font-awesome/FontAwesome.otf /usr/share/fonts-font-awesome/fonts/FontAwesome.otf
+/usr/share/fonts/truetype/font-awesome/fontawesome-webfont.ttf /usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf
+/usr/share/sass/font-awesome /usr/share/fonts-font-awesome/scss
+/usr/share/sass/font-awesome /usr/share/nodejs/font-awesome/scss
diff -Nru fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/rules fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/rules
--- fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/rules 2022-11-08 15:14:43.000000000 +0800
+++ fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/rules 2024-10-17 17:20:08.000000000 +0800
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
+
%:
dh "$@"
+
+override_dh_gencontrol:
+ dh_gencontrol -- -V"nodejs:Version=$(shell jq --raw-output .version < package.json)~$(DEB_VERSION)"
diff -Nru fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/tests/control fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/tests/control
--- fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/tests/control 2022-11-08 15:14:43.000000000 +0800
+++ fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/tests/control 2024-10-17 17:20:08.000000000 +0800
@@ -1,3 +1,21 @@
-# Test file existance and symlinks
-Tests: check-files
-Depends: @, bash
+Test-Command: debian/tests/check-files
+
+Test-Command: fc-list -q :family="font awesome"
+Depends:
+ fontconfig,
+ @,
+
+Test-Command: for f in /usr/share/fonts-font-awesome/css/*.css; do sassc $f /dev/null; done
+Depends:
+ sassc,
+ @,
+
+Test-Command: echo "@import 'font-awesome'" | sassc --load-path /usr/share/sass/font-awesome /dev/null
+Depends:
+ sassc,
+ @,
+
+Test-Command: lessc --strict-imports /usr/share/fonts-font-awesome/less/font-awesome.less /dev/null
+Depends:
+ node-less,
+ @,
diff -Nru fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/watch fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/watch
--- fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/watch 2022-11-08 15:14:43.000000000 +0800
+++ fonts-font-awesome-5.0.10+really4.7.0~dfsg/debian/watch 2024-10-17 17:20:08.000000000 +0800
@@ -1,3 +1,11 @@
-version = 4
-opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg//;s/^.*\+really//,repacksuffix=~dfsg \
- https://github.com/FortAwesome/Font-Awesome/tags .*/v(4\.\d.*)\.(?:tbz2|tgz|txz|tar\.(?:gz|bz2|xz))
+version=4
+# check: uscan --report
+# update: gbp import-orig --upstream-vcs-tag=vX.Y.Z --uscan
+
+opts=\
+uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,\
+repacksuffix=~dfsg,\
+filenamemangle=s/.*?(@ANY_VERSION@@ARCHIVE_EXT@)/@PACKAGE@-$1/,\
+dversionmangle=s/~dfsg//;s/^.*\+really// \
+https://github.com/FortAwesome/Font-Awesome/tags \
+.*?(4\.(?:\d+(?:\.\d+)*))@ARCHIVE_EXT@