Merge lp:~ubuntu-branches/ubuntu/maverick/cuyo/maverick-201007212128 into lp:ubuntu/maverick/cuyo

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/cuyo now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/cuyo/maverick-201007212128. A merge should be performed if necessary.

Unmerged revisions

11. By Daniel Holbach on 2010-07-20

* Merge from debian unstable (LP: #607106). Remaining changes:
  - Don't register MimeType=application/x-executable in
    the .desktop file.
  - Remove UTF-8 in the .desktop file
  -
* forked uptream version without povray images
* fix build-errors with gcc-4.4 (Closes: 504947)
* switch to source format 3.0

10. By Daniel Holbach on 2010-07-20

Merging shared upstream rev into target branch.

=== modified file 'icons/cuyo.desktop'
--- icons/cuyo.desktop	2010-07-19 09:54:44 +0000
+++ icons/cuyo.desktop	2010-07-21 21:33:48 +0000
@@ -3,9 +3,19 @@
 Icon=cuyo
 Type=Application
 Terminal=false
+<<<<<<< TREE
+=======
+MimeType=application/x-executable;
+>>>>>>> MERGE-SOURCE
 Categories=Game;BlocksGame;
-Comment=Play a tetris like game with many levels
-Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen
+<<<<<<< TREE
+Comment=Play a tetris like game with many levels
+Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen
+=======
+Encoding=UTF-8
+Comment=Play a tetris like game with many levels
+Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen
+>>>>>>> MERGE-SOURCE
 Exec=cuyo
 GenericName=Tetris like game