--- cuyo-2.~-1.1.orig/debian/watch +++ cuyo-2.~-1.1/debian/watch @@ -0,0 +1,4 @@ +# See uscan(1) for format +version=3 +opts=uversionmangle=s/([^~]\.)-/$1~-/g;s/([^~])(alpha|beta|rc)/$1~$2/ \ + http://download.savannah.nongnu.org/releases/cuyo/cuyo-([a-z0-9.~-]*)\.tar\.gz --- cuyo-2.~-1.1.orig/debian/cuyo-data.install +++ cuyo-2.~-1.1/debian/cuyo-data.install @@ -0,0 +1 @@ +debian/cuyo.xpm /usr/share/pixmaps --- cuyo-2.~-1.1.orig/debian/compat +++ cuyo-2.~-1.1/debian/compat @@ -0,0 +1 @@ +5 --- cuyo-2.~-1.1.orig/debian/changelog +++ cuyo-2.~-1.1/debian/changelog @@ -0,0 +1,225 @@ +cuyo (2.~-1.1-1ubuntu3) karmic; urgency=low + + * Don't regester MimeType=application/x-executable in + the .desktop file. (LP: #386438) + * debian/patchs: Move all Ubuntu inline changes into quilt patches. + - gcc4.4.patch, makefile-fixes.patch, and desktop-file-fixes.patch + * debian/control: Build depend on quilt. + * debian/rules: Add quilt magic. Drop deprecated dh_desktop call. + + -- Andrew Starr-Bochicchio Fri, 18 Sep 2009 15:23:05 -0400 + +cuyo (2.~-1.1-1ubuntu2) karmic; urgency=low + + * Added missing header to fix FTBFS, thanks to Martin Michlmayr + (LP: #428593). + + -- Ilya Barygin Sun, 13 Sep 2009 00:31:27 +0400 + +cuyo (2.~-1.1-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Add installation of upstream icons and .desktop file + - Correct upstream .desktop file to be compliant with latest + freedesktop.org specification and Gnome HIG + - Correct upstream Makefile(s) so that icons and desktop files are installed + in the right directory (/usr/share instead of /usr/share/games). + - Modify Maintainer value to match Debian-Maintainer-Field Spec + * Bump debhelper version to 5.0.51, required by dh_icons. + + -- Cesare Tirabassi Sun, 17 Feb 2008 14:52:30 +0100 + +cuyo (2.~-1.1-1) unstable; urgency=low + + * new bugfix upstream version + - now also builds with gcc-4.3 (Closes: 461955) + * increase debhelper compatibility level to 5 + + -- Bernhard R. Link Thu, 14 Feb 2008 21:26:51 +0100 + +cuyo (2.~-1.0-1ubuntu1) hardy; urgency=low + + * Sync from debian unstable: + - drop ubuntu .desktop file + * Add installation of upstream icons and .desktop file + * Correct upstream .desktop file to be compliant with latest + freedesktop.org specification and Gnome HIG + * Correct upstream Makefile(s) so that icons and desktop files are installed + in the right directory (/usr/share instead of /usr/share/games). + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Cesare Tirabassi Wed, 26 Dec 2007 13:00:14 +0100 + +cuyo (2.~-1.0-1) unstable; urgency=low + + * new upstream release + + -- Bernhard R. Link Sat, 22 Dec 2007 15:27:40 +0100 + +cuyo (2.~-1.0~beta1-1) experimental; urgency=low + + * new upstream prerelease + * split architecture independent data into cuyo-data package + * add Homepage: and Vcs-* headers + * update debian/copyright + + -- Bernhard R. Link Sat, 27 Oct 2007 14:34:22 +0200 + +cuyo (2.~-1.0~alpha1-1) experimental; urgency=low + + * new upstream prerelease + - new graphic routines (Closes: 208688) + - adds small mode (Closes: 148822) + * updated build-dependencies as this now uses SDL instead of QT + * tidied up debian/rules + * bumped Standards-version + * add watch file + + -- Bernhard R. Link Sun, 31 Dec 2006 16:44:33 +0100 + +cuyo (1.8.6-1ubuntu1) feisty; urgency=low + + * create and install .desktop file (Closes: LP#90768) + + -- Cesare Tirabassi Sat, 10 Mar 2007 11:02:38 +0100 + +cuyo (1.8.6-1) unstable; urgency=low + + * new version (mostly new levels and code needed for that) + * general clean-up: + - update debian/copyrights + - move icon to /usr/share/pixmaps + - quote all values in debian/menu + - bump standards version + * add versioned build-depend to new qt to catch the right ABI. + + -- Bernhard R. Link Mon, 29 Aug 2005 17:48:43 +0200 + +cuyo (1.8.5-1) unstable; urgency=low + + * new upstream version + + -- Bernhard R. Link Mon, 9 Aug 2004 12:09:56 +0200 + +cuyo (1.8.4-0) unstable; urgency=low + + * new upstream version including new levels and + new qt-searching (Closes: #255613, #263418) + * building against newer xlibs will make the + dependencies more current (Closes: #253333) + + -- Bernhard R. Link Fri, 23 Jul 2004 16:07:10 +0200 + +cuyo (1.8.3-4) unstable; urgency=low + + * The "I hate bugs I cannot reproduce" release, + now totally circumventing the buggy autodetecting... + + -- Bernhard R. Link Thu, 9 Oct 2003 20:22:48 +0200 + +cuyo (1.8.3-3) unstable; urgency=medium + + * The "This code is buggier than I thought" workaround. + + -- Bernhard R. Link Thu, 9 Oct 2003 10:42:48 +0200 + +cuyo (1.8.3-2) unstable; urgency=medium + + * workaround for unreliable header-searching. + + -- Bernhard R. Link Wed, 8 Oct 2003 14:32:48 +0200 + +cuyo (1.8.3-1) unstable; urgency=medium + + * new upstream version fixing: + + 64-bit problems (Closes: #214430) + + -pedantic problems with libqt3 (Closes: #213856) + * fixed description (Closes: #207220) + + -- Bernhard R. Link Tue, 7 Oct 2003 20:02:48 +0200 + +cuyo (1.8.1-1) unstable; urgency=low + + * new upstream version + * binary moved to /usr/games, + data to /usr/share/games/cuyo + + -- Bernhard R. Link Tue, 19 Aug 2003 17:26:27 +0200 + +cuyo (1.7.0-1) unstable; urgency=low + + * new upstream version + + -- Bernhard R. Link Tue, 1 Apr 2003 18:33:39 +0200 + +cuyo (1.6.1-1) unstable; urgency=low + + * New upstream version incorporating the local changes and removing + compiler warning (did anyone try to run it on s390 before?) + + -- Bernhard R. Link Wed, 18 Dec 2002 14:45:35 +0100 + +cuyo (1.6.0-3) unstable; urgency=low + + * Removed catching of non-standard signal + + -- Bernhard R. Link Tue, 17 Dec 2002 20:03:16 +0100 + +cuyo (1.6.0-2) unstable; urgency=low + + * Run autoconf/make over it, to replace some buggy parts. + + -- Bernhard R. Link Tue, 17 Dec 2002 11:40:08 +0100 + +cuyo (1.6.0-1) unstable; urgency=low + + * New upstream release. + + -- Bernhard R. Link Wed, 11 Dec 2002 16:04:23 +0100 + +cuyo (1.05-1) unstable; urgency=high + + * Bugfix for an older bug (Closes: #143892) + + -- Bernhard Link Wed, 26 Apr 2002 14:57:15 +0200 + +cuyo (1.04-1) unstable; urgency=medium + + * new upstream version with many cleanups (Closes: #132348) + * Added absolute path to icon in menu (Closes: #141624) + + -- Bernhard Link Thu, 11 Apr 2002 15:37:02 +0200 + +cuyo (1.03-2) unstable; urgency=low + + * Fixed typo in debian/control (Closes: #124527) + + -- Bernhard Link Thu, 27 Dec 2001 15:53:52 +0100 + +cuyo (1.03-1) unstable; urgency=low + + * New upstream version (Level 'Jahreszeiten'(engl. seasons) + + -- Bernhard Link Thu, 13 Dec 2001 12:31:07 +0100 + +cuyo (1.02-1) unstable; urgency=low + + * New upstream version( including AM_MAINTAINER_MODE) + + -- Bernhard Link Tue, 27 Nov 2001 17:23:31 +0100 + +cuyo (1.00-7) unstable; urgency=low + + * Removed temorary files + * added AM_MAINTAINERMODE so that it won't mess with autotools while + building. + * Initial upload, i hope. (Closes: #120070) + + -- Bernhard Link Tue, 27 Nov 2001 12:17:45 +0100 + +cuyo (1.00-6) unstable; urgency=low + + * Repacked the new upstream 1.00 + * added icon for the menu. + + -- Bernhard Link Sat, 17 Nov 2001 18:20:21 +0200 --- cuyo-2.~-1.1.orig/debian/README.source +++ cuyo-2.~-1.1/debian/README.source @@ -0,0 +1,31 @@ +This package uses quilt in order to apply patches to the upstream source. +Patches are stored in debian/patches. For further details, see the man page for +quilt. + +All commands described below should be run from the top directory of the +package source tree, unless otherwise stated. + + * To generate the fully patched source, in a form ready for editing, that + would be built to create Debian packages, run: + + export QUILT_PATCHES=debian/patches + quilt push -a + + * To modify the source and save those modifications so that they will be + applied when building the package, pick a suitably informative patch file + name, for example Modify_README.source, and then run: + + export QUILT_PATCHES=debian/patches + quilt new Modify_README.source + quilt edit README.source + + This will place you in your default editor to modify the file. + Once your are done editing, save the file and run: + + quilt refresh + + * To remove source modifications that are currently being applied when + building the package, run: + + export QUILT_PATCHES=debian/patches + quilt top --- cuyo-2.~-1.1.orig/debian/cuyo.lintian +++ cuyo-2.~-1.1/debian/cuyo.lintian @@ -0,0 +1,2 @@ +cuyo: menu-icon-missing /usr/share/pixmaps/cuyo.xpm +cuyo: binary-without-manpage usr/games/cuyo --- cuyo-2.~-1.1.orig/debian/cuyo-data.docs +++ cuyo-2.~-1.1/debian/cuyo-data.docs @@ -0,0 +1,2 @@ +NEWS +README --- cuyo-2.~-1.1.orig/debian/copyright +++ cuyo-2.~-1.1/debian/copyright @@ -0,0 +1,125 @@ +This package was debianized by Bernhard R. Link + +The .orig.tar.gz should be downloadable from http://www.karimmi.de/cuyo/ +at the time this package hits the archives. + +Cuyo is copyright 1999-2007 by Immanuel Halupzok, 2005,2006,2007 by Mark Wayer +and multiple other contributors, including (quoting the AUTHORS file +a bit condensed): +| - Some minor contributions: Bernhard R. Link +| - Porting to Win: +| - First attempt: Arne Heizmann +| - Second attempt: Peter Hrenka +| - Level design: Bernhard Link, Bernhard Seckinger, +| Daniela Lipps, Immanuel Halupczok, Mark Weyer, Simon Huggenberger + +* 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. + +Your Debian System should have an copy of GPL version 2 in the file +/usr/share/common-licenses/GPL-2 and there is a file names COPYING in +the source package. + + +The files in datasrc/pics are scripts and rules for creating images using +povray that were used for creating the rendered images. (This is mostly +for documentation. While they could be used to recreate the images, +modifying or recreating the actual images is much easier). +Those scripts are: + +# Copyright 2005,2006,2007 by Mark Weyer +# 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. + +minor exceptions: + +configure is generated by automake/autoconf, +thus the parts not coming from configure.ac or SDL.m4 are +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. + +Some files includes by autotools (config.guess, config.sub, depcomp, missing, +ylwrap). +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +and are included under the same distribution terms as the rest of the program is. + +aclocal.m4 and the Makefile.in files contain code from automake which is: +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +install-sh states: +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# FSF changes to this file are in the public domain. + +src/parser.cc and src/parser.h is generated by bison and includes code that is: +| Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +| Free Software Foundation, Inc. +| +| 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, 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. + +The copy of the GPLv2 included in COPYING IS: +Copyright (C) 1989, 1991 Free Software Foundation, Inc. + +the file sdl.m4 states: +# Configure paths for SDL +# Sam Lantinga 9/21/99 +# stolen from Manish Singh +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor +# Slightly modified for Cuyo +but (except the last step) is actually an old one from libsdl which is under GPLv2. --- cuyo-2.~-1.1.orig/debian/control +++ cuyo-2.~-1.1/debian/control @@ -0,0 +1,37 @@ +Source: cuyo +Section: games +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Bernhard R. Link +Build-Depends: debhelper (>= 5.0.51), zlib1g-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, quilt +Standards-Version: 3.7.3 +Homepage: http://www.karimmi.de/cuyo/ +Vcs-Browser: http://cvs.savannah.nongnu.org/viewvc/cuyo/?root=cuyo +Vcs-Cvs: -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/cuyo cuyo + +Package: cuyo +Architecture: any +Depends: cuyo-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: Tetris-like game with very impressive effects + Cuyo, named after a Spanish relative adjective, shares + with tetris that things fall down and how to navigate them. + When enough "of the same type" come "together", they explode. + The goal of each level is to blow special "stones" away, you + start with. But what "of the same type" and "together" means, + varies with the levels. + +Package: cuyo-data +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: cuyo +Replaces: cuyo (<< 2.~-1.0~beta1-~) +Description: data files for the game cuyo + Cuyo, named after a Spanish relative adjective, shares + with tetris that things fall down and how to navigate them. + When enough "of the same type" come "together", they explode. + The goal of each level is to blow special "stones" away, you + start with. But what "of the same type" and "together" means, + varies with the levels. + . + This package contains the graphics, sounds, level description + and man pages for cuyo. --- cuyo-2.~-1.1.orig/debian/cuyo.xpm +++ cuyo-2.~-1.1/debian/cuyo.xpm @@ -0,0 +1,49 @@ +/* XPM */ +static char *magick[] = { +/* columns rows colors chars-per-pixel */ +"32 32 11 1", +" c Gray0", +". c Gray20", +"X c #4c4c4c", +"o c #666667", +"O c Gray50", +"+ c Gray60", +"@ c #b2b2b2", +"# c Gray80", +"$ c Gray90", +"% c Gray100", +"& c None", +/* pixels */ +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", +"&&&&&&&&&&&& &&&&&&&&&&&&", +"&&&&&&&&&& $$$#$$$+ &&&&&&&&&&&", +"&&&&&&&& $$$###@#+++ &&&&&&&&&&", +"&&&&&&& $#$@@@#+++++++ &&&&&&&&&", +"&&&&&&& $###+++++++O+O &&&&&&&&&", +"&&&&&& +##++++OO+OOO+OX &&&&&&&&", +"&&&&&& $+++++OOOOOO+OOX &&&&&&&&", +"&&&&&& $+++X OO. XO+o &&&&&&&&", +"&&&&&& $++X %% . %% XOo &&&&&&&&", +"&&&&&& $+O %%%% %%%% XX &&&&&&&&", +"&&&&&& ++ %%%%% %%%%% X &&&&&&&&", +"&&&&&&& + %% % % %% &&&&&&&&&", +"&&&&&&& + % % % % &&&&&&&&&", +"&&&&&&& + % % &&&&&&&&&", +"&&&&&& O %% .## %%. &&&&&&&&", +"&&&& +$$$ .$$## .$@# &&&&&&", +"&&& +$$$$#$$#$#@++#$$$##+O &&&&&", +"&& #$#@#@#++++++++++++++OX &&&&", +"&& $#@+++OOOOOOO++OO+OOO+X. &&&&", +"&& $+++++OOOOO+OOOOOOOOOOX. &&&&", +"&& $++OOOOOOOOOOOOOOOOO+XX. &&&&", +"&& OOOOOOO+OOOOOOOOOOXXo.. &&&&", +"&&& +OOXo+O+OO+OO+O+XXoXX. &&&&", +"&&& .XXXXXXXXXoXXXXXooXX.. &&&&&", +"&&&& ....XXoXoXXXoX.... &&&&&", +"&&&&&& .....Xo...... &&&&&&", +"&&&&&&&&& ...... &&&&&&&&", +"&&&&&&&&&&&& &&&&&&&&&&&", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" +}; --- cuyo-2.~-1.1.orig/debian/cuyo.dirs +++ cuyo-2.~-1.1/debian/cuyo.dirs @@ -0,0 +1,2 @@ +usr/games +usr/share/lintian/overrides --- cuyo-2.~-1.1.orig/debian/rules +++ cuyo-2.~-1.1/debian/rules @@ -0,0 +1,107 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -W -ansi -pedantic -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +config.status: configure + dh_testdir + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --bindir=\$${prefix}/games \ + --datadir=\$${prefix}/share/games \ + CXXFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \ + --disable-dependency-tracking + +build: $(QUILT_STAMPFN) build-arch-stamp build-indep-stamp +build-arch: build-arch-stamp +build-indep: build-indep-stamp +build-indep-stamp: config.status + dh_testdir + $(MAKE) -C data + $(MAKE) -C docs + touch build-indep-stamp + +build-arch-stamp: config.status + dh_testdir + $(MAKE) -C src + touch build-arch-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f src/parser.output + rm -f build-arch-stamp build-indep-stamp + if [ -e config.status ] ; then $(MAKE) distclean ; fi + ! test -e Makefile + ! test -e config.log + ! test -e config.status +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + if test -e config.sub ; then cp -f /usr/share/misc/config.sub config.sub ; fi +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + if test -e config.guess ; then cp -f /usr/share/misc/config.guess config.guess ; fi +endif + dh_clean + +binary-indep: build-indep-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -i + $(MAKE) install -C docs DESTDIR=$(CURDIR)/debian/cuyo-data/ + $(MAKE) install -C data DESTDIR=$(CURDIR)/debian/cuyo-data/ + $(MAKE) install -C icons DESTDIR=$(CURDIR)/debian/cuyo-data/ + dh_install -i + dh_installdocs -i + dh_installman -i + dh_installchangelogs -i + dh_icons -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build-arch-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -a + $(MAKE) -C src install DESTDIR=$(CURDIR)/debian/cuyo/ + # manpage and icon are in -data, so help lintian to know this: + install -m 644 debian/cuyo.lintian debian/cuyo/usr/share/lintian/overrides/cuyo + dh_installdocs -a + dh_installmenu -a + dh_installchangelogs -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build build-arch build-indep clean binary-indep binary-arch binary --- cuyo-2.~-1.1.orig/debian/cuyo.menu +++ cuyo-2.~-1.1/debian/cuyo.menu @@ -0,0 +1,2 @@ +?package(cuyo):needs="X11" section="Games/Blocks" \ + icon="/usr/share/pixmaps/cuyo.xpm" title="cuyo" command="/usr/games/cuyo" --- cuyo-2.~-1.1.orig/debian/patches/desktop-file-fixes.patch +++ cuyo-2.~-1.1/debian/patches/desktop-file-fixes.patch @@ -0,0 +1,21 @@ +# Improvements to the desktop file +# Debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488298 +# +# Don't regester MimeType=application/x-executable in the .desktop file. +# Ubuntu bug: https://bugs.edge.launchpad.net/ubuntu/+source/cuyo/+bug/386438 +Index: cuyo-2.~-1.1/icons/cuyo.desktop +=================================================================== +--- cuyo-2.~-1.1.orig/icons/cuyo.desktop 2009-09-18 15:21:48.000000000 -0400 ++++ cuyo-2.~-1.1/icons/cuyo.desktop 2009-09-18 15:22:34.000000000 -0400 +@@ -3,9 +3,7 @@ + Icon=cuyo + Type=Application + Terminal=false +-MimeType=application/x-executable + Categories=Game;BlocksGame; +-Encoding=UTF-8 +-Comment=A tetris like game with many levels +-Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln ++Comment=Play a tetris like game with many levels ++Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen + Exec=cuyo --- cuyo-2.~-1.1.orig/debian/patches/makefile-fixes.patch +++ cuyo-2.~-1.1/debian/patches/makefile-fixes.patch @@ -0,0 +1,43 @@ +# Install desktop file and icons correctly. +# Introduced in 2.~-1.0-1ubuntu1 +Index: cuyo-2.~-1.1/icons/Makefile.am +=================================================================== +--- cuyo-2.~-1.1.orig/icons/Makefile.am 2009-09-18 15:19:57.000000000 -0400 ++++ cuyo-2.~-1.1/icons/Makefile.am 2009-09-18 15:21:03.000000000 -0400 +@@ -1,4 +1,4 @@ +-desktopdir = $(datadir)/applications ++desktopdir = $(datarootdir)/applications + desktop_DATA = cuyo.desktop + + +@@ -25,7 +25,7 @@ + # Das vorige war falsch: die png sollen alle cuyo.png heissen + # und nicht cuyo-xxxx.png. Deshalb nachfolgend neue Version: + +-iconsdir = $(datadir)/icons/hicolor ++iconsdir = $(datarootdir)/icons/hicolor + icons_DATA = cuyo-32x32.png cuyo-64x64.png + + install-iconsDATA: +Index: cuyo-2.~-1.1/icons/Makefile.in +=================================================================== +--- cuyo-2.~-1.1.orig/icons/Makefile.in 2009-09-18 15:18:40.000000000 -0400 ++++ cuyo-2.~-1.1/icons/Makefile.in 2009-09-18 15:19:35.000000000 -0400 +@@ -15,7 +15,7 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datarootdir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +@@ -146,7 +146,7 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-desktopdir = $(datadir)/applications ++desktopdir = $(datarootdir)/applications + desktop_DATA = cuyo.desktop + + # The following would automatically put cuyo with the full --- cuyo-2.~-1.1.orig/debian/patches/series +++ cuyo-2.~-1.1/debian/patches/series @@ -0,0 +1,3 @@ +gcc4.4.patch +makefile-fixes.patch +desktop-file-fixes.patch --- cuyo-2.~-1.1.orig/debian/patches/gcc4.4.patch +++ cuyo-2.~-1.1/debian/patches/gcc4.4.patch @@ -0,0 +1,15 @@ +# Fix for gcc-4.4 +# Debian Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504947 +# Ubuntu Bug: https://edge.launchpad.net/bugs/428593 +Index: cuyo-2.~-1.1/src/stringzeug.h +=================================================================== +--- cuyo-2.~-1.1.orig/src/stringzeug.h 2009-09-18 15:16:49.000000000 -0400 ++++ cuyo-2.~-1.1/src/stringzeug.h 2009-09-18 15:17:53.000000000 -0400 +@@ -19,6 +19,7 @@ + #define STRINGZEUG_H + + #include ++#include + #include + +