From c7d7f5a6632376dbd8d4ccc07a3011383160c1a2 Mon Sep 17 00:00:00 2001 From: Cecil Date: Tue, 25 Jan 2011 21:58:47 -0800 Subject: linhes-splash:cleanup, ensure R7 image is being used. --- abs/core/linhes-splash/1024x768.cfg | 28 ------ abs/core/linhes-splash/800x600.cfg | 28 ------ abs/core/linhes-splash/PKGBUILD | 4 +- abs/core/linhes-splash/Vera.copyright | 124 ------------------------- abs/core/linhes-splash/Vera.ttf | Bin 65932 -> 0 bytes abs/core/linhes-splash/background-1024x768.png | Bin 107688 -> 0 bytes abs/core/linhes-splash/background-800x600.png | Bin 88583 -> 0 bytes abs/core/linhes-splash/linhes-splash.tar.bz2 | Bin 0 -> 871971 bytes abs/core/linhes-splash/linhes.tar.bz2 | Bin 872147 -> 0 bytes abs/core/linhes-splash/verbose-1024x768.png | Bin 414129 -> 0 bytes abs/core/linhes-splash/verbose-800x600.png | Bin 215658 -> 0 bytes 11 files changed, 2 insertions(+), 182 deletions(-) delete mode 100644 abs/core/linhes-splash/1024x768.cfg delete mode 100644 abs/core/linhes-splash/800x600.cfg delete mode 100644 abs/core/linhes-splash/Vera.copyright delete mode 100644 abs/core/linhes-splash/Vera.ttf delete mode 100644 abs/core/linhes-splash/background-1024x768.png delete mode 100644 abs/core/linhes-splash/background-800x600.png create mode 100644 abs/core/linhes-splash/linhes-splash.tar.bz2 delete mode 100644 abs/core/linhes-splash/linhes.tar.bz2 delete mode 100644 abs/core/linhes-splash/verbose-1024x768.png delete mode 100644 abs/core/linhes-splash/verbose-800x600.png diff --git a/abs/core/linhes-splash/1024x768.cfg b/abs/core/linhes-splash/1024x768.cfg deleted file mode 100644 index 84fb7ce..0000000 --- a/abs/core/linhes-splash/1024x768.cfg +++ /dev/null @@ -1,28 +0,0 @@ -# Based on theme design and configs by -# Rensel -# Redesigned by Cecil Watson -# for LinHES - -bgcolor=0 - -pic=/etc/splash/linhes/images/verbose-1024x768.png -silentpic=/etc/splash/linhes/images/background-1024x768.png - -tx=5 -ty=5 -tw=1014 -th=714 - -text_x=12 -text_y=744 -text_size=18 -text_color=0xffffff -text_font=/etc/splash/linhes/Vera.ttf - -box silent 284 575 740 575 #ffffff66 -box silent 284 575 284 591 #ffffff66 -box silent 284 591 740 591 #ffffff66 -box silent 740 575 740 591 #ffffff66 - -box silent inter 284 575 284 591 #0072bc -box silent 284 575 740 591 #0072bc diff --git a/abs/core/linhes-splash/800x600.cfg b/abs/core/linhes-splash/800x600.cfg deleted file mode 100644 index e795dff..0000000 --- a/abs/core/linhes-splash/800x600.cfg +++ /dev/null @@ -1,28 +0,0 @@ -#Based on original darch theme design and configs by -# Rensel -#Redesigned by Cecil Watson for LinHES -# - -bgcolor=0 - -pic=/etc/splash/linhes/images/verbose-800x600.png -silentpic=/etc/splash/linhes/images/background-800x600.png - -tx=4 -ty=4 -tw=792 -th=558 - -text_x=10 -text_y=570 -text_size=20 -text_color=0xffffff -text_font=/etc/splash/linhes/Vera.ttf - -box silent 300 450 500 460 #ffffff66 -box silent 300 450 300 466 #ffffff66 -box silent 300 456 500 466 #ffffff66 -box silent 500 450 500 466 #ffffff66 - -box silent inter 300 450 300 466 #ffffff66 -box silent 300 450 500 466 #ffffff66 diff --git a/abs/core/linhes-splash/PKGBUILD b/abs/core/linhes-splash/PKGBUILD index 6b0d59e..de73d50 100644 --- a/abs/core/linhes-splash/PKGBUILD +++ b/abs/core/linhes-splash/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-splash pkgver=1 -pkgrel=7 +pkgrel=8 pkgdesc="FBSplash theme for LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -28,4 +28,4 @@ build() { # fi # done } -md5sums=('d557534fc62bc61ef4cb99e27b095266') +md5sums=('9b1f58dad581187ff080097f5fa1ae1c') diff --git a/abs/core/linhes-splash/Vera.copyright b/abs/core/linhes-splash/Vera.copyright deleted file mode 100644 index e651be1..0000000 --- a/abs/core/linhes-splash/Vera.copyright +++ /dev/null @@ -1,124 +0,0 @@ -Bitstream Vera Fonts Copyright - -The fonts have a generous copyright, allowing derivative works (as -long as "Bitstream" or "Vera" are not in the names), and full -redistribution (so long as they are not *sold* by themselves). They -can be be bundled, redistributed and sold with any software. - -The fonts are distributed under the following copyright: - -Copyright -========= - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream -Vera is a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the fonts accompanying this license ("Fonts") and associated -documentation files (the "Font Software"), to reproduce and distribute -the Font Software, including without limitation the rights to use, -copy, merge, publish, distribute, and/or sell copies of the Font -Software, and to permit persons to whom the Font Software is furnished -to do so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice -shall be included in all copies of one or more of the Font Software -typefaces. - -The Font Software may be modified, altered, or added to, and in -particular the designs of glyphs or characters in the Fonts may be -modified and additional glyphs or characters may be added to the -Fonts, only if the fonts are renamed to names not containing either -the words "Bitstream" or the word "Vera". - -This License becomes null and void to the extent applicable to Fonts -or Font Software that has been modified and is distributed under the -"Bitstream Vera" names. - -The Font Software may be sold as part of a larger software package but -no copy of one or more of the Font Software typefaces may be sold by -itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL -BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, -OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT -SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - -Except as contained in this notice, the names of Gnome, the Gnome -Foundation, and Bitstream Inc., shall not be used in advertising or -otherwise to promote the sale, use or other dealings in this Font -Software without prior written authorization from the Gnome Foundation -or Bitstream Inc., respectively. For further information, contact: -fonts at gnome dot org. - -Copyright FAQ -============= - - 1. I don't understand the resale restriction... What gives? - - Bitstream is giving away these fonts, but wishes to ensure its - competitors can't just drop the fonts as is into a font sale system - and sell them as is. It seems fair that if Bitstream can't make money - from the Bitstream Vera fonts, their competitors should not be able to - do so either. You can sell the fonts as part of any software package, - however. - - 2. I want to package these fonts separately for distribution and - sale as part of a larger software package or system. Can I do so? - - Yes. A RPM or Debian package is a "larger software package" to begin - with, and you aren't selling them independently by themselves. - See 1. above. - - 3. Are derivative works allowed? - Yes! - - 4. Can I change or add to the font(s)? - Yes, but you must change the name(s) of the font(s). - - 5. Under what terms are derivative works allowed? - - You must change the name(s) of the fonts. This is to ensure the - quality of the fonts, both to protect Bitstream and Gnome. We want to - ensure that if an application has opened a font specifically of these - names, it gets what it expects (though of course, using fontconfig, - substitutions could still could have occurred during font - opening). You must include the Bitstream copyright. Additional - copyrights can be added, as per copyright law. Happy Font Hacking! - - 6. If I have improvements for Bitstream Vera, is it possible they might get - adopted in future versions? - - Yes. The contract between the Gnome Foundation and Bitstream has - provisions for working with Bitstream to ensure quality additions to - the Bitstream Vera font family. Please contact us if you have such - additions. Note, that in general, we will want such additions for the - entire family, not just a single font, and that you'll have to keep - both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add - glyphs to the font, they must be stylistically in keeping with Vera's - design. Vera cannot become a "ransom note" font. Jim Lyles will be - providing a document describing the design elements used in Vera, as a - guide and aid for people interested in contributing to Vera. - - 7. I want to sell a software package that uses these fonts: Can I do so? - - Sure. Bundle the fonts with your software and sell your software - with the fonts. That is the intent of the copyright. - - 8. If applications have built the names "Bitstream Vera" into them, - can I override this somehow to use fonts of my choosing? - - This depends on exact details of the software. Most open source - systems and software (e.g., Gnome, KDE, etc.) are now converting to - use fontconfig (see www.fontconfig.org) to handle font configuration, - selection and substitution; it has provisions for overriding font - names and subsituting alternatives. An example is provided by the - supplied local.conf file, which chooses the family Bitstream Vera for - "sans", "serif" and "monospace". Other software (e.g., the XFree86 - core server) has other mechanisms for font substitution. - diff --git a/abs/core/linhes-splash/Vera.ttf b/abs/core/linhes-splash/Vera.ttf deleted file mode 100644 index 58cd6b5..0000000 Binary files a/abs/core/linhes-splash/Vera.ttf and /dev/null differ diff --git a/abs/core/linhes-splash/background-1024x768.png b/abs/core/linhes-splash/background-1024x768.png deleted file mode 100644 index bd9590c..0000000 Binary files a/abs/core/linhes-splash/background-1024x768.png and /dev/null differ diff --git a/abs/core/linhes-splash/background-800x600.png b/abs/core/linhes-splash/background-800x600.png deleted file mode 100644 index 712cd5d..0000000 Binary files a/abs/core/linhes-splash/background-800x600.png and /dev/null differ diff --git a/abs/core/linhes-splash/linhes-splash.tar.bz2 b/abs/core/linhes-splash/linhes-splash.tar.bz2 new file mode 100644 index 0000000..9d52a1e Binary files /dev/null and b/abs/core/linhes-splash/linhes-splash.tar.bz2 differ diff --git a/abs/core/linhes-splash/linhes.tar.bz2 b/abs/core/linhes-splash/linhes.tar.bz2 deleted file mode 100644 index 15097c3..0000000 Binary files a/abs/core/linhes-splash/linhes.tar.bz2 and /dev/null differ diff --git a/abs/core/linhes-splash/verbose-1024x768.png b/abs/core/linhes-splash/verbose-1024x768.png deleted file mode 100644 index da27a9c..0000000 Binary files a/abs/core/linhes-splash/verbose-1024x768.png and /dev/null differ diff --git a/abs/core/linhes-splash/verbose-800x600.png b/abs/core/linhes-splash/verbose-800x600.png deleted file mode 100644 index 4222621..0000000 Binary files a/abs/core/linhes-splash/verbose-800x600.png and /dev/null differ -- cgit v0.12