[PATCH] gnu: Rename fonts according to our new naming scheme.

[PATCH] gnu: Rename fonts according to our new naming scheme.

[Andreas Enge]

What do you think of keeping "gnu" as a foundry in the third font?
There I added "-ttf"; so far, this is the only format we have packaged,
but the ftp site provides more formats in separate tarballs.

If someone interested in fonts feels up to it, there is a newer version
20120503, but as a .zip instead of a .tar.gz. Is that why it is not suggested
by "guix refresh"?

Andreas


* gnu/packages/fonts.scm (ttf-dejavu): Rename to ...
* gnu/packages/fonts.scm (font-dejavu): ... this.
* gnu/packages/fonts.scm (ttf-bitstream-vera): Rename to ...
* gnu/packages/fonts.scm (font-bitstream-vera): ... this.
* gnu/packages/fonts.scm (freefont-ttf): Rename to ...
* gnu/packages/fonts.scm (font-gnu-freefont-ttf): ... this.
* gnu/packages/fonts.scm (terminus-font): Rename to ...
* gnu/packages/fonts.scm (font-terminus): ... this.
---
 gnu/packages/fonts.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 0181420..74cfc9d 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -32,9 +32,9 @@
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages pkg-config))
 
-(define-public ttf-dejavu
+(define-public font-dejavu
   (package
-    (name "ttf-dejavu")
+    (name "font-dejavu")
     (version "2.34")
     (source (origin
              (method url-fetch)
@@ -98,9 +98,9 @@ provide serif, sans and monospaced variants.")
      (license:x11-style
       "http://dejavu-fonts.org/"))))
 
-(define-public ttf-bitstream-vera
+(define-public font-bitstream-vera
   (package
-    (name "ttf-bitstream-vera")
+    (name "font-bitstream-vera")
     (version "1.10")
     (source (origin
              (method url-fetch)
@@ -152,9 +152,9 @@ package provides the TrueType (TTF) files.")
      (license:x11-style
       "https://www-old.gnome.org/fonts/#Final_Bitstream_Vera_Fonts"))))
 
-(define-public freefont-ttf
+(define-public font-gnu-freefont-ttf
   (package
-    (name "freefont-ttf")
+    (name "font-gnu-freefont-ttf")
     (version "20100919")
     (source (origin
              (method url-fetch)
@@ -269,9 +269,9 @@ and Bitstream Vera Sans Mono).
 The Liberation Fonts are sponsored by Red Hat.")
     (license license:silofl1.1)))
 
-(define-public terminus-font
+(define-public font-terminus
   (package
-    (name "terminus-font")
+    (name "font-terminus")
     (version "4.39")
     (source
       (origin
-- 
2.1.2

Re: [PATCH] gnu: Rename fonts according to our new naming scheme.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> What do you think of keeping "gnu" as a foundry in the third font?

Fine with me.

> There I added "-ttf"; so far, this is the only format we have packaged,
> but the ftp site provides more formats in separate tarballs.

OK.

> If someone interested in fonts feels up to it, there is a newer version
> 20120503, but as a .zip instead of a .tar.gz. Is that why it is not suggested
> by "guix refresh"?

Indeed.  I’ve just fixed it:

--8<---------------cut here---------------start------------->8---
scheme@(guile-user)> ,use(guix gnu-maintenance)
scheme@(guile-user)> (latest-release "freefont-ttf")
$4 = #<<gnu-release> package: "freefont-ttf" version: "20120503" directory: "/gnu/freefont" files: ("freefont-ttf-20120503.zip")>
--8<---------------cut here---------------end--------------->8---

> * gnu/packages/fonts.scm (ttf-dejavu): Rename to ...
> * gnu/packages/fonts.scm (font-dejavu): ... this.
> * gnu/packages/fonts.scm (ttf-bitstream-vera): Rename to ...
> * gnu/packages/fonts.scm (font-bitstream-vera): ... this.
> * gnu/packages/fonts.scm (freefont-ttf): Rename to ...
> * gnu/packages/fonts.scm (font-gnu-freefont-ttf): ... this.
> * gnu/packages/fonts.scm (terminus-font): Rename to ...
> * gnu/packages/fonts.scm (font-terminus): ... this.

LGTM, thank you!

Ludo’.