[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9235b5c54bcfb465c5be7958c8e7e564b8bcc2d4

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9235b5c54bcfb465c5be7958c8e7e564b8bcc2d4

[git]

[-- Attachment #1: Type: text/plain, Size: 3912 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  9235b5c54bcfb465c5be7958c8e7e564b8bcc2d4 (commit)
      from  aa54efa329378b18f891f9e47531d6f38bbe336d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9235b5c54bcfb465c5be7958c8e7e564b8bcc2d4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Apr 12 12:43:27 2013 +0200

    freefont: Move to main system.
    
    This is required by rrdtool, because there are no other
    monospace fonts available. See bug #10354.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/{packages => common}/freefont | 0
 config/rootfiles/core/68/filelists/freefont    | 1 +
 config/rootfiles/core/68/update.sh             | 5 +++++
 3 files changed, 6 insertions(+)
 rename config/rootfiles/{packages => common}/freefont (100%)
 create mode 120000 config/rootfiles/core/68/filelists/freefont

Difference in files:
diff --git a/config/rootfiles/common/freefont b/config/rootfiles/common/freefont
new file mode 100644
index 0000000..7c3fbb8
--- /dev/null
+++ b/config/rootfiles/common/freefont
@@ -0,0 +1,15 @@
+#usr/share/fonts
+#usr/share/fonts/default
+#usr/share/fonts/default/TrueType
+usr/share/fonts/default/TrueType/FreeMono.ttf
+usr/share/fonts/default/TrueType/FreeMonoBold.ttf
+usr/share/fonts/default/TrueType/FreeMonoBoldOblique.ttf
+usr/share/fonts/default/TrueType/FreeMonoOblique.ttf
+usr/share/fonts/default/TrueType/FreeSans.ttf
+usr/share/fonts/default/TrueType/FreeSansBold.ttf
+usr/share/fonts/default/TrueType/FreeSansBoldOblique.ttf
+usr/share/fonts/default/TrueType/FreeSansOblique.ttf
+usr/share/fonts/default/TrueType/FreeSerif.ttf
+usr/share/fonts/default/TrueType/FreeSerifBold.ttf
+usr/share/fonts/default/TrueType/FreeSerifBoldItalic.ttf
+usr/share/fonts/default/TrueType/FreeSerifItalic.ttf
diff --git a/config/rootfiles/core/68/filelists/freefont b/config/rootfiles/core/68/filelists/freefont
new file mode 120000
index 0000000..f0bbcef
--- /dev/null
+++ b/config/rootfiles/core/68/filelists/freefont
@@ -0,0 +1 @@
+../../../common/freefont
\ No newline at end of file
diff --git a/config/rootfiles/core/68/update.sh b/config/rootfiles/core/68/update.sh
index 1a7b1a7..19a4b80 100644
--- a/config/rootfiles/core/68/update.sh
+++ b/config/rootfiles/core/68/update.sh
@@ -33,6 +33,11 @@ do
 done
 
 #
+# Remove meta's of packages that are now common...
+#
+rm -rf /opt/pakfire/db/*/meta-freefont
+
+#
 #Stop services
 
 #
diff --git a/config/rootfiles/packages/freefont b/config/rootfiles/packages/freefont
deleted file mode 100644
index 7c3fbb8..0000000
--- a/config/rootfiles/packages/freefont
+++ /dev/null
@@ -1,15 +0,0 @@
-#usr/share/fonts
-#usr/share/fonts/default
-#usr/share/fonts/default/TrueType
-usr/share/fonts/default/TrueType/FreeMono.ttf
-usr/share/fonts/default/TrueType/FreeMonoBold.ttf
-usr/share/fonts/default/TrueType/FreeMonoBoldOblique.ttf
-usr/share/fonts/default/TrueType/FreeMonoOblique.ttf
-usr/share/fonts/default/TrueType/FreeSans.ttf
-usr/share/fonts/default/TrueType/FreeSansBold.ttf
-usr/share/fonts/default/TrueType/FreeSansBoldOblique.ttf
-usr/share/fonts/default/TrueType/FreeSansOblique.ttf
-usr/share/fonts/default/TrueType/FreeSerif.ttf
-usr/share/fonts/default/TrueType/FreeSerifBold.ttf
-usr/share/fonts/default/TrueType/FreeSerifBoldItalic.ttf
-usr/share/fonts/default/TrueType/FreeSerifItalic.ttf


hooks/post-receive
--
IPFire 2.x development tree