--- gnubik-2.4.orig/debian/compat +++ gnubik-2.4/debian/compat @@ -0,0 +1 @@ +5 --- gnubik-2.4.orig/debian/gnubik.xpm +++ gnubik-2.4/debian/gnubik.xpm @@ -0,0 +1,49 @@ +/* XPM */ +const static char *gnubik_xpm[] = { +/* columns rows colors chars-per-pixel */ +"32 32 11 1", +" c None", +". c #00007f", +"X c #7f0000", +"o c #7f007f", +"O c #7f7f00", +"+ c blue", +"@ c green", +"# c cyan", +"$ c red", +"% c magenta", +"& c yellow", +/* pixels */ +" ", +" ", +" ", +" ", +" @@@@@ $$$$$&& ", +" %%%%%%$$$$$$ ##### ", +" ++++++ ++++++&&&&&& ", +" %$ &&& ", +" @ %$$$$$$$ @@@@@@@+++++.+ ", +" @%%$$$$$$$ @@@@@@@+++++++ ", +" @%%$X$$$$$ @@@@@@@+++++++ ", +" #@%%$$$$$$$ @@@@@@ +++++++ ", +" #+% $$$X$$$ @@@@@@ ++++++ ", +" #+ $$$$$$$ @@@@@@ ++++++ ", +" #++ $$$$$$$ @@@@@@ ++++++ ", +" #++ &&&&&&& %%%%%% @@@@@@ ", +" ++ &&&&&&&%%%%%%% @@@@@@ ", +" $++ O&&&&&&%%%%%%% @@@@@@ ", +" $++ &&&&&& %o%%%%% @@@@@@ ", +" $$+ &&&&&& %%%%%%%@@@@@@@ ", +" $$+ &&&&&& %%%%%%%@@@@@@ ", +" $$@ &&&&&& %%%%%% @@@@@@ ", +" $$@ #### ", +" $@%%%%%%% @@@@@@ ###### ", +" $@%%%%%%% @@@@@@ ###### ", +" $@%%%%o%% @@@@@@ ###### ", +" @%%%%%%% @@@@@@ ###### ", +" @%%%%%%% @@@@@@ ###### ", +" %%%%%%% @@@@@@ ## ", +" ", +" ", +" " +}; --- gnubik-2.4.orig/debian/install +++ gnubik-2.4/debian/install @@ -0,0 +1,3 @@ +debian/gnubik.xpm usr/share/pixmaps/ +debian/gnubik.desktop usr/share/applications/ +doc/gnubik.info usr/share/info/ --- gnubik-2.4.orig/debian/gnubik.desktop +++ gnubik-2.4/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=Game;LogicGame; --- gnubik-2.4.orig/debian/watch +++ gnubik-2.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnu.org/gnu/gnubik/gnubik-(.*)\.tar\.gz --- gnubik-2.4.orig/debian/copyright +++ gnubik-2.4/debian/copyright @@ -0,0 +1,79 @@ +This package was debianized by Florian Ernst on +Wed, 21 Jul 2004 20:52:17 +0200. + +It was downloaded from: + + http://www.gnu.org/software/gnubik/ + http://www.gnu.org/software/gnubik/download.html + ftp://ftp.gnu.org/gnu/gnubik + +Upstream authors, as listed in the file 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, cube.h, move-queue.c, move-queue_i.h and move-queue.h were written + | based heavily on previous work by John Darrington. + +Copyright: + + Copyright (C) 1998, 2003, 2004, 2007, 2008 John Darrington + Copyright (C) 2004 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 3 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 + | along with this program. If not, see . + +On Debian systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL-3'. + +The Debian packaging is +Copyright (C) 2004-2005, Florian Ernst +Copyright (C) 2005, Jose Carlos Medeiros +Copyright (C) 2006-2007, 2009, Bart Martens +and is licensed under the GPL, see above. + +The files + doc/gnubik.info + doc/gnubik.texinfo +have this copyright and license: + + | Copyright (C) 1998, 2003 John Darrington + | 2004 John Darrington, Dale Mellor + | + | Copying and distribution of this file, with or without modification, + | are permitted in any medium without royalty provided the copyright + | notice and this notice are preserved. + +The file doc/gnubik-rubric has this copyright and license: + + | Copyright (C) 2004 John Darrington, Dale Mellor + | + | Permission is granted to anyone to make or distribute verbatim + | copies of this document as received, in any medium, provided that + | the copyright notice and this permission notice are preserved, + | thus giving the recipient permission to redistribute in turn. + | + | Permission is granted to distribute modified versions of this + | document, or of portions of it, under the above conditions, + | provided also that they carry prominent notices stating who last + | changed them. + +The file po/sv.po has this copyright and license: + + | Copyright (C) 2006 Daniel Nylander + | This file is distributed under the same license as the gnubik package. + --- gnubik-2.4.orig/debian/control +++ gnubik-2.4/debian/control @@ -0,0 +1,18 @@ +Source: gnubik +Section: games +Priority: optional +Maintainer: Bart Martens +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, guile-1.8-dev, libgtkglext1-dev, autoconf (>= 2.61), libgtk2.0-bin +Standards-Version: 3.9.3 +Homepage: http://www.gnu.org/software/gnubik/ + +Package: gnubik +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info +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. --- gnubik-2.4.orig/debian/menu +++ gnubik-2.4/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.4.orig/debian/changelog +++ gnubik-2.4/debian/changelog @@ -0,0 +1,132 @@ +gnubik (2.4-3) unstable; urgency=low + + * debian/rules: No longer installing icon-theme.cache. Closes: #671829. + + -- Bart Martens Mon, 07 May 2012 19:34:00 +0000 + +gnubik (2.4-2) unstable; urgency=low + + * debian/patches/03_hardening-format-security.diff: Closes: #643395. + + -- Bart Martens Thu, 29 Sep 2011 08:14:56 +0200 + +gnubik (2.4-1) unstable; urgency=low + + * New upstream release. Closes: #625565. + * debian/gnubik.xpm: Copied from version 2.3. + * debian/patches/03_409090.diff: Removed. + * Build-Depends: libgtk2.0-bin (gtk-update-icon-cache) + + -- Bart Martens Sat, 20 Aug 2011 14:39:09 +0000 + +gnubik (2.3-2) unstable; urgency=low + + * debian/copyright: Updated. Closes: #542244. + * debian/rules: Added removal of debian/gnubik/usr/share/info/dir. + * debian/info, debian/install: Install doc/gnubik.info via debian/install. + * debian/control: Depends: dpkg (>= 1.15.4) | install-info + + -- Bart Martens Sat, 26 Sep 2009 16:07:56 +0200 + +gnubik (2.3-1) unstable; urgency=low + + * New upstream release. + * debian/control: Homepage, Standards-Version. + * debian/control: Build-Depends: guile-1.8-dev. + * debian/manpages: Added. + * debian/patches/01_max_size_cube.diff: Updated. + * Moved existing changes to these patch files: + debian/patches/02_manpage.diff + debian/patches/03_409090.diff + * po/de.po: Now in the upstream part. + * po/sv.po: Now in the upstream part. + * debian/rules: Removed special handling of po/* files. + + -- Bart Martens Sun, 15 Feb 2009 07:31:32 +0100 + +gnubik (2.2-8) unstable; urgency=low + + * debian/*: Repackaged with cdbs. + * debian/patches/01_max_size_cube.diff: Added, limiting the size of the cube + to maximum 10x10x10. Closes: #446525. + * debian/gnubik.desktop: Updated "Categories". + + -- Bart Martens Sun, 28 Oct 2007 20:12:06 +0100 + +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.4.orig/debian/rules +++ gnubik-2.4/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --bindir=/usr/games \ + --with-guile + +DEB_INSTALL_DOCS_ALL := TODO + +install/gnubik:: + rm -f debian/gnubik/usr/share/info/dir + chmod a-x debian/gnubik/usr/share/icons/hicolor/*/apps/gnubik.png + rm -f debian/gnubik/usr/share/icons/hicolor/icon-theme.cache --- gnubik-2.4.orig/debian/manpages +++ gnubik-2.4/debian/manpages @@ -0,0 +1 @@ +doc/gnubik.6 --- gnubik-2.4.orig/debian/patches/02_manpage.diff +++ gnubik-2.4/debian/patches/02_manpage.diff @@ -0,0 +1,11 @@ +--- ../orig/gnubik-2.4/doc/gnubik.6 2011-04-02 09:08:05.000000000 +0000 ++++ doc/gnubik.6 2011-08-20 14:54:36.000000000 +0000 +@@ -21,7 +21,7 @@ + .SH SYNOPSIS + .B + gnubik +-[window_system_options] [-hvs] [-z n[,m[,p]]] [-a m] ++[window_system_options] [\-hvs] [\-z n[,m[,p]]] [\-a m] + + .SH DESCRIPTION + This is a program which displays a 3 dimensional image of a magic cube, --- gnubik-2.4.orig/debian/patches/01_max_size_cube.diff +++ gnubik-2.4/debian/patches/01_max_size_cube.diff @@ -0,0 +1,14 @@ +Fix for #446525. This patch limites the cube size to maximum 10x10x10. + + +--- ../orig/gnubik-2.4/src/dialogs.c 2011-04-02 09:08:05.000000000 +0000 ++++ src/dialogs.c 2011-08-20 14:52:02.000000000 +0000 +@@ -52,7 +52,7 @@ + for (i = 0; i < 3; ++i) + { + ps->adj[i] = +- gtk_adjustment_new (gbk_cube_get_size (game->cube, 0), 1, G_MAXFLOAT, ++ gtk_adjustment_new (gbk_cube_get_size (game->cube, 0), 1, 10, + 1, 1, 0); + g_object_ref (ps->adj[i]); + ps->entry[i] = gtk_spin_button_new (GTK_ADJUSTMENT (ps->adj[i]), 0, 0); --- gnubik-2.4.orig/debian/patches/03_hardening-format-security.diff +++ gnubik-2.4/debian/patches/03_hardening-format-security.diff @@ -0,0 +1,33 @@ +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gnubik-2.4/src/menus.c ./src/menus.c +--- ../orig/gnubik-2.4/src/menus.c 2011-04-02 11:08:05.000000000 +0200 ++++ ./src/menus.c 2011-09-29 08:05:26.000000000 +0200 +@@ -549,7 +549,7 @@ + dialog = gtk_message_dialog_new (parent, + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, +- GTK_BUTTONS_CLOSE, message); ++ GTK_BUTTONS_CLOSE, "%s", message); + g_free (message); + + gtk_window_set_title (GTK_WINDOW (dialog), _("Gnubik error")); +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gnubik-2.4/src/swatch.c ./src/swatch.c +--- ../orig/gnubik-2.4/src/swatch.c 2011-04-02 11:08:05.000000000 +0200 ++++ ./src/swatch.c 2011-09-29 08:08:12.000000000 +0200 +@@ -255,7 +255,7 @@ + utf8 = g_locale_to_utf8 (*s, -1, 0, 0, &gerr); + if (gerr) + { +- g_warning (gerr->message); ++ g_warning ("%s", gerr->message); + g_clear_error (&gerr); + gerr = 0; + continue; +@@ -265,7 +265,7 @@ + filename = g_filename_from_uri (utf8, 0, &gerr); + if (gerr) + { +- g_warning (gerr->message); ++ g_warning ("%s", gerr->message); + g_clear_error (&gerr); + continue; + }