[pkg-fso-commits] [SCM] mokomaze branch, debian, updated. debian/0.2.2-1-17-g2d6f435

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit e5d2ac6a6d39740afd98cb14df83b19bc92a45fb
Merge: a8d221c829cac4a97febba5d124a31733beb3b01 9f18cd5973d98d19c7457b3c0dc99688aca5e9e1
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Jul 28 13:47:48 2009 +0200

    Merge commit 'alioth/debian' into debian
    
    Upload to NEW was unmerged again, sorry
    
    Conflicts:
    	ChangeLog
    	configure
    	configure.ac
    	data/mokomaze.desktop
    	debian/changelog
    	debian/control
    	src/accelerometers.c

diff --combined data/mokomaze.desktop
index 4866d7b,352c2d6..1f5f838
--- a/data/mokomaze.desktop
+++ b/data/mokomaze.desktop
@@@ -1,11 -1,12 +1,15 @@@
  [Desktop Entry]
  Name=Mokomaze
 -Comment=Labyrinth game
 +Comment=Ball-in-the-labyrinth game
  Encoding=UTF-8
++<<<<<<< HEAD:data/mokomaze.desktop
 +Version=0.5
++=======
+ Version=0.2.3
++>>>>>>> alioth/debian:data/mokomaze.desktop
  Type=Application
  Exec=/usr/games/mokomaze
  Terminal=false
 -Categories=Application;Game;SDL;
 +Categories=Game;
  X-MB-SingleInstance=true
  Icon=mokomaze
 -
diff --combined debian/changelog
index dc919e7,5105084..a2672c0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,11 +1,25 @@@
- mokomaze (0.5.1-1~fso) pkg-fso; urgency=low
++mokomaze (0.5.1-1~fso) UNRELEASED; urgency=low
 +
 +  * Upload to pkg-fso
 +
 + -- Joachim Breitner <nomeata at debian.org>  Tue, 28 Jul 2009 13:41:55 +0200
 +
 +mokomaze (0.5.1-1) experimental; urgency=low
 +
 +  * New Upstream Version
 +  * Build-Depend on libode-sd-dev
 +  * Write a manpage
 +
 + -- Joachim Breitner <nomeata at debian.org>  Tue, 28 Jul 2009 13:37:58 +0200
 +
+ mokomaze (0.2.3-1) pkg-fso; urgency=low
+ 
+   * New Upstream Version
+     + Added support for 2.6.29 kernel.
+   * Build-Depend on pkg-config, build in qemubuilder fails without that. 
+ 
+  -- Nikita V. Youshchenko <yoush at debian.org>  Tue, 23 Jun 2009 01:17:35 +0400
+ 
  mokomaze (0.2.2-1) pkg-fso; urgency=low
  
    * New Upstream Version
diff --combined debian/control
index 729fc4b,f5e2813..d4b20d2
--- a/debian/control
+++ b/debian/control
@@@ -3,8 -3,8 +3,8 @@@ Section: game
  Priority: extra
  Maintainer: Debian FreeSmartphone.Org Team <pkg-fso-maint at lists.alioth.debian.org>
  Uploaders: Joachim Breitner <nomeata at debian.org>
- Build-Depends: debhelper (>= 7), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, libxml-parser-perl, libode-sp-dev
 -Build-Depends: debhelper (>= 7), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, libxml-parser-perl, pkg-config
 -Standards-Version: 3.8.0
++Build-Depends: debhelper (>= 7), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, libxml-parser-perl, pkg-config, libode-sp-dev
 +Standards-Version: 3.8.2
  Homepage: http://freesmartphone.org/
  Vcs-Git: git://git.debian.org/git/pkg-fso/mokomaze.git
  Vcs-Browser: http://git.debian.org/?p=pkg-fso/mokomaze.git;a=summary

-- 
mokomaze