mr_bones_ 15/02/18 22:11:03 Modified: cuyo-2.1.1-gcc44.patch cuyo-2.1.1-gentoo.patch Added: cuyo-2.1.2-gentoo.patch cuyo-2.1.2-gcc44.patch Log: version bump (bug #395389) with work from kensington (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch?r1=1.1&r2=1.2 Index: cuyo-2.1.1-gcc44.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cuyo-2.1.1-gcc44.patch 30 Dec 2009 19:33:35 -0000 1.1 +++ cuyo-2.1.1-gcc44.patch 18 Feb 2015 22:11:03 -0000 1.2 @@ -1,6 +1,5 @@ -diff -ur cuyo-2.~-1.1.orig/src/stringzeug.h cuyo-2.~-1.1/src/stringzeug.h ---- cuyo-2.~-1.1.orig/src/stringzeug.h 2006-07-03 20:26:23.000000000 +0300 -+++ cuyo-2.~-1.1/src/stringzeug.h 2009-12-29 16:17:18.000000000 +0200 +--- cuyo-2.~-1.1.orig/src/stringzeug.h ++++ cuyo-2.~-1.1/src/stringzeug.h @@ -20,7 +20,7 @@ #include <config.h> 1.2 games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch?r1=1.1&r2=1.2 Index: cuyo-2.1.1-gentoo.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cuyo-2.1.1-gentoo.patch 30 Dec 2009 19:33:35 -0000 1.1 +++ cuyo-2.1.1-gentoo.patch 18 Feb 2015 22:11:03 -0000 1.2 @@ -1,6 +1,5 @@ -diff -ru cuyo-2.~-1.1.orig/icons/Makefile.am cuyo-2.~-1.1/icons/Makefile.am ---- cuyo-2.~-1.1.orig/icons/Makefile.am 2007-12-20 12:22:32.000000000 -0500 -+++ cuyo-2.~-1.1/icons/Makefile.am 2009-12-30 13:44:39.111042770 -0500 +--- cuyo-2.~-1.1.orig/icons/Makefile.am ++++ cuyo-2.~-1.1/icons/Makefile.am @@ -1,4 +1,4 @@ -desktopdir = $(datadir)/applications +desktopdir = /usr/share/applications @@ -16,9 +15,8 @@ icons_DATA = cuyo-32x32.png cuyo-64x64.png install-iconsDATA: -diff -ru cuyo-2.~-1.1.orig/icons/cuyo.desktop cuyo-2.~-1.1/icons/cuyo.desktop ---- cuyo-2.~-1.1.orig/icons/cuyo.desktop 2007-12-20 12:22:32.000000000 -0500 -+++ cuyo-2.~-1.1/icons/cuyo.desktop 2009-12-30 13:45:15.823781932 -0500 +--- cuyo-2.~-1.1.orig/icons/cuyo.desktop ++++ cuyo-2.~-1.1/icons/cuyo.desktop @@ -3,9 +3,8 @@ Icon=cuyo Type=Application 1.1 games-puzzle/cuyo/files/cuyo-2.1.2-gentoo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.2-gentoo.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.2-gentoo.patch?rev=1.1&content-type=text/plain Index: cuyo-2.1.2-gentoo.patch =================================================================== --- po/Makefile.am +++ po/Makefile.am @@ -60,7 +60,7 @@ # By virtue of this rule, more precisely by virtue of genpot, this Makefile # probably only works with srcdir=. -$(DOMAIN).pot: $(pot_sources) ++$(DOMAIN).pot: $(pot_sources) ./genpot %.mo: %.po --- po/genpot +++ po/genpot @@ -27,10 +27,10 @@ -o - \ src/* data/* \ | sed \ - -e "1 s/SOME DESCRIPTIVE TITLE/Message catalog for the game Cuyo/" \ - -e "2 s/Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER/This is a partly generated file. The copyright of the original messages is identical to the one of the source files they are generated from. The copyright of the translations is by the translators./" \ - -e "3,9 s/PACKAGE/Cuyo/" \ - -e "16 s/CHARSET/ASCII/" \ + -e "s/SOME DESCRIPTIVE TITLE/Message catalog for the game Cuyo/" \ + -e "s/Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER/This is a partly generated file. The copyright of the original messages is identical to the one of the source files they are generated from. The copyright of the translations is by the translators./" \ + -e "s/PACKAGE/Cuyo/" \ + -e "s/CHARSET/ASCII/" \ | msgconv -t ISO-8859-1 \ > cuyo.pot --- icons/cuyo.desktop +++ icons/cuyo.desktop @@ -5,7 +5,6 @@ Terminal=false MimeType=application/x-executable; Categories=Game;BlocksGame; -Encoding=UTF-8 Comment=Play a tetris like game with many levels Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen Exec=cuyo --- icons/Makefile.am +++ icons/Makefile.am @@ -1,4 +1,4 @@ -desktopdir = $(datarootdir)/applications +desktopdir = /usr/share/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 = $(datarootdir)/icons/hicolor +iconsdir = /usr/share/icons/hicolor icons_DATA = cuyo-32x32.png cuyo-64x64.png install-iconsDATA: 1.1 games-puzzle/cuyo/files/cuyo-2.1.2-gcc44.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.2-gcc44.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/cuyo/files/cuyo-2.1.2-gcc44.patch?rev=1.1&content-type=text/plain Index: cuyo-2.1.2-gcc44.patch =================================================================== --- cuyo-2.~-1.1.orig/src/stringzeug.h +++ cuyo-2.~-1.1/src/stringzeug.h @@ -20,7 +20,7 @@ #include <config.h> #include <string> - +#include <stdio.h>
