--- anagramarama-0.3.orig/debian/anagramarama.install +++ anagramarama-0.3/debian/anagramarama.install @@ -0,0 +1,2 @@ +usr/bin/* usr/games +../anagramarama.desktop usr/share/applications --- anagramarama-0.3.orig/debian/changelog +++ anagramarama-0.3/debian/changelog @@ -0,0 +1,60 @@ +anagramarama (0.3-0ubuntu5) lucid; urgency=low + + [ Joao Pinto ] + * debian/anagramarama.install: + - Move binary to /usr/games + - Install .desktop file in main package instead of -data (LP: #355267) + * debian/anagramarama-data.install: deleted the installation of the .desktop + file + * debian/rules: deleted dh_desktop call + * debian/control: moved homepage url from description to Homepage tag + + [ Fabrice Coutadeur ] + * debian/control: + - Changed versioned dependency on anagramarama-data to use + (= ${source:Version}) to get rid of a lintian error + - Added ${misc:Depends} to get rid of lintian warnings + - Bumped Standards-Version to 3.8.3. No changes required. + + -- Joao Pinto Fri, 11 Dec 2009 22:12:13 +0000 + +anagramarama (0.3-0ubuntu4) gutsy; urgency=low + + * Remove installed Thumbs.db files, not needed (Closes LP: #123626) + + -- Lukas Fittl Tue, 03 Jul 2007 13:43:38 +0200 + +anagramarama (0.3-0ubuntu3) feisty; urgency=low + + * debian/control: Add necessary Replaces for file moves in 0.3-0ubuntu1 + + -- Lukas Fittl Wed, 7 Feb 2007 19:20:13 +0100 + +anagramarama (0.3-0ubuntu2) feisty; urgency=low + + * debian/anagramarama.desktop: Fix validation errors. + + -- Lukas Fittl Sun, 4 Feb 2007 17:32:53 +0100 + +anagramarama (0.3-0ubuntu1) feisty; urgency=low + + * New upstream release. + - Updated debian/patches/00_fix-makefile-and-paths.patch + * Patches by Sebastian Rasmussen + - Added debian/patches/01_cleanup.patch (Closes: Malone #75219) + - Added debian/patches/02_ui_improvements.patch (Closes: Malone #75221) + * debian/control: Updated to Standards Version 3.7.2, no changes needed. + * debian/control: Updated maintainer email address. + * Moved everything that is non-arch dependent into -data (.man, .desktop) + * Removed debian/watch file, no upstream release location atm. + + -- Lukas Fittl Mon, 29 Jan 2007 03:59:30 +0100 + +anagramarama (0.2-0ubuntu1) dapper; urgency=low + + * Initial release. + - Added debian/patches/00_fix-makefile-and-paths.patch that cleans up the + makefile, adds an install target and fixes all references to the data + directories. + + -- Lukas Fittl Wed, 22 Feb 2006 11:32:55 +0100 --- anagramarama-0.3.orig/debian/copyright +++ anagramarama-0.3/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Lukas Fittl on +Wed, 22 Feb 2006 11:32:55 +0100 + +It was downloaded from http://www.coralquest.com/anagramarama/ + +Upstream Authors: Colm Gallagher + +Copyright: Copyright (c) 2003, Colm Gallagher + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software Foundation, + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- anagramarama-0.3.orig/debian/compat +++ anagramarama-0.3/debian/compat @@ -0,0 +1 @@ +5 --- anagramarama-0.3.orig/debian/anagramarama-data.install +++ anagramarama-0.3/debian/anagramarama-data.install @@ -0,0 +1 @@ +usr/share --- anagramarama-0.3.orig/debian/anagramarama-data.manpages +++ anagramarama-0.3/debian/anagramarama-data.manpages @@ -0,0 +1 @@ +debian/anagramarama.6 --- anagramarama-0.3.orig/debian/anagramarama.desktop +++ anagramarama-0.3/debian/anagramarama.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Version=1.4 +Name=Anagramarama +Exec=anagramarama +Terminal=false +Categories=Game;KidsGame;LogicGame; +Comment=fast paced anagram puzzle game using SDL +Icon= --- anagramarama-0.3.orig/debian/rules +++ anagramarama-0.3/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_MAKE_MAKEFILE = makefile.linux +DEB_MAKE_BUILD_TARGET = all prefix=/usr +DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp prefix=/usr +DEB_DH_INSTALL_SOURCEDIR = debian/tmp --- anagramarama-0.3.orig/debian/anagramarama.6 +++ anagramarama-0.3/debian/anagramarama.6 @@ -0,0 +1,23 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH ANAGRAMARAMA 6 "January 4, 2005" +.SH NAME +anagramarama \- cute anagram game using SDL +.SH SYNOPSIS +.B anagramarama +.RI +.br +.SH DESCRIPTION +.B anagramarama +is a simple wordgame in which one tries to guess all the different +permutations of a scrambled word which form another word within the +time limit. Guess the original word and you move on to the next +level. +.PP +.SH OPTIONS +None, currently. +.br +.SH AUTHOR +anagramarama was written by Colm Gallagher +.PP +This manual page was written by Ryan Stutsman , +for the Debian project (but may be used by others). --- anagramarama-0.3.orig/debian/control +++ anagramarama-0.3/debian/control @@ -0,0 +1,28 @@ +Source: anagramarama +Section: games +Priority: optional +Maintainer: Lukas Fittl +Build-Depends: debhelper (>= 5.0.0), cdbs, libsdl1.2-dev, libsdl-mixer1.2-dev +Standards-Version: 3.8.3 +Homepage: http://www.coralquest.com/anagramarama/ + +Package: anagramarama +Architecture: any +Depends: ${shlibs:Depends}, anagramarama-data (= ${source:Version}), ${misc:Depends} +Description: fast paced anagram puzzle game using SDL + Like anagrams? You'll love Anagramarama! + The aim is to find as many words as possible in the time + available. Get the longest word and you'll advance to the + next level. + +Package: anagramarama-data +Architecture: all +Replaces: anagramarama (< 0.3-0ubuntu1) +Depends: ${misc:Depends} +Description: fast paced anagram puzzle game using SDL (data files) + Like anagrams? You'll love Anagramarama! + The aim is to find as many words as possible in the time + available. Get the longest word and you'll advance to the + next level. + . + This package contains the data files for anagramarama. --- anagramarama-0.3.orig/debian/patches/01_cleanup.patch +++ anagramarama-0.3/debian/patches/01_cleanup.patch @@ -0,0 +1,81 @@ +diff -Nur anagramarama-0.3/src/ag.c anagramarama-0.3.new/src/ag.c +--- anagramarama-0.3/src/ag.c 2007-01-29 03:46:37.000000000 +0100 ++++ anagramarama-0.3.new/src/ag.c 2007-01-29 03:47:46.000000000 +0100 +@@ -288,7 +288,6 @@ + newString[len-1] = '\0'; + + return(newString); +- free(newString); + } + + +@@ -324,7 +323,6 @@ + newString[len] = '\0'; + + return(newString); +- free(newString); + } + + +@@ -364,9 +362,15 @@ + newRemain[remainLen-1] = '\0'; + + if(strlen(newGuess) > 3){ +- if (dlb_lookup(dlbHead,shiftLeftKill(newGuess))){ +- push(&(*head), shiftLeftKill(newGuess)); +- } ++ char *lookupWord = shiftLeftKill(newGuess); ++ ++ if (dlb_lookup(dlbHead, lookupWord)){ ++ char *pushWord = shiftLeftKill(newGuess); ++ push(&(*head), pushWord); ++ free(pushWord); ++ } ++ ++ free(lookupWord); + } + + if (strlen(newRemain)){ +@@ -1105,7 +1109,7 @@ + for (i=0;i= 6)); + +- if(!happy){ +- printf("Too Many Answers! word: %s, answers: %i\n", rootWord, answersSought); +- } ++ //if(!happy){ ++ // printf("Too Many Answers! word: %s, answers: %i\n", rootWord, answersSought); ++ //} + } + + for (i=bigWordLen;i<7;i++){ +diff -Nur anagramarama-0.3/src/linked.c anagramarama-0.3.new/src/linked.c +--- anagramarama-0.3/src/linked.c 2007-01-07 02:09:59.000000000 +0100 ++++ anagramarama-0.3.new/src/linked.c 2007-01-29 03:46:38.000000000 +0100 +@@ -46,7 +46,7 @@ + + char* swap; + +- swap = malloc(sizeof((*from)->anagram)); ++ swap = malloc(strlen((*from)->anagram) + 1); + strcpy(swap, (*from)->anagram); + (*from)->anagram = (*to)->anagram; + (*from)->length = (*to)->length; +@@ -154,7 +154,7 @@ + } + + if (!duplicate){ +- len = strlen(anagram+1); ++ len = strlen(anagram) + 1; + newNode->anagram = malloc(sizeof(char)*len); + strcpy(newNode->anagram, anagram); + newNode->length = len + 1; --- anagramarama-0.3.orig/debian/patches/02_ui_improvements.patch +++ anagramarama-0.3/debian/patches/02_ui_improvements.patch @@ -0,0 +1,114 @@ +diff -Nur anagramarama-0.3/src/ag.c anagramarama-0.3.new/src/ag.c +--- anagramarama-0.3/src/ag.c 2007-01-29 03:58:03.000000000 +0100 ++++ anagramarama-0.3.new/src/ag.c 2007-01-29 03:58:21.000000000 +0100 +@@ -82,6 +82,7 @@ + int solvePuzzle = 0; + int shuffleRemaining = 0; + int clearGuess = 0; ++int clearLastLetter = 0; + + int gameStart = 0; + int gameTime = 0; +@@ -194,6 +195,7 @@ + pushSound(&(*soundCache),"foundbig", DATA_DIR "audio/foundbig.wav"); + pushSound(&(*soundCache),"found", DATA_DIR "audio/found.wav"); + pushSound(&(*soundCache),"clear", DATA_DIR "audio/clearword.wav"); ++ pushSound(&(*soundCache),"clearletter", DATA_DIR "audio/clearword.wav"); + pushSound(&(*soundCache),"duplicate", DATA_DIR "audio/duplicate.wav"); + pushSound(&(*soundCache),"badword", DATA_DIR "audio/badword.wav"); + pushSound(&(*soundCache),"shuffle", DATA_DIR "audio/shuffle.wav"); +@@ -610,6 +612,7 @@ + } + + if (!foundWord){ ++ updateAnswers = 1; + Mix_PlayChannel(-1, getSound("badword"),0); + } + } +@@ -693,7 +696,12 @@ + + switch(keyedLetter){ + +- case SDLK_BACKSPACE: case SDLK_ESCAPE: ++ case SDLK_BACKSPACE: ++ // clear last letter ++ clearLastLetter = 1; ++ break; ++ ++ case SDLK_ESCAPE: + // clear has been pressed + clearGuess = 1; + break; +@@ -702,6 +710,7 @@ + //enter has been pressed + checkGuess(answer, head); + break; ++ + case ' ': + // shuffle has been pressed + shuffleRemaining = 1; +@@ -866,6 +875,50 @@ + + + /*********************************************************** ++synopsis: move last letter from answer to shuffle ++ ++inputs: letters - the letter sprites ++ ++outputs: n/a ++***********************************************************/ ++int clearLast(struct sprite** letters){ ++ ++struct sprite* current = *letters; ++struct sprite* last = NULL; ++int count = 0; ++ ++ // find last letter in answer ++ for (current = *letters; current != NULL; current = current->next){ ++ if (current->box != ANSWER){ ++ continue; ++ } ++ ++ if (current->letter == SPACE_CHAR || ++ current->letter == '\0'){ ++ continue; ++ } ++ ++ if (last == NULL || ++ last->toX < current->toX){ ++ last = current; ++ } ++ } ++ ++ // move the letter back up ++ if (last != NULL && last->box == ANSWER){ ++ last->box = SHUFFLE; ++ last->toX = nextBlankPosition(SHUFFLE, &last->index); ++ last->toY = SHUFFLE_BOX_Y; ++ count ++; ++ } ++ ++ return count; ++} ++ ++ ++ ++ ++/*********************************************************** + synopsis: display the score graphic + + inputs: screen - the SDL_Surface to display the image +@@ -1694,6 +1747,13 @@ + clearGuess = 0; + } + ++ if (clearLastLetter){ ++ // clear last letter ++ if (clearLast(&(*letters)) > 0) ++ Mix_PlayChannel(-1, getSound("clear"),0); ++ clearLastLetter = 0; ++ } ++ + if (quitGame){ + done=1; + } --- anagramarama-0.3.orig/debian/patches/00_fix-makefile-and-paths.patch +++ anagramarama-0.3/debian/patches/00_fix-makefile-and-paths.patch @@ -0,0 +1,118 @@ +diff -Nur anagramarama-0.3/makefile.linux anagramarama-0.3.new/makefile.linux +--- anagramarama-0.3/makefile.linux 2007-01-07 02:00:07.000000000 +0100 ++++ anagramarama-0.3.new/makefile.linux 2007-07-03 13:42:06.000000000 +0200 +@@ -1,27 +1,28 @@ +-LFLAGS=-Wall -funroll-loops -fomit-frame-pointer -pipe -O9 +-CFLAGS=-Wall `sdl-config --cflags --libs` -funroll-loops -fomit-frame-pointer -pipe -O9 -lSDL_mixer +-CC=gcc ++CFLAGS=-Wall -O3 ++LDLIBS=-lSDL_mixer `sdl-config --libs` ++ ++override CFLAGS+=`sdl-config --cflags` -DDATA_DIR=\"$(prefix)/share/anagramarama/\" + + C_FILES=src/dlb.c src/linked.c src/sprite.c src/ag.c + OBJ_FILES=src/dlb.o src/linked.o src/sprite.o src/ag.o +-OUT_FILE=ag +- +-all:ag +- +-ag: $(OBJ_FILES) +- $(CC) $(CFLAGS) -o $(OUT_FILE) $(OBJ_FILES) ++OUT_FILE=anagramarama + +-src/dlb.o: src/dlb.c +- $(CC) $(LFLAGS) -c -o $@ $^ ++.PHONY: all clean install + +-src/linked.o: src/linked.c +- $(CC) $(LFLAGS) -c -o $@ $^ +- +-src/sprite.o: src/sprite.c +- $(CC) $(LFLAGS) -c -o $@ $^ ++all: $(OUT_FILE) + +-src/ag.o: src/ag.c +- $(CC) $(LFLAGS) -c -o $@ $^ ++$(OUT_FILE): $(OBJ_FILES) ++ $(CC) $(CFLAGS) -o $(OUT_FILE) $(OBJ_FILES) $(LDLIBS) + + clean: + rm -f src/*.o ++ rm -f $(OUT_FILE) ++ ++install: $(OUT_FILE) ++ mkdir -p $(DESTDIR)$(prefix)/bin ++ install -m 755 $(OUT_FILE) $(DESTDIR)$(prefix)/bin ++ ++ mkdir -p $(DESTDIR)$(prefix)/share/anagramarama ++ cp -R i18n $(DESTDIR)$(prefix)/share/anagramarama ++ rm $(DESTDIR)$(prefix)/share/anagramarama/i18n/*/images/Thumbs.db ++ cp -R audio $(DESTDIR)$(prefix)/share/anagramarama +diff -Nur anagramarama-0.3/src/ag.c anagramarama-0.3.new/src/ag.c +--- anagramarama-0.3/src/ag.c 2007-01-07 02:09:59.000000000 +0100 ++++ anagramarama-0.3.new/src/ag.c 2007-07-03 13:40:53.000000000 +0200 +@@ -74,8 +74,8 @@ + //module level variables for game control + char shuffle[] = "£££££££"; + char answer[] = "£££££££"; +-char language[10]; +-char txt[50]; ++char language[255]; ++char txt[255]; + char* rootWord; + int updateAnswers = 0; + int startNewGame = 0; +@@ -189,15 +189,15 @@ + ***********************************************************/ + void bufferSounds(struct sound** soundCache){ + +- pushSound(&(*soundCache),"click-answer", "audio/click-answer.wav"); +- pushSound(&(*soundCache),"click-shuffle", "audio/click-shuffle.wav"); +- pushSound(&(*soundCache),"foundbig", "audio/foundbig.wav"); +- pushSound(&(*soundCache),"found", "audio/found.wav"); +- pushSound(&(*soundCache),"clear", "audio/clearword.wav"); +- pushSound(&(*soundCache),"duplicate", "audio/duplicate.wav"); +- pushSound(&(*soundCache),"badword", "audio/badword.wav"); +- pushSound(&(*soundCache),"shuffle", "audio/shuffle.wav"); +- pushSound(&(*soundCache),"clock-tick", "audio/clock-tick.wav"); ++ pushSound(&(*soundCache),"click-answer", DATA_DIR "audio/click-answer.wav"); ++ pushSound(&(*soundCache),"click-shuffle", DATA_DIR "audio/click-shuffle.wav"); ++ pushSound(&(*soundCache),"foundbig", DATA_DIR "audio/foundbig.wav"); ++ pushSound(&(*soundCache),"found", DATA_DIR "audio/found.wav"); ++ pushSound(&(*soundCache),"clear", DATA_DIR "audio/clearword.wav"); ++ pushSound(&(*soundCache),"duplicate", DATA_DIR "audio/duplicate.wav"); ++ pushSound(&(*soundCache),"badword", DATA_DIR "audio/badword.wav"); ++ pushSound(&(*soundCache),"shuffle", DATA_DIR "audio/shuffle.wav"); ++ pushSound(&(*soundCache),"clock-tick", DATA_DIR "audio/clock-tick.wav"); + + } + +@@ -1732,7 +1732,8 @@ + SDL_Surface *screen; + struct sprite* letters = NULL; + //pthread_t audio; +- strcpy(language,"i18n/"); ++ strcpy(language,DATA_DIR); ++ strcat(language,"i18n/"); + + if(argc == 2) { + strcat(language,argv[1]); +@@ -1764,12 +1765,12 @@ + strcat(txt,"wordlist.txt"); + FILE* wordlist; + wordlist = fopen(txt,"r"); +- //if(wordlist == 0){ +- // strcpy(language,"i18n/en_GB/"); +- //} +- //else { +- // fclose(wordlist); +- //} ++ if(wordlist == 0){ ++ strcpy(language,DATA_DIR "i18n/en_GB/"); ++ } ++ else { ++ fclose(wordlist); ++ } + + // seed the random generator + srand(time(NULL));