monkey-bubble r252 - in trunk: . debian

[herzi svn gnome org]

Author: herzi
Date: Tue Feb  5 12:38:09 2008
New Revision: 252
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=252&view=rev

Log:
2008-02-05  Sven Herzberg  <herzi gnome-de org>

	Build the .deb packages for GNOME and Maemo. Based on the Maemo port
	of Monkey-Bubble which was created Jouni Roivas.

	* debian/changelog: merged the changelog from maemo-monkey-bubble
	* debian/control.in: merged the dependencies from maemo-monkey-bubble


Modified:
   trunk/ChangeLog
   trunk/debian/changelog
   trunk/debian/control.in

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Tue Feb  5 12:38:09 2008
@@ -1,3 +1,34 @@
+monkey-bubble (0.4.1-0herzi1) unstable; urgency=low
+
+  * Build the merged code: monkey-bubble and maemo-monkey-bubble
+
+ -- Sven Herzberg <herzi gnome-de org>  Fri, 11 Jan 2008 23:10:55 +0200
+
+maemo-monkey-bubble (0.0.3-1) unstable; urgency=low
+
+  * Changes to work in Chinook
+
+ -- Jouni Roivas <jouni roivas nomovok com>  Mon, 3 Dec 2007 21:05:18 +0200
+
+maemo-monkey-bubble (0.0.2-2) unstable; urgency=low
+
+  * Desktop file fix.
+  * Separate sounds package.
+
+ -- Jouni Roivas <jouni roivas nomovok com>  Mon, 8 Jan 2007 14:05:18 +0200
+
+maemo-monkey-bubble (0.0.2-1) unstable; urgency=low
+
+  * Repackaging.
+
+ -- Jouni Roivas <jouni roivas nomovok com>  Mon, 8 Jan 2007 14:05:18 +0200
+
+maemo-monkey-bubble (0.0.1-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Jouni Roivas <jouni roivas nomovok com>  Fri, 4 Jan 2007 10:38:18 +0200
+
 monkey-bubble (0.1.9+0.2.0-8) unstable; urgency=low
 
   * CVS update

Modified: trunk/debian/control.in
==============================================================================
--- trunk/debian/control.in	(original)
+++ trunk/debian/control.in	Tue Feb  5 12:38:09 2008
@@ -3,14 +3,15 @@
 Priority: optional
 Maintainer: Thomas Cataldo <thomas cataldo aliacom fr>, Jouni Roivas <jouni roivas nomovok com>
 Standards-Version: 3.6.1
-Build-Depends: cdbs, debhelper (>= 3.4.4), librsvg2-dev (>= 2.6.4-5), intltool,
- libgstreamer0.10-dev, libgnomeui-dev (>= 2.6.1.1-2),
- libglade2-dev (>= 2.4.0-1), scrollkeeper, libstartup-notification0-dev, 
- gnome-pkg-tools, docbook-to-man
+Build-Depends: cdbs, debhelper (>= 4.0.0), librsvg2-dev (>= 2.6.4-5), intltool,
+ libgstreamer0.10-dev, libgnomeui-dev (>= 2.6.1.1-2) | libhildon1-dev,
+ libgnomeui-dev | libosso-dev, libgnomeui-dev | libconic0-dev,
+ libglade2-dev (>= 2.4.0-1), scrollkeeper | libconic0-dev,
+ libstartup-notification0-dev | libhildon1-dev, docbook-to-man
 
 Package: monkey-bubble
 Architecture: any
-Depends: ${shlibs:Depends}, scrollkeeper (>= 0.3.14-5)
+Depends: ${shlibs:Depends}, scrollkeeper (>= 0.3.14-5) | libconic0
 Recommends: yelp
 Description: The GNOME bust'a'move clone
  Blow up some bubbles in the jungle. You can play alone, with another