diff options
author | Andraž 'ruskie' Levstik | 2008-08-29 20:21:36 +0200 |
---|---|---|
committer | Andraž 'ruskie' Levstik | 2008-08-29 20:21:36 +0200 |
commit | 965ee38e98f3af7112736e38329722539964b562 (patch) | |
tree | 2093a1c99962a65e25ebd3d7e246530820e4dece /fonts | |
parent | 153a2159caca0f437e575ab5855a70edacdf8d1e (diff) | |
parent | 0b681af40bd832d8722e6d45b2f83aeda830ee3c (diff) |
Merge branch 'master' into devel-xorg-modular
Conflicts:
ChangeLog
audio-soft/qjackctl/HISTORY
display/qingy/DEPENDS
editors/openoffice/HISTORY
editors/vim/HISTORY
gnome2-libs/libxklavier/DEPENDS
gnome2-libs/libxklavier/HISTORY
kde4-apps/dragonplayer/DEPENDS
kde4-apps/dragonplayer/HISTORY
kde4/KDE_DEPENDS
kde4/kdebase4-runtime/DEPENDS
php-pear/php/BUILD
php-pear/php/DEPENDS
php-pear/php4/HISTORY
science/astrolog/DEPENDS
science/astrolog/HISTORY
shell-term-fm/mrxvt/HISTORY
windowmanagers/blackbox/DEPENDS
windowmanagers/blackbox/HISTORY
wm-addons/bbkeys/HISTORY
x11-libs/xfree86-devel/DEPENDS
x11-libs/xfree86-devel/DETAILS
x11-libs/xfree86-devel/HISTORY
x11-libs/xfree86-devel/TRIGGERS
x11-libs/xfree86/CONFLICTS
x11-libs/xfree86/HISTORY
x11-toolkits/fltk2/HISTORY
x11/sunclock/DEPENDS
x11/sunclock/HISTORY
xfce/xfce4-profile/HISTORY
xorg-lib/pixman/CONFLICTS
Diffstat (limited to 'fonts')
-rwxr-xr-x | fonts/dejavu-ttf/DEPENDS | 2 | ||||
-rwxr-xr-x | fonts/dejavu-ttf/DETAILS | 8 | ||||
-rwxr-xr-x | fonts/dejavu-ttf/FINAL | 2 | ||||
-rw-r--r-- | fonts/dejavu-ttf/HISTORY | 5 | ||||
-rwxr-xr-x | fonts/dejavu-ttf/INSTALL | 5 | ||||
-rwxr-xr-x | fonts/dejavu-ttf/POST_REMOVE | 2 |
6 files changed, 14 insertions, 10 deletions
diff --git a/fonts/dejavu-ttf/DEPENDS b/fonts/dejavu-ttf/DEPENDS index 74ca5e3de8..9f16f82bde 100755 --- a/fonts/dejavu-ttf/DEPENDS +++ b/fonts/dejavu-ttf/DEPENDS @@ -1 +1 @@ -source $SECTION_DIRECTORY/X11_DEPENDS +. "$SECTION_DIRECTORY/X11_DEPENDS" diff --git a/fonts/dejavu-ttf/DETAILS b/fonts/dejavu-ttf/DETAILS index 915d8feee1..d9cc69de75 100755 --- a/fonts/dejavu-ttf/DETAILS +++ b/fonts/dejavu-ttf/DETAILS @@ -1,16 +1,16 @@ SPELL=dejavu-ttf SPELLX=dejavu-fonts-ttf PACKAGE=${SPELL%-*} - VERSION=2.25 - SOURCE_HASH=sha512:06e8cbf9cceb52bdc8c062ac14a993237a6b4474875d564cf0131a89d96dab274bb49b11911e21006f525c85afe7fb2708e0d1ab2e175480b83e6bf90300cd03 + VERSION=2.26 + SOURCE_HASH=sha512:c3a528b317d50be877c005079ca8166d04e7375a5b87c83bc27b40a40677af8762a178970f143bdc883057f1f912c3cfbc129472302a546f15cfc80a7d671ae5 SOURCE=$SPELLX-$VERSION.tar.bz2 DOCS="README LICENSE AUTHORS NEWS BUGS *.txt" SOURCE_URL[0]=$SOURCEFORGE_URL/$PACKAGE/$SOURCE -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION%-*} +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-${VERSION%-*}" WEB_SITE=http://dejavu.sourceforge.net/ LICENSE[0]="Freely Distributable" KEYWORDS="fonts x11 libs" - SHORT="A font family based on the Bitstream Vera Fonts" + SHORT="font family based on the Bitstream Vera Fonts" cat << EOF The DejaVu fonts are a font family based on the Bitstream Vera Fonts. Its purpose is to provide a wider range of characters while maintaining the diff --git a/fonts/dejavu-ttf/FINAL b/fonts/dejavu-ttf/FINAL index 4ff489d6e6..3557622c2f 100755 --- a/fonts/dejavu-ttf/FINAL +++ b/fonts/dejavu-ttf/FINAL @@ -1 +1 @@ -source $SECTION_DIRECTORY/X11_FINAL +. "$SECTION_DIRECTORY/X11_FINAL" diff --git a/fonts/dejavu-ttf/HISTORY b/fonts/dejavu-ttf/HISTORY index 5b7ebda93b..a640383f69 100644 --- a/fonts/dejavu-ttf/HISTORY +++ b/fonts/dejavu-ttf/HISTORY @@ -1,3 +1,8 @@ +2008-07-28 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 2.26, quoting the paths! + * DEPENDS, FINAL, POST_REMOVE: . > source, quoting the paths! + * INSTALL: `install' is better than `mkdir' + 2008-05-19 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.25 diff --git a/fonts/dejavu-ttf/INSTALL b/fonts/dejavu-ttf/INSTALL index 6d098de10b..60173c8d2c 100755 --- a/fonts/dejavu-ttf/INSTALL +++ b/fonts/dejavu-ttf/INSTALL @@ -1,3 +1,2 @@ -mkdir -p "$INSTALL_ROOT/usr/share/fonts/TTF" && -install -m 644 -o root -g root ttf/*.ttf \ - "$INSTALL_ROOT/usr/share/fonts/TTF" +install -vm 755 -d "$INSTALL_ROOT/usr/share/fonts/TTF" && +install -vm 644 ttf/*.ttf "$INSTALL_ROOT/usr/share/fonts/TTF" diff --git a/fonts/dejavu-ttf/POST_REMOVE b/fonts/dejavu-ttf/POST_REMOVE index 368b620825..6d23a0869e 100755 --- a/fonts/dejavu-ttf/POST_REMOVE +++ b/fonts/dejavu-ttf/POST_REMOVE @@ -1 +1 @@ -source $SECTION_DIRECTORY/X11_POST_REMOVE +. "$SECTION_DIRECTORY/X11_POST_REMOVE" |