Upstream moves to github

2 files changed, 11 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3ea72e79c71..01142eddc6fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-# Generated by makepkg 5.0.2
-# Thu Jan 18 10:15:11 UTC 2018
+# Generated by makepkg 5.1.3
+# Mon Apr 15 13:01:30 UTC 2019
 pkgbase = ttf-b612-git
 	pkgdesc = An highly legible open source font family designed and tested to be used on aircraft cockpit screens
-	pkgver = 1.003r3.bd14fde
+	pkgver = 1.008.r3.g48ac6ba
 	pkgrel = 1
 	url = http://b612-font.com/
 	arch = any
@@ -14,7 +14,7 @@ pkgbase = ttf-b612-git
 	provides = ttf-b612-mono
 	conflicts = ttf-b612
 	conflicts = ttf-b612-mono
-	source = git://git.polarsys.org/gitroot/b612/b612.git
+	source = git+https://github.com/polarsys/b612.git
 	md5sums = SKIP
 
 pkgname = ttf-b612-git
diff --git a/PKGBUILD b/PKGBUILD
index 5f58dc3d9047..3063ecb25348 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Étienne Deparis <etienne@depar.is>
 pkgname=ttf-b612-git
 _pkgname=ttf-b612
-pkgver=1.003r3.bd14fde
+pkgver=1.008.r3.g48ac6ba
 pkgrel=1
 pkgdesc="An highly legible open source font family designed and tested to be used on aircraft cockpit screens"
 arch=("any")
@@ -9,27 +9,24 @@ url="http://b612-font.com/"
 license=("EPL")
 depends=(fontconfig xorg-font-utils )
 makedepends=("git")
-source=("git://git.polarsys.org/gitroot/b612/b612.git")
+source=("git+https://github.com/polarsys/b612.git")
 md5sums=("SKIP")
 provides=("ttf-b612" "ttf-b612-mono")
 conflicts=("ttf-b612" "ttf-b612-mono")
 
 pkgver() {
-  cd $srcdir/b612
-  printf "1.003r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd $srcdir/b612
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 package() {
   cd $srcdir/b612
   install -d -m755 "$pkgdir/usr/share/licenses/$_pkgname"
   install -D -m644 edl-v10.html "$pkgdir/usr/share/licenses/$_pkgname/edl-v10.html"
-  install -D -m644 epl-v10.html "$pkgdir/usr/share/licenses/$_pkgname/epl-v10.html"
+  install -D -m644 EPL-2.0.html "$pkgdir/usr/share/licenses/$_pkgname/EPL-2.0.html"
+  install -D -m644 OFL.txt "$pkgdir/usr/share/licenses/$_pkgname/OFL.txt"
 
   install -d -m755 "$pkgdir/usr/share/fonts/TTF"
-  cd TTF
-  mv "B612 Mono-BoldItalic.ttf" "B612-Mono-BoldItalic.ttf"
-  mv "B612 Mono-Bold.ttf" "B612-Mono-Bold.ttf"
-  mv "B612 Mono-Italic.ttf" "B612-Mono-Italic.ttf"
-  mv "B612 Mono-Regular.ttf" "B612-Mono-Regular.ttf"
+  cd fonts/ttf
   find . -name "*.ttf" -exec install -D -m644 "{}" "$pkgdir/usr/share/fonts/TTF/{}" \;
 }