--- gnubik-2.2.orig/po/de.po +++ gnubik-2.2/po/de.po @@ -4,12 +4,12 @@ # msgid "" msgstr "" -"Project-Id-Version: GNUbik 2.0\n" +"Project-Id-Version: GNUbik 2.2\n" "Report-Msgid-Bugs-To: bug-gnubik@gnu.org\n" "POT-Creation-Date: 2004-08-19 18:41+0800\n" -"PO-Revision-Date: 2003-08-01 19:01+0200\n" -"Last-Translator: Martin Grimme \n" -"Language-Team: German \n" +"PO-Revision-Date: 2005-02-03 11:51+0100\n" +"Last-Translator: Florian Ernst \n" +"Language-Team: German\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,7 +18,7 @@ #: src/colour-sel-gtk.c:183 #, c-format msgid "Cannot create image from file %s: %s" -msgstr "Erstellung eines Bildes von der Datei %s ist nicht möglich: %s" +msgstr "Erstellung eines Bildes aus der Datei %s ist nicht möglich: %s" #: src/colour-sel-gtk.c:226 msgid "Image Selector" @@ -77,7 +77,7 @@ "Place a copy of the image across\n" "the entire face of the cube" msgstr "" -"Projiziere das Bild über den \n" +"Projiziere das Bild über den\n" "gesamten Würfel" #: src/colour-sel-gtk.c:797 @@ -86,7 +86,7 @@ "pattern, or drag one to this space." msgstr "" "Farb- bzw. Mustervorschau. Um eine neue Farbe oder ein neues Muster " -"auszuwählen,können Sie klicken oder eine Farbe oder ein Muster hierauf " +"auszuwählen, können Sie klicken oder eine Farbe oder ein Muster hierauf " "ziehen." #: src/menus-gtk.c:172 @@ -147,9 +147,9 @@ msgstr "Die Bilddaten verwenden einen unbekannten Farbraum: %d" #: src/widget-set-gtk.c:112 -#, fuzzy, c-format +#, c-format msgid "Moves: %d / %d" -msgstr "Züge: %d" +msgstr "Züge: %d / %d" #: src/widget-set-gtk.c:138 #, c-format @@ -167,59 +167,59 @@ #: src/widget-set-gtk.c:203 msgid "Rewind" -msgstr "" +msgstr "Zurückspulen" #: src/widget-set-gtk.c:204 msgid "Go to the previous mark (or the beginning) of the sequence of moves" -msgstr "" +msgstr "Gehe zur vorherigen Markierung (oder dem Anfang) der Zugabfolge" #: src/widget-set-gtk.c:210 msgid "Back" -msgstr "" +msgstr "Zurück" #: src/widget-set-gtk.c:211 msgid "Make one step backwards" -msgstr "" +msgstr "Mache einen Schritt zurück" #: src/widget-set-gtk.c:217 msgid "Stop" -msgstr "" +msgstr "Stop" #: src/widget-set-gtk.c:218 msgid "Stop running the sequence of moves" -msgstr "" +msgstr "Halte den Lauf der Zugabfolge an" #: src/widget-set-gtk.c:224 msgid "Mark" -msgstr "" +msgstr "Markieren" #: src/widget-set-gtk.c:225 msgid "Mark the current place in the sequence of moves" -msgstr "" +msgstr "Markiere die aktuelle Stelle in der Zugabfolge" #: src/widget-set-gtk.c:231 msgid "Forward" -msgstr "" +msgstr "Vor" #: src/widget-set-gtk.c:232 msgid "Make one step forwards" -msgstr "" +msgstr "Mache einen Schritt voran" #: src/widget-set-gtk.c:238 msgid "Play" -msgstr "" +msgstr "Abspielen" #: src/widget-set-gtk.c:239 msgid "Run forward through the sequence of moves" -msgstr "" +msgstr "Laufe vorwärts durch die Zugabfolge" #: src/widget-set-gtk.c:279 msgid "_Play Toolbar" -msgstr "" +msgstr "_Abspielen-Werkzeugleiste" #: src/widget-set-gtk.c:286 msgid "_Status Bar" -msgstr "" +msgstr "S_tatus-Werkzeugleiste" #: src/widget-set-gtk.c:307 msgid "/_Game" @@ -243,16 +243,15 @@ #: src/widget-set-gtk.c:313 msgid "/_Settings/_Preferences" -msgstr "/Einstellungen/E_instellungen" +msgstr "/E_instellungen/E_instellungen" #: src/widget-set-gtk.c:315 msgid "/_Settings/_Colours" -msgstr "/Einstellungen/_Farben" +msgstr "/E_instellungen/_Farben" #: src/widget-set-gtk.c:317 -#, fuzzy msgid "/_Settings/Sho_w\\/Hide" -msgstr "/E_instellungen" +msgstr "/E_instellungen/Zeigen\\/Verstecken" #: src/widget-set-gtk.c:326 msgid "/_Help" @@ -263,9 +262,8 @@ msgstr "/_Hilfe/_Info" #: src/widget-set-gtk.c:374 -#, fuzzy msgid "/Settings/Show\\/Hide" -msgstr "/E_instellungen" +msgstr "/Einstellungen/Zeigen\\/Verstecken" #~ msgid "R_eset" #~ msgstr "Zurücksetzen" --- gnubik-2.2.orig/po/LINGUAS +++ gnubik-2.2/po/LINGUAS @@ -1 +1 @@ -ca da de en_US es eu fi fr_FR he it ms no pl tr ro ru +ca da de en_US es eu fi fr he it ms no pl tr ro ru sv --- gnubik-2.2.orig/po/sv.po +++ gnubik-2.2/po/sv.po @@ -0,0 +1,260 @@ +# Swedish translation of gnubik. +# Copyright (C) 2006 John Darrington +# This file is distributed under the same license as the gnubik package. +# Daniel Nylander , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: gnubik 2.2-4\n" +"Report-Msgid-Bugs-To: bug-gnubik@gnu.org\n" +"POT-Creation-Date: 2004-08-19 18:41+0800\n" +"PO-Revision-Date: 2006-01-09 08:26+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: src/colour-sel-gtk.c:183 +#, c-format +msgid "Cannot create image from file %s: %s" +msgstr "Kan inte skapa bild från fil %s: %s" + +#: src/colour-sel-gtk.c:226 +msgid "Image Selector" +msgstr "Bildväljaren" + +#: src/colour-sel-gtk.c:377 +msgid "Pattern" +msgstr "Mönster" + +#: src/colour-sel-gtk.c:378 +msgid "Colour" +msgstr "Färg" + +#: src/colour-sel-gtk.c:405 +msgid "Click here to use a pattern on the cube surface" +msgstr "Klicka här för att använda ett mönster på kubens yta" + +#: src/colour-sel-gtk.c:691 +msgid "Colour selector" +msgstr "Färgväljaren" + +#: src/colour-sel-gtk.c:718 +msgid "Image" +msgstr "Bild" + +#: src/colour-sel-gtk.c:719 +msgid "Se_lect" +msgstr "Vä_lj" + +#: src/colour-sel-gtk.c:722 +msgid "Select an image file" +msgstr "Välj en bildfil" + +#: src/colour-sel-gtk.c:723 +msgid "Use an image file on the cube face" +msgstr "Använd en bildfil på kubens yta" + +#: src/colour-sel-gtk.c:725 +msgid "_Tiled" +msgstr "_Rutad" + +#: src/colour-sel-gtk.c:727 +msgid "" +"Place a copy of the image\n" +"on each block" +msgstr "" +"Placera en kopia av bilden\n" +"på varje block" + +#: src/colour-sel-gtk.c:732 +msgid "_Mosaic" +msgstr "_Mosaik" + +#: src/colour-sel-gtk.c:735 +msgid "" +"Place a copy of the image across\n" +"the entire face of the cube" +msgstr "" +"Placera en kopia av bilden på\n" +"hela kubens yta" + +#: src/colour-sel-gtk.c:797 +msgid "A sample of the colour or pattern. You can click and select a new colour or pattern, or drag one to this space." +msgstr "Ett test av färgen eller mönstret. Du kan klicka och välja en ny färg eller nytt mönster, eller dra en till denna ruta." + +#: src/menus-gtk.c:172 +msgid "Sets the number of blocks in each side" +msgstr "Sätt antal block på varje sida" + +#: src/menus-gtk.c:177 +msgid "Size of cube:" +msgstr "Kubens storlek:" + +#: src/menus-gtk.c:225 +msgid "Faster" +msgstr "Snabbare" + +#: src/menus-gtk.c:228 +msgid "Slower" +msgstr "Långsammare" + +#: src/menus-gtk.c:233 +msgid "Controls the speed with which slices rotate" +msgstr "Kontrollerar hastigheten som delarna roterar med" + +#: src/menus-gtk.c:293 +msgid "Preferences" +msgstr "Inställningar" + +#: src/menus-gtk.c:298 +msgid "Dimensions" +msgstr "Dimensioner" + +#: src/menus-gtk.c:299 +msgid "Animation" +msgstr "Animering" + +#: src/menus-gtk.c:300 +msgid "Lighting" +msgstr "Belysning" + +#: src/menus-gtk.c:309 +msgid "Enable lighting" +msgstr "Aktivera belysning" + +#: src/menus-gtk.c:311 +msgid "Makes the cube appear illuminated" +msgstr "Gör att kuben verkar upplyst" + +#: src/menus-gtk.c:409 +msgid "Start cube with new settings?" +msgstr "Starta kub med nya inställningar?" + +#: src/textures.c:204 +msgid "Pixbuf has wrong number of channels" +msgstr "Pixbuf har fel antal kanaler" + +#: src/textures.c:212 +#, c-format +msgid "Pixbuf has unknown colorspace: %d" +msgstr "Pixbuf har okänd färgrymd: %d" + +#: src/widget-set-gtk.c:112 +#, c-format +msgid "Moves: %d / %d" +msgstr "Vridningar: %d / %d" + +#: src/widget-set-gtk.c:138 +#, c-format +msgid "Cube solved in %d move" +msgid_plural "Cube solved in %d moves" +msgstr[0] "Kub löst i %d vridning" +msgstr[1] "Kub löst i %d vridningar" + +#: src/widget-set-gtk.c:144 +msgid "Cube is NOT solved! The colours are correct, but have incorrect orientation" +msgstr "Kub är INTE löst! Färgerna är korrekt men har inkorrekt orientering" + +#: src/widget-set-gtk.c:203 +msgid "Rewind" +msgstr "Spola bakåt" + +#: src/widget-set-gtk.c:204 +msgid "Go to the previous mark (or the beginning) of the sequence of moves" +msgstr "Gå till föregående markering (eller början) av vridningssekvensen" + +#: src/widget-set-gtk.c:210 +msgid "Back" +msgstr "Tillbaka" + +#: src/widget-set-gtk.c:211 +msgid "Make one step backwards" +msgstr "Gå ett steg bakåt" + +#: src/widget-set-gtk.c:217 +msgid "Stop" +msgstr "Stopp" + +#: src/widget-set-gtk.c:218 +msgid "Stop running the sequence of moves" +msgstr "Stopp körning av vridningssekvensen" + +#: src/widget-set-gtk.c:224 +msgid "Mark" +msgstr "Markera" + +#: src/widget-set-gtk.c:225 +msgid "Mark the current place in the sequence of moves" +msgstr "Markera nuvarande plats i vridningssekvensen" + +#: src/widget-set-gtk.c:231 +msgid "Forward" +msgstr "Framåt" + +#: src/widget-set-gtk.c:232 +msgid "Make one step forwards" +msgstr "Gå ett steg framåt" + +#: src/widget-set-gtk.c:238 +msgid "Play" +msgstr "Spela" + +#: src/widget-set-gtk.c:239 +msgid "Run forward through the sequence of moves" +msgstr "Kör framåt genom vridningssekvensen" + +#: src/widget-set-gtk.c:279 +msgid "_Play Toolbar" +msgstr "_Kontrollrad" + +#: src/widget-set-gtk.c:286 +msgid "_Status Bar" +msgstr "_Statusrad" + +#: src/widget-set-gtk.c:307 +msgid "/_Game" +msgstr "/_Spel" + +#: src/widget-set-gtk.c:308 +msgid "/_Game/_New Game" +msgstr "/_Spel/_Nytt spel" + +#: src/widget-set-gtk.c:309 +msgid "/_Game/sep" +msgstr "/_Spel/sep" + +#: src/widget-set-gtk.c:310 +msgid "/_Game/_Quit" +msgstr "/_Spel/_Avsluta" + +#: src/widget-set-gtk.c:312 +msgid "/_Settings" +msgstr "/_Alternativ" + +#: src/widget-set-gtk.c:313 +msgid "/_Settings/_Preferences" +msgstr "/_Alternativ/_Inställningar" + +#: src/widget-set-gtk.c:315 +msgid "/_Settings/_Colours" +msgstr "/_Alternativ/_Färger" + +#: src/widget-set-gtk.c:317 +msgid "/_Settings/Sho_w\\/Hide" +msgstr "/_Alternativ/Vi_sa\\/Göm" + +#: src/widget-set-gtk.c:326 +msgid "/_Help" +msgstr "/_Hjälp" + +#: src/widget-set-gtk.c:327 +msgid "/_Help/_About" +msgstr "/_Hjälp/_Om" + +#: src/widget-set-gtk.c:374 +msgid "/Settings/Show\\/Hide" +msgstr "/Alternativ/Visa\\/Göm" + --- gnubik-2.2.orig/src/colour-sel-gtk.c +++ gnubik-2.2/src/colour-sel-gtk.c @@ -1265,6 +1265,7 @@ gtk_widget_destroy(w); break; case GTK_RESPONSE_REJECT: + case -4: reset_swatch(); gtk_widget_destroy(w); break; --- gnubik-2.2.orig/doc/gnubik.6 +++ gnubik-2.2/doc/gnubik.6 @@ -22,7 +22,7 @@ .SH SYNOPSIS .B gnubik -[window_system_options] [-hvs] [-z n] [-a m] +[window_system_options] [\-hvs] [\-z n] [\-a m] .SH DESCRIPTION This is a program which displays a 3 dimensional image of a magic cube, --- gnubik-2.2.orig/debian/docs +++ gnubik-2.2/debian/docs @@ -0,0 +1 @@ +TODO --- gnubik-2.2.orig/debian/changelog +++ gnubik-2.2/debian/changelog @@ -0,0 +1,77 @@ +gnubik (2.2-7) unstable; urgency=low + + * src/colour-sel-gtk.c: Don't abort when closing the colour selection + window. Closes: #409090. + * debian/copyright: Updated. + + -- Bart Martens Wed, 31 Jan 2007 08:51:27 +0100 + +gnubik (2.2-6) unstable; urgency=low + + * New maintainer. Closes: #382556. + * debian/control: Standards version, homepage. + + -- Bart Martens Fri, 18 Aug 2006 19:44:42 +0200 + +gnubik (2.2-5) unstable; urgency=low + + * New Mantainer. (closes: #344451) + * Updated debian/watch file. + * Added suport to desktop menu (added gnubik.desktop file and changed rules) + * Added Swedish po translation, thanks to Daniel Nylander + . (Closes: #346517) + + -- Jose Carlos Medeiros Fri, 23 Dec 2005 16:32:32 -0200 + +gnubik (2.2-4) unstable; urgency=low + + * Prune Build-Depends, prune Depends via appropriate make flags + to work around *-config tools pulling in unnecessary libs + * Build-Depend on autotools-dev for latest config.{sub,guess} + * Fix hyphen-used-as-minus-sign in manpage + + -- Florian Ernst Thu, 24 Nov 2005 20:57:18 +0100 + +gnubik (2.2-3) unstable; urgency=low + + * Allow French translation to work for fr, not only for fr_FR + (Closes: #336797, upstream will fix this for the next release) + * debian/copyright: update FSF address + * debian/rules: minor adjustments / improvements + * Standards-Version 3.6.2, no changes required + + -- Florian Ernst Mon, 7 Nov 2005 10:40:53 +0100 + +gnubik (2.2-2) unstable; urgency=low + + * New maintainer address, many thanks to Shaun Jackman for previous + sponsoring + * debian/changelog: fix indentation of previous entries + * Hackishly extend German l10n + + -- Florian Ernst Thu, 3 Feb 2005 11:50:19 +0100 + +gnubik (2.2-1) unstable; urgency=low + + * New upstream release + + includes fix for crash when changing settings / new game during + autosolve (Closes: #265957) + + deprecates Athena widget set, thus removing README.Debian note + + fixes powerpc segfault on quit (Closes: #270571) + + -- Florian Ernst Tue, 21 Sep 2004 13:48:26 +0200 + +gnubik (2.1-2) unstable; urgency=low + + * Remove dir{,.old}.gz, doh! (Closes: #265171) + * debian/control: removed <> from around upstream homepage + * Backported fix from CVS for certain X server configurations + + -- Florian Ernst Sun, 15 Aug 2004 23:33:53 +0200 + +gnubik (2.1-1) unstable; urgency=low + + * Initial Release (Closes: #204296, #260709) + + -- Florian Ernst Fri, 23 Jul 2004 11:38:17 +0200 + --- gnubik-2.2.orig/debian/rules +++ gnubik-2.2/debian/rules @@ -0,0 +1,86 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +#export DH_VERBOSE=1 + +PACKAGE=$(shell dh_listpackages) + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir + ln -sf /usr/share/misc/config.sub config.sub + ln -sf /usr/share/misc/config.guess config.guess + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --bindir=\$${prefix}/games \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --with-guile + +build: build-stamp +build-stamp: config.status + dh_testdir + # bug#336797 + [ ! -f po/fr_FR.po ] || mv -f po/fr_FR.po po/fr.po + [ ! -f po/fr_FR.gmo ] || mv -f po/fr_FR.gmo po/fr.gmo + $(MAKE) LDFLAGS="-Wl,--export-dynamic -L/usr/X11R6/lib -lgtkglext-x11-1.0" \ + GTKLIBS="" LIBS="" GUILE_LDFLAGS="-lguile" gnubik_LDADD="-lguile" + ( cd $(CURDIR)/po && $(MAKE) de.gmo ) + touch $@ + +clean: + dh_testdir + dh_testroot + -rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) -i distclean + # bug#336797 + [ ! -f po/fr.po ] || mv -f po/fr.po po/fr_FR.po + [ ! -f po/fr.gmo ] || mv -f po/fr.gmo po/fr_FR.gmo + dh_clean config.sub config.guess po/de.gmo + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/$(PACKAGE) + rm -rf $(CURDIR)/debian/$(PACKAGE)/usr/share/info + install -D -m 0644 src/gnubik.xpm \ + $(CURDIR)/debian/$(PACKAGE)/usr/share/pixmaps/gnubik.xpm + install -D -m 644 debian/gnubik.desktop \ + $(CURDIR)/debian/$(PACKAGE)/usr/share/applications/gnubik.desktop + +binary-indep: build install +# We have nothing to do by default. + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installmenu + dh_installinfo doc/gnubik.info + dh_link + dh_desktop + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- gnubik-2.2.orig/debian/copyright +++ gnubik-2.2/debian/copyright @@ -0,0 +1,46 @@ +This package was debianized by Florian Ernst on +Wed, 21 Jul 2004 20:52:17 +0200. + +It was downloaded from . + +Upstream Authors: + +John Mark Darrington + is the main author and maintainer of this package. + +Dale Mellor + wrote guile_hooks.c, guile_hooks.h, and all of the Scheme code; cube.c, + cube_i.h and cube.h were written based heavily on previous work by John + Darrington. + +Copyright: + +(C) 1998, 2003 John Darrington + 2004 John Darrington, Dale Mellor + +License: + + This program 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 program 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 with + the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; + if not, write to the + Free Software Foundation, Inc., 51 Franklin St, 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'. + +The Debian packaging is +Copyright (C) 2004-2005, Florian Ernst +Copyright (C) 2005, Jose Carlos Medeiros +Copyright (C) 2006-2007, Bart Martens +and is licensed under the GPL, see above. --- gnubik-2.2.orig/debian/control +++ gnubik-2.2/debian/control @@ -0,0 +1,19 @@ +Source: gnubik +Section: games +Priority: optional +Maintainer: Bart Martens +Build-Depends: debhelper (>= 4.0.0), guile-1.6-dev, libgtkglext1-dev, autotools-dev +Standards-Version: 3.7.2 + +Package: gnubik +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: 3D Rubik's cube game + GNUbik is an interactive, graphical, single player puzzle. This free + program renders an image of a cube, like that invented by Erno Rubik. + You have to manipulate the cube using the mouse. When each face shows + only one colour, the game is solved. + . + It uses Gtk+ and/or X11 and Mesa / OpenGL. + . + Homepage: http://www.gnu.org/software/gnubik/ --- gnubik-2.2.orig/debian/watch +++ gnubik-2.2/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnu.org/gnu/gnubik/ gnubik-(.*)\.tar\.gz --- gnubik-2.2.orig/debian/gnubik.desktop +++ gnubik-2.2/debian/gnubik.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=2.2 +Type=Application +Encoding=UTF-8 +Terminal=false +Name=GNUbik +Icon=/usr/share/pixmaps/gnubik.xpm +GenericName=GNUbik Game +Comment=3D Rubik's cube game +Exec=/usr/games/gnubik +Categories=Application;Game;Puzzles --- gnubik-2.2.orig/debian/menu +++ gnubik-2.2/debian/menu @@ -0,0 +1,3 @@ +?package(gnubik):needs="X11" section="Games/Puzzles" \ + title="GNUbik" command="/usr/games/gnubik" \ + icon="/usr/share/pixmaps/gnubik.xpm" --- gnubik-2.2.orig/debian/compat +++ gnubik-2.2/debian/compat @@ -0,0 +1 @@ +4