[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.07-86-g9804b92

Lifeng Sun lifongsun at gmail.com
Wed Jul 3 12:30:55 UTC 2013


The following commit has been merged in the master branch:
commit 041f0c19548b07ca323bc07d03e10ebf7e3c93b6
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jul 2 10:04:55 2013 +0800

    root-system-common: depends on fonts-freefont-otf (Closes: #714638).

diff --git a/debian/changelog b/debian/changelog
index 0050e9b..b7da5af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+root-system (5.34.08-2) unstable; urgency=low
+
+  * root-system-common: depends on fonts-freefont-otf. Thanks to
+    Christophe Hugon. (Closes: #714638)
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Tue, 02 Jul 2013 10:05:08 +0800
+
 root-system (5.34.08-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 4b6854c..8a39e16 100644
--- a/debian/control
+++ b/debian/control
@@ -1902,7 +1902,7 @@ Package: root-system-common
 Architecture: all
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
-Depends: fonts-freefont-ttf | fonts-freefont-otf | root-ttf, fonts-opensymbol | root-ttf, ${misc:Depends}
+Depends: fonts-freefont-ttf | root-ttf, fonts-freefont-otf, fonts-opensymbol | root-ttf, ${misc:Depends}
 Description: Common files for ROOT
  The ROOT system provides a set of OO frameworks with all the
  functionality needed to handle and analyze large amounts of data
diff --git a/debian/skel/root-system-common.control b/debian/skel/root-system-common.control
index 549efe2..81ba683 100644
--- a/debian/skel/root-system-common.control
+++ b/debian/skel/root-system-common.control
@@ -2,7 +2,7 @@ Package: root-system-common
 Architecture: all
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
-Depends: fonts-freefont-ttf | fonts-freefont-otf | root-ttf, fonts-opensymbol | root-ttf, ${misc:Depends}
+Depends: fonts-freefont-ttf | root-ttf, fonts-freefont-otf, fonts-opensymbol | root-ttf, ${misc:Depends}
 Description: Common files for ROOT
  The ROOT system provides a set of OO frameworks with all the
  functionality needed to handle and analyze large amounts of data
diff --git a/debian/skel/root-system-common.links.in b/debian/skel/root-system-common.links.in
index 8484fb7..6fc3626 100644
--- a/debian/skel/root-system-common.links.in
+++ b/debian/skel/root-system-common.links.in
@@ -11,3 +11,15 @@
 @prefix@/share/fonts/truetype/freefont/FreeSerifItalic.ttf @prefix@/share/root/fonts/FreeSerifItalic.ttf
 @prefix@/share/fonts/truetype/freefont/FreeSerifBoldItalic.ttf @prefix@/share/root/fonts/FreeSerifBoldItalic.ttf
 @prefix@/share/fonts/truetype/openoffice/opens___.ttf @prefix@/share/root/fonts/opens___.ttf
+ at prefix@/share/fonts/opentype/freefont/FreeMono.otf @prefix@/share/root/fonts/FreeMono.otf
+ at prefix@/share/fonts/opentype/freefont/FreeMonoBold.otf @prefix@/share/root/fonts/FreeMonoBold.otf
+ at prefix@/share/fonts/opentype/freefont/FreeMonoOblique.otf @prefix@/share/root/fonts/FreeMonoOblique.otf
+ at prefix@/share/fonts/opentype/freefont/FreeMonoBoldOblique.otf @prefix@/share/root/fonts/FreeMonoBoldOblique.otf
+ at prefix@/share/fonts/opentype/freefont/FreeSans.otf @prefix@/share/root/fonts/FreeSans.otf
+ at prefix@/share/fonts/opentype/freefont/FreeSansBold.otf @prefix@/share/root/fonts/FreeSansBold.otf
+ at prefix@/share/fonts/opentype/freefont/FreeSansOblique.otf @prefix@/share/root/fonts/FreeSansOblique.otf
+ at prefix@/share/fonts/opentype/freefont/FreeSansBoldOblique.otf @prefix@/share/root/fonts/FreeSansBoldOblique.otf
+ at prefix@/share/fonts/opentype/freefont/FreeSerif.otf @prefix@/share/root/fonts/FreeSerif.otf
+ at prefix@/share/fonts/opentype/freefont/FreeSerifBold.otf @prefix@/share/root/fonts/FreeSerifBold.otf
+ at prefix@/share/fonts/opentype/freefont/FreeSerifItalic.otf @prefix@/share/root/fonts/FreeSerifItalic.otf
+ at prefix@/share/fonts/opentype/freefont/FreeSerifBoldItalic.otf @prefix@/share/root/fonts/FreeSerifBoldItalic.otf

-- 
root-system: CERN's ROOT Data Analysis Framework



More information about the debian-science-commits mailing list