clean up and added own TTF file so we are independent from eff-content-fonts

diff --git a/COPYRIGHT.BH b/COPYRIGHT.BH
new file mode 100644 (file)
index 0000000..78c6065
--- /dev/null
+++ b/COPYRIGHT.BH
@@ -0,0 +1,42 @@
+Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font 
+instruction code copyright (c) 2001 by URW++ GmbH. All Rights 
+Reserved. Luxi is a registered trademark of Bigelow & Holmes Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining 
+a copy of these Fonts and associated documentation files (the "Font 
+Software"), to deal in the Font Software, including without 
+limitation the rights to use, copy, merge, publish, distribute, 
+sublicense, 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.
+
+The Font Software may not be modified, altered, or added to, and in 
+particular the designs of glyphs or characters in the Fonts may not 
+be modified nor may additional glyphs or characters be added to the 
+Fonts. This License becomes null and void when the Fonts or Font 
+Software have been modified.
+
+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 
+BIGELOW & HOLMES INC. OR URW++ GMBH. 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 Bigelow & Holmes 
+Inc. and URW++ GmbH. 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 Bigelow & Holmes Inc. and URW++ GmbH.
+
+For further information, contact:
+
+info@urwpp.de
+or
+design@bigelowandholmes.com

diff --git a/Makefile b/Makefile
index 2dfdb55..e825012 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@ install:
        mkdir -p $(DESTDIR)/usr/share/applications/hildon
        mkdir -p $(DESTDIR)/usr/share/icons/hicolor/40x40/apps
        mkdir -p $(DESTDIR)/usr/share/dbus-1/services
-       cp res/mancala.desktop $(DESTDIR)/usr/share/applications/hildon
-       cp res/mancala.png $(DESTDIR)/usr/share/icons/hicolor/40x40/apps/mancala.png
-       cp res/com.nokia.mancala.service $(DESTDIR)/usr/share/dbus-1/services/
+       cp data/mancala.desktop $(DESTDIR)/usr/share/applications/hildon
+       cp data/mancala.png $(DESTDIR)/usr/share/icons/hicolor/40x40/apps/mancala.png
+       cp data/com.nokia.mancala.service $(DESTDIR)/usr/share/dbus-1/services/
 
 clean:
        rm -f build-stamp config.guess config.sub

diff --git a/data/com.nokia.mancala.service b/data/com.nokia.mancala.service
new file mode 100644 (file)
index 0000000..de77262
--- /dev/null
+++ b/data/com.nokia.mancala.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.nokia.mancala
+Exec=/home/opt/mancala/bin/mancala

diff --git a/data/icon.png b/data/icon.png
new file mode 100644 (file)
index 0000000..e37ee06
Binary files /dev/null and b/data/icon.png differ

diff --git a/data/luxisr.ttf b/data/luxisr.ttf
new file mode 100644 (file)
index 0000000..c47fd20
Binary files /dev/null and b/data/luxisr.ttf differ

diff --git a/data/mancala.desktop b/data/mancala.desktop
new file mode 100644 (file)
index 0000000..4697e22
--- /dev/null
+++ b/data/mancala.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.1
+Name=Mancala
+Comment=Mancala game for Maemo devices
+Exec=/home/opt/mancala/bin/mancala
+Icon=mancala
+Terminal=false
+Type=Application
+Categories=Games
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
+X-Window-Icon=mancala
+X-Osso-Service=com.nokia.mancala
+
+

diff --git a/data/mancala.png b/data/mancala.png
new file mode 100644 (file)
index 0000000..4a995dd
Binary files /dev/null and b/data/mancala.png differ

diff --git a/data/pick.wav b/data/pick.wav
new file mode 100644 (file)
index 0000000..26c46f8
Binary files /dev/null and b/data/pick.wav differ

diff --git a/data/stone00.png b/data/stone00.png
new file mode 100644 (file)
index 0000000..85e27a3
Binary files /dev/null and b/data/stone00.png differ

diff --git a/data/stone01.png b/data/stone01.png
new file mode 100644 (file)
index 0000000..0428a22
Binary files /dev/null and b/data/stone01.png differ

diff --git a/data/stone02.png b/data/stone02.png
new file mode 100644 (file)
index 0000000..526def5
Binary files /dev/null and b/data/stone02.png differ

diff --git a/data/stone03.png b/data/stone03.png
new file mode 100644 (file)
index 0000000..82a39c7
Binary files /dev/null and b/data/stone03.png differ

diff --git a/data/stone04.png b/data/stone04.png
new file mode 100644 (file)
index 0000000..551fe01
Binary files /dev/null and b/data/stone04.png differ

diff --git a/data/stone05.png b/data/stone05.png
new file mode 100644 (file)
index 0000000..c946554
Binary files /dev/null and b/data/stone05.png differ

diff --git a/data/stone06.png b/data/stone06.png
new file mode 100644 (file)
index 0000000..4832fb9
Binary files /dev/null and b/data/stone06.png differ

diff --git a/data/stone07.png b/data/stone07.png
new file mode 100644 (file)
index 0000000..f22da16
Binary files /dev/null and b/data/stone07.png differ

diff --git a/data/stone08.png b/data/stone08.png
new file mode 100644 (file)
index 0000000..e6c5422
Binary files /dev/null and b/data/stone08.png differ

diff --git a/data/stone09.png b/data/stone09.png
new file mode 100644 (file)
index 0000000..f310cfe
Binary files /dev/null and b/data/stone09.png differ

diff --git a/data/stone10.png b/data/stone10.png
new file mode 100644 (file)
index 0000000..654b66e
Binary files /dev/null and b/data/stone10.png differ

diff --git a/data/tile.png b/data/tile.png
new file mode 100644 (file)
index 0000000..d6d9bcc
Binary files /dev/null and b/data/tile.png differ

diff --git a/debian/changelog b/debian/changelog
index 4315def..25f4197 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mancala (0.1.10-1) unstable; urgency=low
+
+  * added our own TTF
+  * renamed folder res to data
+
+ -- Reto Zingg <g.d0b3rm4n@gmail.com>  Thu, 08 Oct 2009 17:24:40 +0300
+
 mancala (0.1.9-1) unstable; urgency=low
 
   * move to /home/opt and remove maemo from name

diff --git a/debian/control b/debian/control
index 3a926b8..23c4e0a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
 Package: mancala
 Architecture: any
 Section: user/games
-Depends: ${shlibs:Depends}, ${misc:Depends}, eff-content-fonts
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mancala, the ancient African game of skill!
  Maemo version of mancala from http://cmancala.sourceforge.net/
 Xb-Maemo-Display-Name: Mancala

diff --git a/debian/copyright b/debian/copyright
index 0915c63..3fc31f6 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,7 +19,7 @@ The Debian packaging is (C) 2009, Reto Zingg <g.d0b3rm4n@gmail.com> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
 
 
-res/pick.wav is taken from the game knetwalk and is called there "connect.wav"
+data/pick.wav is taken from the game knetwalk and is called there "connect.wav"
 http://websvn.kde.org/trunk/KDE/kdegames/knetwalk/src/sounds/connect.wav?view=log
 
 KNetWalk, a game for system administrators.
@@ -28,3 +28,11 @@ KNetWalk, a game for system administrators.
 (C) 2007-2008 Fela Winkelmolen
 
 License: GNU General Public License Version 2
+
+
+data/luxisr.ttf:
+Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font 
+instruction code copyright (c) 2001 by URW++ GmbH. All Rights 
+Reserved. Luxi is a registered trademark of Bigelow & Holmes Inc.
+
+see COPYRIGHT.BH file.

diff --git a/debian/mancala.docs b/debian/mancala.docs
index d24842f..ae03187 100644 (file)
--- a/debian/mancala.docs
+++ b/debian/mancala.docs
@@ -1 +1,2 @@
-COPYING
\ No newline at end of file
+COPYING
+COPYRIGHT.BH
\ No newline at end of file

diff --git a/res/com.nokia.mancala.service b/res/com.nokia.mancala.service
deleted file mode 100644 (file)
index de77262..0000000
--- a/res/com.nokia.mancala.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.mancala
-Exec=/home/opt/mancala/bin/mancala

diff --git a/res/icon.png b/res/icon.png
deleted file mode 100644 (file)
index e37ee06..0000000
Binary files a/res/icon.png and /dev/null differ

diff --git a/res/mancala.desktop b/res/mancala.desktop
deleted file mode 100644 (file)
index 4697e22..0000000
--- a/res/mancala.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.1
-Name=Mancala
-Comment=Mancala game for Maemo devices
-Exec=/home/opt/mancala/bin/mancala
-Icon=mancala
-Terminal=false
-Type=Application
-Categories=Games
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-X-Window-Icon=mancala
-X-Osso-Service=com.nokia.mancala
-
-

diff --git a/res/mancala.png b/res/mancala.png
deleted file mode 100644 (file)
index 4a995dd..0000000
Binary files a/res/mancala.png and /dev/null differ

diff --git a/res/pick.wav b/res/pick.wav
deleted file mode 100644 (file)
index 26c46f8..0000000
Binary files a/res/pick.wav and /dev/null differ

diff --git a/res/stone00.png b/res/stone00.png
deleted file mode 100644 (file)
index 85e27a3..0000000
Binary files a/res/stone00.png and /dev/null differ

diff --git a/res/stone01.png b/res/stone01.png
deleted file mode 100644 (file)
index 0428a22..0000000
Binary files a/res/stone01.png and /dev/null differ

diff --git a/res/stone02.png b/res/stone02.png
deleted file mode 100644 (file)
index 526def5..0000000
Binary files a/res/stone02.png and /dev/null differ

diff --git a/res/stone03.png b/res/stone03.png
deleted file mode 100644 (file)
index 82a39c7..0000000
Binary files a/res/stone03.png and /dev/null differ

diff --git a/res/stone04.png b/res/stone04.png
deleted file mode 100644 (file)
index 551fe01..0000000
Binary files a/res/stone04.png and /dev/null differ

diff --git a/res/stone05.png b/res/stone05.png
deleted file mode 100644 (file)
index c946554..0000000
Binary files a/res/stone05.png and /dev/null differ

diff --git a/res/stone06.png b/res/stone06.png
deleted file mode 100644 (file)
index 4832fb9..0000000
Binary files a/res/stone06.png and /dev/null differ

diff --git a/res/stone07.png b/res/stone07.png
deleted file mode 100644 (file)
index f22da16..0000000
Binary files a/res/stone07.png and /dev/null differ

diff --git a/res/stone08.png b/res/stone08.png
deleted file mode 100644 (file)
index e6c5422..0000000
Binary files a/res/stone08.png and /dev/null differ

diff --git a/res/stone09.png b/res/stone09.png
deleted file mode 100644 (file)
index f310cfe..0000000
Binary files a/res/stone09.png and /dev/null differ

diff --git a/res/stone10.png b/res/stone10.png
deleted file mode 100644 (file)
index 654b66e..0000000
Binary files a/res/stone10.png and /dev/null differ

diff --git a/res/tile.png b/res/tile.png
deleted file mode 100644 (file)
index d6d9bcc..0000000
Binary files a/res/tile.png and /dev/null differ

diff --git a/src/Makefile b/src/Makefile
index 2dc1417..5e40a78 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -54,8 +54,9 @@ install:      all
        mkdir -p $(DESTDIR)/home/opt/mancala/bin/
        cp ./mancala $(DESTDIR)/home/opt/mancala/bin/
        mkdir -p $(DESTDIR)/home/opt/mancala/data/
-       cp ../res/*.png $(DESTDIR)/home/opt/mancala/data/
-       cp ../res/pick.wav $(DESTDIR)/home/opt/mancala/data/
+       cp ../data/*.png $(DESTDIR)/home/opt/mancala/data/
+       cp ../data/*.wav $(DESTDIR)/home/opt/mancala/data/
+       cp ../data/*.ttf $(DESTDIR)/home/opt/mancala/data/
 
 
 uninstall:

diff --git a/src/play.c b/src/play.c
index 5ef0cb3..c833d56 100644 (file)
--- a/src/play.c
+++ b/src/play.c
@@ -132,7 +132,7 @@ int play() {
        }
        
        /* Load our font(s) */
-       if (sprintf(title_path, "%s/SwaRR4nh.ttf", FONT_PATH) == 0)
+       if (sprintf(title_path, "%s/luxisr.ttf", FONT_PATH) == 0)
                fprintf(stderr, "Problems assembling path.\n");
        if (!(title_font = TTF_OpenFont(title_path, TITLE_SIZE))) {
                fprintf(stderr, "Could not load font: %s\n", TTF_GetError());
@@ -140,7 +140,7 @@ int play() {
                return 1;
        }
        
-       if (sprintf(board_path, "%s/SwaRR4nh.ttf", FONT_PATH) == 0)
+       if (sprintf(board_path, "%s/luxisr.ttf", FONT_PATH) == 0)
                fprintf(stderr, "Problems assembling path.\n");
        if (!(board_font = TTF_OpenFont(board_path, BOARD_SIZE))) {
                fprintf(stderr, "Could not load font: %s\n", TTF_GetError());
@@ -148,7 +148,7 @@ int play() {
                return 1;
        }
        
-       if (sprintf(home_path, "%s/SwaRR4nh.ttf", FONT_PATH) == 0)
+       if (sprintf(home_path, "%s/luxisr.ttf", FONT_PATH) == 0)
                fprintf(stderr, "Problems assembling path.\n");
        if (!(home_font = TTF_OpenFont(home_path, HOME_SIZE))) {
                fprintf(stderr, "Could not load font: %s\n", TTF_GetError());

diff --git a/src/play.h b/src/play.h
index ccf4d91..c2a0b72 100644 (file)
--- a/src/play.h
+++ b/src/play.h
@@ -22,7 +22,7 @@
 
 /* path to resource files */
 #define RES_PATH "/home/opt/mancala/data"
-#define FONT_PATH "/usr/share/fonts/"
+#define FONT_PATH "/home/opt/mancala/data"
 
 /* various constants */
 #define STRING_MAX 1000