This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository hitori.
commit 3985653d61ef67f3104e83fe046fa8dbed995f32 Author: Peter de Wachter <[email protected]> Date: Thu Sep 11 22:36:20 2008 +0000 [svn-inject] Applying Debian modifications to trunk --- debian/changelog | 8 ++ debian/compat | 1 + debian/control | 22 +++ debian/copyright | 46 +++++++ debian/docs | 2 + debian/hitori.6 | 40 ++++++ debian/hitori.install | 1 + debian/hitori.manpages | 1 + debian/hitori.xpm | 246 ++++++++++++++++++++++++++++++++++ debian/menu | 3 + debian/patches/gtk2.12-backport.patch | 38 ++++++ debian/patches/series | 1 + debian/rules | 43 ++++++ debian/watch | 3 + 14 files changed, 455 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..0f64e30 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,8 @@ +hitori (0.2.1-1) unstable; urgency=low + + * Initial release (Closes: #490222) + * The game is patched to use GnomeVFS to launch its help file. This patch + can be removed when GTK+ 2.14 enters the archive. + + -- Peter De Wachter <[email protected]> Wed, 03 Sep 2008 20:04:39 +0200 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..db3509e --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: hitori +Section: games +Priority: optional +Maintainer: Debian Games Team <[email protected]> +Uploaders: Peter De Wachter <[email protected]> +Build-Depends: debhelper (>= 7), quilt, autotools-dev, gnome-common, + gnome-doc-utils, intltool, libgtk2.0-dev (>= 2.12), + libgnomevfs2-dev +Standards-Version: 3.8.0 +Homepage: http://tecnocode.co.uk/projects/hitori/ + +Package: hitori +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: scrollkeeper, yelp +Description: logic puzzle game similar to sudoku + Hitori puzzles give you a grid filled with numbers. The goal is to + remove numbers such that no row or column contains duplicates. + . + This implementation has undo/redo support, can give hints, and + generates puzzles up to 10x10 cells large. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..974d389 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,46 @@ +This package was debianized by Peter De Wachter <[email protected]> on +Wed, 03 Sep 2008 20:04:39 +0200. + +It was downloaded from http://tecnocode.co.uk/projects/hitori/ + +Upstream Author: + + Philip Withnall <[email protected]> + Algorithm assistance from Ben Windsor <[email protected]> + Icon by Jakub Szypulka <[email protected]> + +Copyright: + + Copyright (C) Philip Withnall 2007-2008 <[email protected]> + +License: + + Hitori 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. + + Hitori 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 Hitori. If not, see <http://www.gnu.org/licenses/>. + +The documentation is licensed separately: + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License + (GFDL), Version 1.2 or any later version published by the Free + Software Foundation with no Invariant Sections, no Front-Cover + Texts, and no Back-Cover Texts. + +On Debian systems the complete text of the GNU General Public License +can be found in the file `/usr/share/common-licenses/GPL'. The text of +the GNU Free Documentation License can be found in the file +`/usr/share/common-licenses/GFDL-1.2'. + + +The Debian packaging is (C) 2008, Peter De Wachter <[email protected]> +and is licensed under the same license (GPL) as the program. See above. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..50bd824 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +NEWS +README diff --git a/debian/hitori.6 b/debian/hitori.6 new file mode 100644 index 0000000..e345f50 --- /dev/null +++ b/debian/hitori.6 @@ -0,0 +1,40 @@ +.\" URL macro recipe from Branden Robinson's presentation +.de URL +\\$2 \(laURL: \\$1 \(ra\\$3 +.. +.if \n[.g] .mso www.tmac +.\" End of recipe. +. +.TH hitori 6 "2008-09-11" +.\" Please adjust this date whenever revising the manpage. +. +.SH "NAME" +. +hitori \- plays the game of hitori +. +.SH "SYNOPSIS" +. +.B hitori +. +.SH "DESCRIPTION" +. +Hitori puzzles give you a grid filled with numbers. +The goal is to remove numbers such that no row or column contains duplicates. +.P +This implementation has undo/redo support, can give hints, and +generates puzzles up to 10\[mu]10 cells large. +.P +The full documentation is available through the program's +.I Help +menu. +. +.SH "SEE ALSO" +. +.URL "http://tecnocode.co.uk/projects/hitori/"; "The game's web site" "" +. +.SH "AUTHOR" +. +Philip Withnall ([email protected]) +. +This manual page was written by Peter De Wachter ([email protected]) for +the Debian GNU/Linux system (but may be used by others). diff --git a/debian/hitori.install b/debian/hitori.install new file mode 100644 index 0000000..98fe562 --- /dev/null +++ b/debian/hitori.install @@ -0,0 +1 @@ +debian/hitori.xpm usr/share/pixmaps/ diff --git a/debian/hitori.manpages b/debian/hitori.manpages new file mode 100644 index 0000000..608b12c --- /dev/null +++ b/debian/hitori.manpages @@ -0,0 +1 @@ +debian/hitori.6 diff --git a/debian/hitori.xpm b/debian/hitori.xpm new file mode 100644 index 0000000..69d0bfb --- /dev/null +++ b/debian/hitori.xpm @@ -0,0 +1,246 @@ +/* XPM */ +static char *hitori[] = { +/* columns rows colors chars-per-pixel */ +"32 32 208 2", +" c gray2", +". c #080807", +"X c gray3", +"o c gray4", +"O c #0C0C0C", +"+ c #110808", +"@ c #120808", +"# c #101010", +"$ c #121510", +"% c gray8", +"& c #151515", +"* c #161615", +"= c gray9", +"- c #181818", +"; c gray10", +": c #1B1C1B", +"> c #202020", +", c gray13", +"< c #222221", +"1 c #222222", +"2 c #232323", +"3 c gray14", +"4 c #252525", +"5 c #272726", +"6 c #272827", +"7 c gray16", +"8 c #2A2A29", +"9 c #2B2B2A", +"0 c #2C2C2B", +"q c gray18", +"w c #30302F", +"e c #323231", +"r c #323232", +"t c #323332", +"y c #333332", +"u c #343433", +"i c #353535", +"p c #363635", +"a c gray22", +"s c #393A39", +"d c #3C3C3B", +"f c #3C3C3C", +"g c #3E3E3D", +"h c #3F3F3E", +"j c #424241", +"k c gray26", +"l c #434342", +"z c #444544", +"x c #474746", +"c c gray28", +"v c #484948", +"b c #4B4B4A", +"n c #4B4C4B", +"m c #4C4C4C", +"M c #4D4D4C", +"N c #4F504F", +"B c #515150", +"V c #515251", +"C c #535453", +"Z c gray33", +"A c #555554", +"S c #555555", +"D c #5C5351", +"F c #5A5554", +"G c #5A5A5A", +"H c #5F605F", +"J c gray38", +"K c #656665", +"L c #666766", +"P c #686967", +"I c #696A68", +"U c #696A69", +"Y c #6A6A68", +"T c #6B6B6A", +"R c #6B6C6B", +"E c #6C6D6C", +"W c #6D6E6D", +"Q c gray43", +"! c #717270", +"~ c #727370", +"^ c #757674", +"/ c #767675", +"( c #767775", +") c #797978", +"_ c #797A78", +"` c #797A79", +"' c #7A7A79", +"] c #7A7B7A", +"[ c #7B7B7B", +"{ c #7C7C7B", +"} c #7C7D7C", +"| c #9D0000", +" . c #A10000", +".. c #A20000", +"X. c #A30101", +"o. c #A30202", +"O. c #A40000", +"+. c #A40202", +"@. c #A50202", +"#. c #A40303", +"$. c #A50303", +"%. c #A10602", +"&. c #A50404", +"*. c #CC0000", +"=. c #CC0202", +"-. c #CD0404", +";. c #EF2929", +":. c #EF2B2B", +">. c #EF2C2C", +",. c #D94848", +"<. c #DA4A4A", +"1. c #DB4A4A", +"2. c #DB4C4C", +"3. c #EE6161", +"4. c #EF6363", +"5. c #F26666", +"6. c #F46767", +"7. c #F46969", +"8. c #4C9507", +"9. c #4E9807", +"0. c #4E9A06", +"q. c #4F9A07", +"w. c #509706", +"e. c #509B08", +"r. c #509B0A", +"t. c #519C0B", +"y. c #8AE234", +"u. c #8BE236", +"i. c #8CE237", +"p. c #A8E76B", +"a. c #ABE96E", +"s. c #ACEA6F", +"d. c #ADEB71", +"f. c #818280", +"g. c #828380", +"h. c #828381", +"j. c #868685", +"k. c #868786", +"l. c #878786", +"z. c #898988", +"x. c #898A88", +"c. c #8A8B88", +"v. c #8A8B8A", +"b. c #8D8D8C", +"n. c #8E8F8D", +"m. c #8F908E", +"M. c #90918F", +"N. c #91928F", +"B. c #929390", +"V. c #939491", +"C. c #939493", +"Z. c #959695", +"A. c #969796", +"S. c #9B9C9A", +"D. c #9C9C9B", +"F. c #9E9F9C", +"G. c #C4C5C2", +"H. c #C4C5C3", +"J. c #C5C6C3", +"K. c #C7C7C5", +"L. c #C7C8C6", +"P. c #CBCCCA", +"I. c #CCCDCB", +"U. c #CDCECC", +"Y. c #CECFCD", +"T. c #CFD0CE", +"R. c #D0D0CE", +"E. c #D0D0CF", +"W. c #D0D1CF", +"Q. c #D1D2D0", +"!. c #D2D3D1", +"~. c #D2D3D2", +"^. c #D3D4D2", +"/. c #D4D5D3", +"(. c #D5D6D4", +"). c #E3E2DB", +"_. c #EAE6E4", +"`. c #E9EBE7", +"'. c #EAEBE9", +"]. c #EDE8E8", +"[. c #EEE9E8", +"{. c #EEEAE8", +"}. c #EFEAE9", +"|. c #EAECE8", +" X c #EBEDE9", +".X c #ECEDEB", +"XX c #F0EBEA", +"oX c #F0ECEA", +"OX c #EDF0EA", +"+X c #EEF1EB", +"@X c #EFF3EC", +"#X c #EFF0EE", +"$X c #F0F0EF", +"%X c #F1F1F0", +"&X c #F1F2F0", +"*X c #F2F2F1", +"=X c #F2F3F1", +"-X c #F3F3F2", +";X c #F3F4F2", +":X c #F4F4F3", +">X c #F4F5F3", +",X c #F5F5F4", +"<X c #F5F6F4", +"1X c #F8F8F7", +"2X c #F8F9F7", +"3X c #F8F9F8", +"4X c #F9F9F8", +"5X c None", +/* pixels */ +"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X", +"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X", +"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X", +"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X", +"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X", +"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X+ 5X5X5X5X@ 5X5X5X5X5X5X5X5X5X5X5X", +"5X5X5X5X5XZ A.v.[ E q V l t 1 .#.#.&.&.O.F U ` z.m 5X5X5X5X5X5X", +"5X5X5X5X5XJ Q.(.(.(.H ;X3X3X4X$.5.6.6.7.&.oX4X4X4XL 5X5X5X5X5X5X", +"5X5X5X5X5XS Q.H.G.(.C -X|.`.4X+.5.:.;.6.&.XX|.`.4XG 5X5X5X5X5X5X", +"5X5X5X5X5Xv W.J.H.(.x *X X|.4X+.5.>.:.6.&.}. X|.4XM 5X5X5X5X5X5X", +"5X5X5X5X5Xf U.~.!.!.s .X*X*X&X+.3.4.4.4.&._.-X:X<Xg 5X5X5X5X5X5X", +"5X5X5X5X5X4 V.x.' T % B l y 2 O.@.@.@[email protected] Y _ c., 5X5X5X5X5X5X", +"5X5X5X5X5X3 &X3X3X4X3 &X3X3X4XX.<.1.1.2.o.{.3X3X4X4 5X5X5X5X5X5X", +"5X5X5X5X5X- %X|.`.4X= %X|.`.4X..<.=.*.1.o.[.|.`.4X- 5X5X5X5X5X5X", +"5X5X5X5X5Xo $X X|.4Xo $X X|.4X..<.-.=.1.o.]. X|.4Xo 5X5X5X5X5X5X", +"5X5X5X5X5X# .X,X:X>X# '.*X*X&X..,.<.<.<.%.).OX+X@X$ 5X5X5X5X5X5X", +"5X5X5X5X5X* S.N.f.! O b g w > | ....X.X.w.r.r.r.t.0.5X5X5X5X5X5X", +"5X5X5X5X5X9 &X4X4X4X6 T.^.^./.7 &X4X4X4Xq.a.s.s.d.r.5X5X5X5X5X5X", +"5X5X5X5X5Xa *X|.`.4Xu R.G.J./.p *X|.`.4Xq.a.u.y.s.r.5X5X5X5X5X5X", +"5X5X5X5X5Xz *X X|.4Xh E.K.L./.j *X X|.4Xq.a.i.u.s.r.5X5X5X5X5X5X", +"5X5X5X5X5XB #X,X:X>Xb P.Y.Y.I.M '.%X%X=Xq.p.a.a.a.r.5X5X5X5X5X5X", +"5X5X5X5X5Xc F.B.g.~ 5 N j r < . o ; 8 s 8.q.e.e.e.9.5X5X5X5X5X5X", +"5X5X5X5X5XR ;X3X3X4XI ;X3X3X4XP ;X3X3X4XP ;X3X3X4XW 5X5X5X5X5X5X", +"5X5X5X5X5X) :X|.`.4X( :X|.`.4X^ :X|.`.4X^ :X|.`.4X] 5X5X5X5X5X5X", +"5X5X5X5X5Xk.:X X|.4Xh.:X X|.4Xf.:X X|.4Xh.:X X|.4Xl.5X5X5X5X5X5X", +"5X5X5X5X5XC.>X1X1X2XM.>X1X1X2Xn.>X1X1X2Xm.>X1X1X2XZ.5X5X5X5X5X5X", +"5X5X5X5X5X{ D.b.} E k n d 0 : X & 4 i e A K / j.Q 5X5X5X5X5X5X", +"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X", +"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X", +"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X", +"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X", +"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X" +}; diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..08e898b --- /dev/null +++ b/debian/menu @@ -0,0 +1,3 @@ +?package(hitori):needs="X11" section="Games/Puzzles" \ + title="Hitori" command="/usr/games/hitori" \ + icon="/usr/share/pixmaps/hitori.xpm" diff --git a/debian/patches/gtk2.12-backport.patch b/debian/patches/gtk2.12-backport.patch new file mode 100644 index 0000000..f1f3298 --- /dev/null +++ b/debian/patches/gtk2.12-backport.patch @@ -0,0 +1,38 @@ +--- a/src/interface.c ++++ b/src/interface.c +@@ -21,6 +21,7 @@ + #include <cairo/cairo.h> + #include <math.h> + #include <glib/gi18n.h> ++#include <libgnomevfs/gnome-vfs.h> + + #include "config.h" + #include "main.h" +@@ -476,25 +477,18 @@ + void + hitori_contents_cb (GtkAction *action, Hitori *hitori) + { +- GTimeVal current_time; +- GError *error = NULL; +- +- g_get_current_time (¤t_time); ++ gnome_vfs_init(); + +- if (gtk_show_uri (gtk_widget_get_screen (hitori->window), "ghelp:hitori", +- current_time.tv_sec * 1000 + current_time.tv_usec, +- &error) == FALSE) { ++ if (gnome_vfs_url_show("ghelp:hitori") != GNOME_VFS_OK) { + GtkWidget *dialog = gtk_message_dialog_new (NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("The help contents could not be displayed.")); +- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), error->message); + + gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (dialog); +- g_error_free (error); + } + } + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..3ec45ba --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +gtk2.12-backport.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..39402d2 --- /dev/null +++ b/debian/rules @@ -0,0 +1,43 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +SHELL = /bin/bash + +include /usr/share/quilt/quilt.make + +build: patch build-stamp +build-stamp: + dh build --before configure + NOCONFIGURE=1 ./autogen.sh +# The GENERAL flags make configure skip its version check. Remove when we have GTK+ 2.14. + dh_auto_configure -- \ + --bindir /usr/games \ + --disable-scrollkeeper \ + GENERAL_CFLAGS="`pkg-config --cflags gtk+-2.0 gmodule-export-2.0 gnome-vfs-2.0`" \ + GENERAL_LIBS="`pkg-config --libs gtk+-2.0 gmodule-export-2.0 gnome-vfs-2.0`" +# We skip the "make test" as it complains about quilt's .pc directory +# (and it doesn't appear to check anything interesting) + dh build --before test + dh build --after test + touch build-stamp + +clean: unpatch + dh clean +# Kill everything that looks generated. A bit paranoid perhaps :) + dh_clean configure config.sub config.guess aclocal.m4 libtool ltmain.sh po/Makefile.in.in po/POTFILES \ + {.,src,help,data,data/icons,data/icons/*}/Makefile.in + +install: build install-stamp +install-stamp: + dh install --until installchangelogs +# There are two changelogs! + install help/ChangeLog debian/hitori/usr/share/doc/hitori/changelog.help + dh install --remaining + touch install-stamp + +binary: install + dh binary + +.PHONY: build clean install binary diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..fd8d91b --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://tecnocode.co.uk/projects/hitori/ http://tecnocode.co.uk/downloads/hitori-(.*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/hitori.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
