diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-20 11:55:48 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-20 11:55:48 -0300 |
| commit | 3bde3a0e359ee1506eb0f48af640b1b825198544 (patch) | |
| tree | 5ef7e871a412c7fc036d85068debe02f5a717937 /community/cuyo/cuyo.diff | |
| parent | 02ffd41dca71e92f0105e37751e37c7332a9d447 (diff) | |
| parent | 6d2dec5c3443d142a0131c43666929490961c16a (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/clucene/PKGBUILD
community/cuyo/PKGBUILD
community/pinot/PKGBUILD
extra/fontforge/PKGBUILD
extra/gtkimageview/PKGBUILD
extra/mkvtoolnix/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
staging/qt/PKGBUILD
testing/glibc/PKGBUILD
Diffstat (limited to 'community/cuyo/cuyo.diff')
| -rw-r--r-- | community/cuyo/cuyo.diff | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/community/cuyo/cuyo.diff b/community/cuyo/cuyo.diff index 3011623d3..3da3b1c64 100644 --- a/community/cuyo/cuyo.diff +++ b/community/cuyo/cuyo.diff @@ -1,32 +1,11 @@ -diff -ruN 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 18:22:32.000000000 +0100 -+++ cuyo-2.~-1.1/icons/cuyo.desktop 2009-11-08 14:08:56.000000000 +0100 -@@ -1,11 +1,13 @@ - [Desktop Entry] -+Type=Application - Name=Cuyo -+GenericName=Cuyo - Icon=cuyo --Type=Application -+Exec=cuyo -+StartupNotify=true - Terminal=false --MimeType=application/x-executable -+MimeType=application/x-executable; +--- icons/cuyo.desktop 2011-12-18 13:48:54.000000000 +0100 ++++ icons/cuyo.desktop 2011-12-18 13:48:54.000000000 +0100 +@@ -7,4 +7,4 @@ Categories=Game;BlocksGame; -Encoding=UTF-8 - Comment=A tetris like game with many levels + Comment=Play a tetris like game with many levels +Comment[cs]=Hra podobná tetrisu s mnoha úrovněmi - Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln --Exec=cuyo -diff -ruN 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 19:26:23.000000000 +0200 -+++ cuyo-2.~-1.1/src/stringzeug.h 2009-11-08 14:08:56.000000000 +0100 -@@ -19,6 +19,7 @@ - #define STRINGZEUG_H - - #include <config.h> -+#include <cstdarg> - #include <string> - - + Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen +@@ -12,2 +12 @@ + GenericName=Tetris like game +- |