[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#685490: unblock: libchamplain/0.12.3-1



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi,

Please unblock package libchamplain

This version fixes 2 bugs:

 - The URL for the cycle map has changed (this should probably also be
   fixed in squeeze)
 - Some issue when resizing the map

The rest is developer documentation improvement and changes to the demo
(which are not installed on binary packages)

libchamplain 0.12.3 (2012-07-14)
===============================

Stable release

Changes:
* Fix OpenCycleMap source URL (Thomas Bechtold)
* Fix ChmplainPoint resizing issue (Jiří Techet)
* Many minor documentation improvements (Pablo Castellano)
* New polygons.py Python demo
* Other minor fixes and improvements (Pablo Castellano, Jiří Techet)

You can find attached to this bug repport:

 - The complete debdiff generated with the following command:
 debdiff libchamplain_0.12.2-1.dsc libchamplain_0.12.3-1.dsc |filterdiff -x '*/docs/*' -x '*/configure' -x '*/Makefile.in'

 configure.ac                                                 |    4 
 libchamplain-0.12.3/ChangeLog                                |   66 +++++
 libchamplain-0.12.3/NEWS                                     |   12 +
 libchamplain-0.12.3/champlain/champlain-0.12.vapi            |   22 -
 libchamplain-0.12.3/champlain/champlain-bounding-box.c       |    8 
 libchamplain-0.12.3/champlain/champlain-coordinate.c         |    2 
 libchamplain-0.12.3/champlain/champlain-custom-marker.c      |    8 
 libchamplain-0.12.3/champlain/champlain-file-cache.c         |    2 
 libchamplain-0.12.3/champlain/champlain-label.c              |   94 ++++----
 libchamplain-0.12.3/champlain/champlain-layer.c              |    2 
 libchamplain-0.12.3/champlain/champlain-license.c            |    6 
 libchamplain-0.12.3/champlain/champlain-map-source-chain.c   |    2 
 libchamplain-0.12.3/champlain/champlain-map-source-factory.c |    8 
 libchamplain-0.12.3/champlain/champlain-map-source.c         |    4 
 libchamplain-0.12.3/champlain/champlain-marker-layer.c       |   18 -
 libchamplain-0.12.3/champlain/champlain-marker.c             |   12 -
 libchamplain-0.12.3/champlain/champlain-memory-cache.c       |   12 -
 libchamplain-0.12.3/champlain/champlain-path-layer.c         |    1 
 libchamplain-0.12.3/champlain/champlain-point.c              |    9 
 libchamplain-0.12.3/champlain/champlain-scale.c              |   18 -
 libchamplain-0.12.3/champlain/champlain-tile-cache.c         |    2 
 libchamplain-0.12.3/champlain/champlain-tile-source.c        |    4 
 libchamplain-0.12.3/champlain/champlain-version.h            |    8 
 libchamplain-0.12.3/champlain/champlain-version.h.in         |    2 
 libchamplain-0.12.3/champlain/champlain-view.c               |   66 ++---
 libchamplain-0.12.3/debian/changelog                         |    7 
 libchamplain-0.12.3/demos/Makefile.am                        |    2 
 libchamplain-0.12.3/demos/launcher-gtk.py                    |   60 ++++-
 libchamplain-0.12.3/demos/markers.py                         |   55 ----
 libchamplain-0.12.3/demos/minimal-gtk.c                      |    2 
 libchamplain-0.12.3/demos/polygons.py                        |  129 +++++++++++
 31 files changed, 432 insertions(+), 215 deletions(-)

 - And the individual patch for the to releavant bugs

 champlain-map-source-factory.c |    4 ++--
 champlain-point.c              |    7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

unblock libchamplain/0.12.3-1

Cheers

Laurent Bigonville

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.4-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_BE.utf8, LC_CTYPE=fr_BE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libchamplain-0.12.2/champlain/champlain-0.12.vapi libchamplain-0.12.3/champlain/champlain-0.12.vapi
--- libchamplain-0.12.2/champlain/champlain-0.12.vapi	2012-03-12 00:04:15.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-0.12.vapi	2012-07-14 23:27:39.000000000 +0200
@@ -106,7 +106,7 @@
 		public signal void panning_completed ();
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_label_get_type ()")]
-	public class Label : Champlain.Marker, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Scriptable {
+	public class Label : Champlain.Marker, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Label ();
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
@@ -157,14 +157,14 @@
 		public Pango.WrapMode wrap_mode { get; set; }
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_layer_get_type ()")]
-	public abstract class Layer : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
+	public abstract class Layer : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		protected Layer ();
 		public virtual Champlain.BoundingBox get_bounding_box ();
 		public virtual void set_view (Champlain.View view);
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_license_get_type ()")]
-	public class License : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
+	public class License : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public License ();
 		public void connect_view (Champlain.View view);
@@ -248,7 +248,7 @@
 		public bool register (Champlain.MapSourceDesc desc);
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_marker_get_type ()")]
-	public abstract class Marker : Clutter.Actor, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Scriptable {
+	public abstract class Marker : Clutter.Actor, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		protected Marker ();
 		public void animate_in ();
@@ -274,7 +274,7 @@
 		public signal void drag_motion (double dy, double event, Clutter.Event since);
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_marker_layer_get_type ()")]
-	public class MarkerLayer : Champlain.Layer, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
+	public class MarkerLayer : Champlain.Layer, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		public MarkerLayer ();
 		public void add_marker (Champlain.Marker marker);
@@ -362,7 +362,7 @@
 		public NullTileSource.full (Champlain.Renderer renderer);
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_path_layer_get_type ()")]
-	public class PathLayer : Champlain.Layer, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
+	public class PathLayer : Champlain.Layer, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		public PathLayer ();
 		public void add_node (Champlain.Location location);
@@ -395,7 +395,7 @@
 		public bool visible { get; set; }
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_point_get_type ()")]
-	public class Point : Champlain.Marker, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Scriptable {
+	public class Point : Champlain.Marker, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Point ();
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
@@ -415,7 +415,7 @@
 		public virtual void set_data (string data, uint size);
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_scale_get_type ()")]
-	public class Scale : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
+	public class Scale : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Scale ();
 		public void connect_view (Champlain.View view);
@@ -427,7 +427,7 @@
 		public uint max_width { get; set; }
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_tile_get_type ()")]
-	public class Tile : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
+	public class Tile : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		public Tile ();
 		public void display_content ();
@@ -499,7 +499,7 @@
 		public uint tile_size { get; set construct; }
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_view_get_type ()")]
-	public class View : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
+	public class View : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public View ();
 		public void add_layer (Champlain.Layer layer);
@@ -557,7 +557,7 @@
 		public signal void layer_relocated ();
 	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_viewport_get_type ()")]
-	public class Viewport : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
+	public class Viewport : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Viewport ();
 		public void get_adjustments (Champlain.Adjustment hadjustment, Champlain.Adjustment vadjustment);
diff -Nru libchamplain-0.12.2/champlain/champlain-bounding-box.c libchamplain-0.12.3/champlain/champlain-bounding-box.c
--- libchamplain-0.12.2/champlain/champlain-bounding-box.c	2011-10-06 22:50:01.000000000 +0200
+++ libchamplain-0.12.3/champlain/champlain-bounding-box.c	2012-05-28 22:49:56.000000000 +0200
@@ -119,7 +119,7 @@
  * @latitude: (out): the latitude of the box center
  * @longitude: (out): the longitude of the box center
  *
- * Sets the latitude and longitude of the box to @lat and @lon.
+ * Gets the center's latitude and longitude of the box to @latitude and @longitude.
  *
  * Since: 0.6
  */
@@ -167,8 +167,8 @@
 /**
  * champlain_bounding_box_extend:
  * @bbox: a #ChamplainBoundingBox
- * @latitude: latitude
- * @longitude: longitude
+ * @latitude: the latitude of the point
+ * @longitude: the longitude of the point
  *
  * Extend the bounding box so it contains a point with @latitude and @longitude.
  * Do nothing if the point is already inside the bounding box.
@@ -199,7 +199,7 @@
  * champlain_bounding_box_is_valid:
  * @bbox: a #ChamplainBoundingBox
  *
- * Checks whether bbox represents a valid bounding box on the map.
+ * Checks whether @bbox represents a valid bounding box on the map.
  *
  * Returns: TRUE when the bounding box is valid, FALSE otherwise.
  *
diff -Nru libchamplain-0.12.2/champlain/champlain-coordinate.c libchamplain-0.12.3/champlain/champlain-coordinate.c
--- libchamplain-0.12.2/champlain/champlain-coordinate.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-coordinate.c	2012-05-28 22:49:56.000000000 +0200
@@ -18,7 +18,7 @@
 
 /**
  * SECTION:champlain-coordinate
- * @short_description: The simpliest implementation of #ChamplainLocation
+ * @short_description: The simplest implementation of #ChamplainLocation
  *
  * #ChamplainCoordinate is a simple object implementing #ChamplainLocation.
  */
diff -Nru libchamplain-0.12.2/champlain/champlain-custom-marker.c libchamplain-0.12.3/champlain/champlain-custom-marker.c
--- libchamplain-0.12.2/champlain/champlain-custom-marker.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-custom-marker.c	2012-05-28 22:49:56.000000000 +0200
@@ -18,12 +18,12 @@
 
 /**
  * SECTION:champlain-custom-marker
- * @short_description: #ChamplainCustomMarker is a marker implementing the
+ * @short_description: #ChamplainCustomMarker A marker implementing the
  * #ClutterContainer interface.
  *
- * #ChamplainCustomMarker is a marker implementing the #ClutterContainer
- * interface. You can insert your custom actors into the container. Don't forget
- * to set the anchor position in the marker using #clutter_actor_set_anchor_point.
+ * A marker implementing the #ClutterContainer interface. You can insert
+ * your custom actors into the container. Don't forget to set the anchor
+ * position in the marker using #clutter_actor_set_anchor_point.
  */
 
 #include "config.h"
diff -Nru libchamplain-0.12.2/champlain/champlain-file-cache.c libchamplain-0.12.3/champlain/champlain-file-cache.c
--- libchamplain-0.12.2/champlain/champlain-file-cache.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-file-cache.c	2012-05-28 22:49:56.000000000 +0200
@@ -370,7 +370,7 @@
 
 /**
  * champlain_file_cache_new_full:
- * @size_limit: maximal size of the cache in bytes
+ * @size_limit: maximum size of the cache in bytes
  * @cache_dir: (allow-none): the directory where the cache is created. When cache_dir == NULL,
  * a cache in ~/.cache/champlain is used.
  * @renderer: the #ChamplainRenderer used for tiles rendering
diff -Nru libchamplain-0.12.2/champlain/champlain-label.c libchamplain-0.12.3/champlain/champlain-label.c
--- libchamplain-0.12.2/champlain/champlain-label.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-label.c	2012-05-28 22:49:56.000000000 +0200
@@ -987,7 +987,7 @@
 
 /**
  * champlain_label_new_with_text:
- * @text: the text of the text
+ * @text: the text of the label
  * @font: (allow-none): the font to use to draw the text, for example "Courrier Bold 11", can be NULL
  * @text_color: (allow-none): a #ClutterColor, the color of the text, can be NULL
  * @label_color: (allow-none): a #ClutterColor, the color of the label, can be NULL
@@ -1023,7 +1023,7 @@
 
 /**
  * champlain_label_new_with_image:
- * @actor: The actor of the image.
+ * @actor: The image as a @ClutterActor.
  *
  * Creates a new instance of #ChamplainLabel with image.
  *
@@ -1077,8 +1077,8 @@
 
 /**
  * champlain_label_new_full:
- * @text: The text
- * @actor: The image
+ * @text: The text of the label
+ * @actor: The image as a @ClutterActor
  *
  * Creates a new instance of #ChamplainLabel consisting of a custom #ClutterActor.
  *
@@ -1105,8 +1105,8 @@
 
 /**
  * champlain_label_set_text:
- * @label: The label
- * @text: The text
+ * @label: a #ChamplainLabel
+ * @text: The new text of the label
  *
  * Sets the label's text.
  *
@@ -1131,7 +1131,7 @@
 
 /**
  * champlain_label_set_image:
- * @label: The label.
+ * @label: a #ChamplainLabel
  * @image: (allow-none): The image as a @ClutterActor or NULL to remove the current image.
  *
  * Sets the label's image.
@@ -1164,7 +1164,7 @@
 
 /**
  * champlain_label_set_use_markup:
- * @label: The label
+ * @label: a #ChamplainLabel
  * @use_markup: The value
  *
  * Sets if the label's text uses markup.
@@ -1185,10 +1185,10 @@
 
 /**
  * champlain_label_set_alignment:
- * @label: The label
+ * @label: a #ChamplainLabel
  * @alignment: The label's alignment
  *
- * Set the label's text alignment.
+ * Sets the label's text alignment.
  *
  * Since: 0.10
  */
@@ -1206,11 +1206,11 @@
 
 /**
  * champlain_label_set_color:
- * @label: The label
+ * @label: a #ChamplainLabel
  * @color: (allow-none): The label's background color or NULL to reset the background to the
  *         default color. The color parameter is copied.
  *
- * Set the label's background color.
+ * Sets the label's background color.
  *
  * Since: 0.10
  */
@@ -1236,11 +1236,11 @@
 
 /**
  * champlain_label_set_text_color:
- * @label: The label
+ * @label: a #ChamplainLabel
  * @color: (allow-none): The label's text color or NULL to reset the text to the default
  *         color. The color parameter is copied.
  *
- * Set the label's text color.
+ * Sets the label's text color.
  *
  * Since: 0.10
  */
@@ -1266,11 +1266,11 @@
 
 /**
  * champlain_label_set_font_name:
- * @label: The label
+ * @label: a #ChamplainLabel
  * @font_name: (allow-none): The label's font name or NULL to reset the font to the default
  *             value.
  *
- * Set the label's font name such as "Sans 12".
+ * Sets the label's font name such as "Sans 12".
  *
  * Since: 0.10
  */
@@ -1296,10 +1296,10 @@
 
 /**
  * champlain_label_set_wrap:
- * @label: The label
+ * @label: a #ChamplainLabel
  * @wrap: The label's wrap.
  *
- * Set if the label's text wrap.
+ * Sets if the label's text wrap.
  *
  * Since: 0.10
  */
@@ -1317,10 +1317,10 @@
 
 /**
  * champlain_label_set_wrap_mode:
- * @label: The label
- * @wrap_mode: The label's wrap.
+ * @label: a #ChamplainLabel
+ * @wrap_mode: The label's wrap mode.
  *
- * Set the label's text color.
+ * Sets the label's text wrap mode.
  *
  * Since: 0.10
  */
@@ -1338,10 +1338,10 @@
 
 /**
  * champlain_label_set_attributes:
- * @label: The label
+ * @label: a #ChamplainLabel
  * @list: The label's text attributes.
  *
- * Set the label's text attribute.
+ * Sets the label's text attributes.
  *
  * Since: 0.10
  */
@@ -1368,10 +1368,10 @@
 
 /**
  * champlain_label_set_ellipsize:
- * @label: The label
+ * @label: a #ChamplainLabel
  * @mode: The label's ellipsize mode.
  *
- * Set the label's text ellipsize mode.
+ * Sets the label's text ellipsize mode.
  *
  * Since: 0.10
  */
@@ -1389,10 +1389,10 @@
 
 /**
  * champlain_label_set_single_line_mode:
- * @label: The label
+ * @label: a #ChamplainLabel
  * @mode: The label's single line mode
  *
- * Set if the label's text is on a single line.
+ * Sets if the label's text is on a single line.
  *
  * Since: 0.10
  */
@@ -1411,10 +1411,10 @@
 
 /**
  * champlain_label_set_draw_background:
- * @label: The label
+ * @label: a #ChamplainLabel
  * @background: value.
  *
- * Set if the label has a background.
+ * Sets if the label has a background.
  *
  * Since: 0.10
  */
@@ -1432,7 +1432,7 @@
 
 /**
  * champlain_label_get_image:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
  * Get the label's image.
  *
@@ -1451,7 +1451,7 @@
 
 /**
  * champlain_label_get_use_markup:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
  * Check whether the label uses markup.
  *
@@ -1470,7 +1470,7 @@
 
 /**
  * champlain_label_get_text:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
  * Get the label's text.
  *
@@ -1489,7 +1489,7 @@
 
 /**
  * champlain_label_get_alignment:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
  * Get the label's text alignment.
  *
@@ -1508,11 +1508,11 @@
 
 /**
  * champlain_label_get_color:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
- * Gets the label's color.
+ * Gets the label's background color.
  *
- * Returns: the label's color.
+ * Returns: the label's background color.
  *
  * Since: 0.10
  */
@@ -1527,7 +1527,7 @@
 
 /**
  * champlain_label_get_text_color:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
  * Gets the label's text color.
  *
@@ -1546,7 +1546,7 @@
 
 /**
  * champlain_label_get_font_name:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
  * Gets the label's font name.
  *
@@ -1565,9 +1565,9 @@
 
 /**
  * champlain_label_get_wrap:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
- * Check whether the label text wraps.
+ * Checks whether the label text wraps.
  *
  * Returns: if the label's text wraps.
  *
@@ -1584,9 +1584,9 @@
 
 /**
  * champlain_label_get_wrap_mode:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
- * Get the label's text wrap mode.
+ * Gets the label's text wrap mode.
  *
  * Returns: the label's text wrap mode.
  *
@@ -1603,9 +1603,9 @@
 
 /**
  * champlain_label_get_ellipsize:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
- * Get the label's text ellipsize mode.
+ * Gets the label's text ellipsize mode.
  *
  * Returns: the label's text ellipsize mode.
  *
@@ -1622,7 +1622,7 @@
 
 /**
  * champlain_label_get_single_line_mode:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
  * Checks the label's single line mode.
  *
@@ -1641,7 +1641,7 @@
 
 /**
  * champlain_label_get_draw_background:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
  * Checks whether the label has a background.
  *
@@ -1660,7 +1660,7 @@
 
 /**
  * champlain_label_get_attributes:
- * @label: The label
+ * @label: a #ChamplainLabel
  *
  * Gets the label's text attributes.
  *
diff -Nru libchamplain-0.12.2/champlain/champlain-layer.c libchamplain-0.12.3/champlain/champlain-layer.c
--- libchamplain-0.12.2/champlain/champlain-layer.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-layer.c	2012-05-28 22:49:56.000000000 +0200
@@ -63,7 +63,7 @@
  * #ChamplainView calls this method to pass a reference to itself to the layer
  * when the layer is added to the view. When the layer is removed from the
  * view, it passes NULL to the layer. Custom layers can implement this method
- * and perform the necessary initialization. This method schould not be called
+ * and perform the necessary initialization. This method should not be called
  * by user code.
  *
  * Since: 0.10
diff -Nru libchamplain-0.12.2/champlain/champlain-license.c libchamplain-0.12.3/champlain/champlain-license.c
--- libchamplain-0.12.2/champlain/champlain-license.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-license.c	2012-05-28 22:49:56.000000000 +0200
@@ -433,7 +433,7 @@
 /**
  * champlain_license_set_extra_text:
  * @license: a #ChamplainLicense
- * @text: a license
+ * @text: the additional license text
  *
  * Show the additional license text on the map view.  The text will preceed the
  * map's licence when displayed. Use "\n" to separate the lines.
@@ -478,8 +478,8 @@
 
 /**
  * champlain_license_set_alignment:
- * @license: The license
- * @alignment: The license's alignment
+ * @license: a #ChamplainLicense
+ * @alignment: The license's text alignment
  *
  * Set the license's text alignment.
  *
diff -Nru libchamplain-0.12.2/champlain/champlain-map-source.c libchamplain-0.12.3/champlain/champlain-map-source.c
--- libchamplain-0.12.2/champlain/champlain-map-source.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-map-source.c	2012-05-28 22:49:56.000000000 +0200
@@ -36,7 +36,7 @@
  * delegate the work to the next map source in the chain by invoking the
  * same function on it.
 
- * To undertand the concept of chains, consider for instance a chain
+ * To understand the concept of chains, consider for instance a chain
  * consisting of #ChamplainFileCache whose next source is
  * #ChamplainNetworkTileSource whose next source is an error tile source
  * created with champlain_map_source_factory_create_error_source ().
@@ -676,7 +676,7 @@
 /**
  * champlain_map_source_fill_tile:
  * @map_source: a #ChamplainMapSource
- * @tile: A #ChamplainTile
+ * @tile: a #ChamplainTile
  *
  * Fills the tile with image data (either from cache, network or rendered
  * locally).
diff -Nru libchamplain-0.12.2/champlain/champlain-map-source-chain.c libchamplain-0.12.3/champlain/champlain-map-source-chain.c
--- libchamplain-0.12.2/champlain/champlain-map-source-chain.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-map-source-chain.c	2012-05-28 22:49:56.000000000 +0200
@@ -338,7 +338,7 @@
  * champlain_map_source_chain_pop:
  * @source_chain: a #ChamplainMapSourceChain
  *
- * Pops the map source from the top of the stack from the chain.
+ * Pops a map source from the top of the stack from the chain.
  *
  * Since: 0.6
  */
diff -Nru libchamplain-0.12.2/champlain/champlain-map-source-factory.c libchamplain-0.12.3/champlain/champlain-map-source-factory.c
--- libchamplain-0.12.2/champlain/champlain-map-source-factory.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-map-source-factory.c	2012-07-08 18:04:11.000000000 +0200
@@ -170,7 +170,7 @@
         17,
         256,
         CHAMPLAIN_MAP_PROJECTION_MERCATOR,
-        "http://tah.openstreetmap.org/Tiles/tile/#Z#/#X#/#Y#.png";,
+        "http://a.tah.openstreetmap.org/Tiles/tile/#Z#/#X#/#Y#.png";,
         champlain_map_source_new_generic,
         NULL);
   champlain_map_source_factory_register (factory, desc);
@@ -198,7 +198,7 @@
         18,
         256,
         CHAMPLAIN_MAP_PROJECTION_MERCATOR,
-        "http://andy.sandbox.cloudmade.com/tiles/cycle/#Z#/#X#/#Y#.png";,
+        "http://tile.opencyclemap.org/cycle/#Z#/#X#/#Y#.png";,
         champlain_map_source_new_generic,
         NULL);
   champlain_map_source_factory_register (factory, desc);
@@ -286,7 +286,7 @@
  * A method to obtain the singleton object.
  *
  * Returns: (transfer full): the singleton #ChamplainMapSourceFactory, it should be freed
- * using #g_object_unref when not needed.
+ * using #g_object_unref() when not needed.
  *
  * Since: 0.4
  */
@@ -320,7 +320,7 @@
  * @factory: the Factory
  * @id: the wanted map source id
  *
- * The id should not contain any character that can't be in a filename as it
+ * Note: The id should not contain any character that can't be in a filename as it
  * will be used as the cache directory name for that map source.
  *
  * Returns: (transfer none): a ready to use #ChamplainMapSource matching the given name, returns
diff -Nru libchamplain-0.12.2/champlain/champlain-marker.c libchamplain-0.12.3/champlain/champlain-marker.c
--- libchamplain-0.12.2/champlain/champlain-marker.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-marker.c	2012-05-28 22:49:56.000000000 +0200
@@ -19,9 +19,9 @@
 
 /**
  * SECTION:champlain-marker
- * @short_description: A marker to identify points of interest on a map
+ * @short_description: Base class of libchamplain markers
  *
- * Markers reprensent points of interest on a map. Markers need to be
+ * Markers represent points of interest on a map. Markers need to be
  * placed on a layer (a #ChamplainMarkerLayer). Layers have to be added to a
  * #champlainview for the markers to show on the map.
  *
@@ -734,7 +734,7 @@
 
 /**
  * champlain_marker_animate_in:
- * @marker: The marker
+ * @marker: a #ChamplainMarker
  *
  * Animates the marker as if it were falling from the sky onto the map.
  *
@@ -749,7 +749,7 @@
 
 /**
  * champlain_marker_animate_in_with_delay :
- * @marker: The marker
+ * @marker: a #ChamplainMarker
  * @delay: The delay in milliseconds
  *
  * Animates the marker as if it were falling from the sky onto the map after
@@ -787,7 +787,7 @@
 
 /**
  * champlain_marker_animate_out:
- * @marker: The marker
+ * @marker: a #ChamplainMarker
  *
  * Animates the marker as if it were drawn through the sky.
  *
@@ -812,7 +812,7 @@
 
 /**
  * champlain_marker_animate_out_with_delay :
- * @marker: The marker
+ * @marker: a #ChamplainMarker
  * @delay: The delay in milliseconds
  *
  * Animates the marker as if it were drawn through the sky after
diff -Nru libchamplain-0.12.2/champlain/champlain-marker-layer.c libchamplain-0.12.3/champlain/champlain-marker-layer.c
--- libchamplain-0.12.2/champlain/champlain-marker-layer.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-marker-layer.c	2012-05-28 22:49:56.000000000 +0200
@@ -315,7 +315,7 @@
  * champlain_marker_layer_new_full:
  * @mode: Selection mode
  *
- * Creates a new instance of #ChamplainMarkerLayer.
+ * Creates a new instance of #ChamplainMarkerLayer with the specified selection mode.
  *
  * Returns: a new #ChamplainMarkerLayer ready to be used as a container for the markers.
  *
@@ -523,7 +523,7 @@
  * champlain_marker_layer_get_selected:
  * @layer: a #ChamplainMarkerLayer
  *
- * Gets a list of selected markers.
+ * Gets a list of selected markers in the layer.
  *
  * Returns: (transfer container) (element-type ChamplainMarker): the list
  *
@@ -590,7 +590,7 @@
  * champlain_marker_layer_animate_in_all_markers:
  * @layer: a #ChamplainMarkerLayer
  *
- * Fade in all markers with an animation
+ * Fade in all markers in the layer with an animation
  *
  * Since: 0.10
  */
@@ -622,7 +622,7 @@
  * champlain_marker_layer_animate_out_all_markers:
  * @layer: a #ChamplainMarkerLayer
  *
- * Fade out all markers with an animation
+ * Fade out all markers in the layer with an animation
  *
  * Since: 0.10
  */
@@ -654,7 +654,7 @@
  * champlain_marker_layer_show_all_markers:
  * @layer: a #ChamplainMarkerLayer
  *
- * Calls clutter_actor_show on all markers
+ * Shows all markers in the layer
  *
  * Since: 0.10
  */
@@ -684,7 +684,7 @@
  * champlain_marker_layer_hide_all_markers:
  * @layer: a #ChamplainMarkerLayer
  *
- * Calls clutter_actor_hide on all markers
+ * Hides all the markers in the layer
  *
  * Since: 0.10
  */
@@ -714,7 +714,7 @@
  * champlain_marker_layer_set_all_markers_draggable:
  * @layer: a #ChamplainMarkerLayer
  *
- * Sets all markers draggable
+ * Sets all markers draggable in the layer
  *
  * Since: 0.10
  */
@@ -744,7 +744,7 @@
  * champlain_marker_layer_set_all_markers_undraggable:
  * @layer: a #ChamplainMarkerLayer
  *
- * Sets all markers undraggable
+ * Sets all markers undraggable in the layer
  *
  * Since: 0.10
  */
@@ -774,7 +774,7 @@
  * champlain_marker_layer_unselect_all_markers:
  * @layer: a #ChamplainMarkerLayer
  *
- * Unselects all markers.
+ * Unselects all markers in the layer.
  *
  * Since: 0.10
  */
diff -Nru libchamplain-0.12.2/champlain/champlain-memory-cache.c libchamplain-0.12.3/champlain/champlain-memory-cache.c
--- libchamplain-0.12.2/champlain/champlain-memory-cache.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-memory-cache.c	2012-05-28 22:49:56.000000000 +0200
@@ -151,7 +151,7 @@
   /**
    * ChamplainMemoryCache:size-limit:
    *
-   * The maximal number of tiles that are stored in the cache.
+   * The maximum number of tiles that are stored in the cache.
    *
    * Since: 0.8
    */
@@ -174,7 +174,7 @@
 
 /**
  * champlain_memory_cache_new_full:
- * @size_limit: maximal number of tiles stored in the cache
+ * @size_limit: maximum number of tiles stored in the cache
  * @renderer: the #ChamplainRenderer used for tiles rendering
  *
  * Constructor of #ChamplainMemoryCache.
@@ -214,9 +214,9 @@
  * champlain_memory_cache_get_size_limit:
  * @memory_cache: a #ChamplainMemoryCache
  *
- * Gets the maximal number of tiles stored in the cache.
+ * Gets the maximum number of tiles stored in the cache.
  *
- * Returns: maximal number of stored tiles
+ * Returns: maximum number of stored tiles
  *
  * Since: 0.8
  */
@@ -232,9 +232,9 @@
 /**
  * champlain_memory_cache_set_size_limit:
  * @memory_cache: a #ChamplainMemoryCache
- * @size_limit: maximal number of tiles stored in the cache
+ * @size_limit: maximum number of tiles stored in the cache
  *
- * Sets the maximal number of tiles stored in the cache.
+ * Sets the maximum number of tiles stored in the cache.
  *
  * Since: 0.8
  */
diff -Nru libchamplain-0.12.2/champlain/champlain-path-layer.c libchamplain-0.12.3/champlain/champlain-path-layer.c
--- libchamplain-0.12.2/champlain/champlain-path-layer.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-path-layer.c	2012-05-28 22:49:56.000000000 +0200
@@ -540,6 +540,7 @@
  * @location: a #ChamplainLocation
  *
  * Adds a #ChamplainLocation object to the layer.
+ * The node is prepended to the list.
  *
  * Since: 0.10
  */
diff -Nru libchamplain-0.12.2/champlain/champlain-point.c libchamplain-0.12.3/champlain/champlain-point.c
--- libchamplain-0.12.2/champlain/champlain-point.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-point.c	2012-06-29 00:32:20.000000000 +0200
@@ -18,7 +18,7 @@
 
 /**
  * SECTION:champlain-point
- * @short_description: Simple point to mark a coordinate
+ * @short_description: A simple point to mark a coordinate
  *
  * #ChamplainPoint is a simple variant of #ChamplainMarker. Contrary to
  * #ChamplainLabel, it is not capable of labelling the point with text and
@@ -418,7 +418,14 @@
 {
   g_return_if_fail (CHAMPLAIN_IS_POINT (point));
 
+  ChamplainPointPrivate *priv = point->priv;
+
+  if (priv->point_actor)
+    clutter_actor_unparent (CLUTTER_ACTOR (priv->point_actor));
+
   point->priv->size = size;
+  priv->point_actor = clutter_cairo_texture_new (size, size);
+  clutter_actor_set_parent (CLUTTER_ACTOR (priv->point_actor), CLUTTER_ACTOR (point));
   g_object_notify (G_OBJECT (point), "size");
   draw_point (point);
 }
diff -Nru libchamplain-0.12.2/champlain/champlain-scale.c libchamplain-0.12.3/champlain/champlain-scale.c
--- libchamplain-0.12.2/champlain/champlain-scale.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-scale.c	2012-07-14 22:57:02.000000000 +0200
@@ -482,7 +482,7 @@
   clutter_actor_set_name (text, "scale-far-label");
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), text);
 
-  text = clutter_text_new_with_text ("Sans 9", "X km");
+  text = clutter_text_new_with_text ("Sans 9", "X");
   clutter_actor_set_name (text, "scale-mid-label");
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), text);
 
@@ -537,7 +537,7 @@
 /**
  * champlain_scale_set_max_width:
  * @scale: a #ChamplainScale
- * @value: a #guint in pixels
+ * @value: the number of pixels
  *
  * Sets the maximum width of the scale on the screen in pixels
  *
@@ -561,7 +561,7 @@
  * @scale: a #ChamplainScale
  * @unit: a #ChamplainUnit
  *
- * Sets the scales unit.
+ * Sets the scale unit.
  *
  * Since: 0.10
  */
@@ -579,11 +579,11 @@
 
 /**
  * champlain_scale_get_max_width:
- * @scale: The scale
+ * @scale: a #ChamplainScale
  *
- * Gets the maximal scale width.
+ * Gets the maximum scale width.
  *
- * Returns: The max scale width in pixels.
+ * Returns: The maximum scale width in pixels.
  *
  * Since: 0.10
  */
@@ -598,7 +598,7 @@
 
 /**
  * champlain_scale_get_unit:
- * @scale: The scale
+ * @scale: a #ChamplainScale
  *
  * Gets the unit used by the scale.
  *
@@ -626,7 +626,7 @@
 
 /**
  * champlain_scale_connect_view:
- * @scale: The scale
+ * @scale: a #ChamplainScale
  * @view: a #ChamplainView
  *
  * This method connects to the necessary signals of #ChamplainView to make the
@@ -649,7 +649,7 @@
 
 /**
  * champlain_scale_disconnect_view:
- * @scale: The scale
+ * @scale: a #ChamplainScale
  *
  * This method disconnects from the signals previously connected by champlain_scale_connect_view().
  *
diff -Nru libchamplain-0.12.2/champlain/champlain-tile-cache.c libchamplain-0.12.3/champlain/champlain-tile-cache.c
--- libchamplain-0.12.2/champlain/champlain-tile-cache.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-tile-cache.c	2012-05-28 22:49:56.000000000 +0200
@@ -20,7 +20,7 @@
  * SECTION:champlain-tile-cache
  * @short_description: A base class of tile caches
  *
- * This class defines properties and methods common to all caches (that is, map
+ * This class defines properties and methods commons to all caches (that is, map
  * sources that permit storage and retrieval of tiles). Tiles are typically
  * stored by #ChamplainTileSource objects.
  */
diff -Nru libchamplain-0.12.2/champlain/champlain-tile-source.c libchamplain-0.12.3/champlain/champlain-tile-source.c
--- libchamplain-0.12.2/champlain/champlain-tile-source.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-tile-source.c	2012-05-28 22:49:56.000000000 +0200
@@ -642,9 +642,9 @@
 /**
  * champlain_tile_source_set_max_zoom_level:
  * @tile_source: a #ChamplainTileSource
- * @zoom_level: the maximal zoom level
+ * @zoom_level: the maximum zoom level
  *
- * Sets the tile source's maximal zoom level.
+ * Sets the tile source's maximum zoom level.
  *
  * Since: 0.6
  */
diff -Nru libchamplain-0.12.2/champlain/champlain-version.h libchamplain-0.12.3/champlain/champlain-version.h
--- libchamplain-0.12.2/champlain/champlain-version.h	2012-03-12 00:22:44.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-version.h	2012-07-14 23:27:21.000000000 +0200
@@ -40,7 +40,7 @@
 /**
  * CHAMPLAIN_MINOR_VERSION:
  *
- * The minor version of libchamplin (2, if %CHAMPLAIN_VERSION is 1.2.3)
+ * The minor version of libchamplain (2, if %CHAMPLAIN_VERSION is 1.2.3)
  */
 #define CHAMPLAIN_MINOR_VERSION   (12)
 
@@ -49,14 +49,14 @@
  *
  * The micro version of libchamplain (3, if %CHAMPLAIN_VERSION is 1.2.3)
  */
-#define CHAMPLAIN_MICRO_VERSION   (2)
+#define CHAMPLAIN_MICRO_VERSION   (3)
 
 /**
  * CHAMPLAIN_VERSION:
  *
  * The full version of libchamplain, like 1.2.3
  */
-#define CHAMPLAIN_VERSION         0.12.2
+#define CHAMPLAIN_VERSION         0.12.3
 
 /**
  * CHAMPLAIN_VERSION_S:
@@ -64,7 +64,7 @@
  * The full version of libchamplain, in string form (suited for
  * string concatenation)
  */
-#define CHAMPLAIN_VERSION_S       "0.12.2"
+#define CHAMPLAIN_VERSION_S       "0.12.3"
 
 /**
  * CHAMPLAIN_VERSION_HEX:
diff -Nru libchamplain-0.12.2/champlain/champlain-version.h.in libchamplain-0.12.3/champlain/champlain-version.h.in
--- libchamplain-0.12.2/champlain/champlain-version.h.in	2011-10-06 22:50:01.000000000 +0200
+++ libchamplain-0.12.3/champlain/champlain-version.h.in	2012-05-28 22:49:56.000000000 +0200
@@ -40,7 +40,7 @@
 /**
  * CHAMPLAIN_MINOR_VERSION:
  *
- * The minor version of libchamplin (2, if %CHAMPLAIN_VERSION is 1.2.3)
+ * The minor version of libchamplain (2, if %CHAMPLAIN_VERSION is 1.2.3)
  */
 #define CHAMPLAIN_MINOR_VERSION   (@CHAMPLAIN_MINOR_VERSION@)
 
diff -Nru libchamplain-0.12.2/champlain/champlain-view.c libchamplain-0.12.3/champlain/champlain-view.c
--- libchamplain-0.12.2/champlain/champlain-view.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/champlain/champlain-view.c	2012-05-28 22:49:56.000000000 +0200
@@ -24,7 +24,7 @@
  * The #ChamplainView is a ClutterActor to display maps.  It supports two modes
  * of scrolling:
  * <itemizedlist>
- *   <listitem><para>Push: the normal behavior where the maps doesn't move
+ *   <listitem><para>Push: the normal behavior where the maps don't move
  *   after the user stopped scrolling;</para></listitem>
  *   <listitem><para>Kinetic: the iPhone-like behavior where the maps
  *   decelerate after the user stopped scrolling.</para></listitem>
@@ -42,7 +42,7 @@
  * an error occurs during download, an error tile will be displayed.
  *
  * The button-press-event and button-release-event signals are emitted each
- * time a mouse button is pressed on the @view.
+ * time a mouse button is pressed and released on the @view.
  */
 
 #include "config.h"
@@ -998,7 +998,7 @@
   /**
    * ChamplainView::layer-relocated:
    *
-   * Indicates that the layers hav been "relocated". In practice this means that
+   * Indicates that the layers have been "relocated". In practice this means that
    * every layer should connect to this signal and redraw itself when the signal is
    * emitted. Layer relocation happens when zooming in/out and when panning for more
    * than MAX_INT pixels.
@@ -1613,9 +1613,9 @@
 /**
  * champlain_view_set_zoom_level:
  * @view: a #ChamplainView
- * @zoom_level: a guint
+ * @zoom_level: the level of zoom, a guint between 1 and 20
  *
- * Changes the current zoom level
+ * Changes the current level of zoom
  *
  * Since: 0.4
  */
@@ -1634,9 +1634,9 @@
 /**
  * champlain_view_set_min_zoom_level:
  * @view: a #ChamplainView
- * @zoom_level: a guint
+ * @zoom_level: the level of zoom
  *
- * Changes the lowest allowed zoom level
+ * Changes the lowest allowed level of zoom
  *
  * Since: 0.4
  */
@@ -1666,9 +1666,9 @@
 /**
  * champlain_view_set_max_zoom_level:
  * @view: a #ChamplainView
- * @zoom_level: a guint
+ * @zoom_level: the level of zoom
  *
- * Changes the highest allowed zoom level
+ * Changes the highest allowed level of zoom
  *
  * Since: 0.4
  */
@@ -1725,7 +1725,7 @@
  * @view: a #ChamplainView
  * @layer: a #ChamplainLayer
  *
- * Removes the layer from the view
+ * Removes the given layer from the view
  *
  * Since: 0.4.1
  */
@@ -2141,7 +2141,7 @@
  * @view: a #ChamplainView
  * @map_source: a #ChamplainMapSource
  *
- * Changes the currently used map source.  #g_object_unref will be called on
+ * Changes the currently used map source. #g_object_unref() will be called on
  * the previous one.
  *
  * Since: 0.4
@@ -2304,9 +2304,9 @@
  * champlain_view_ensure_visible:
  * @view: a #ChamplainView
  * @bbox: bounding box of the area that should be visible
- * @animate: perform animation
+ * @animate: TRUE to perform animation, FALSE otherwise
  *
- * Changes the map's zoom level and center to make sure the two given area
+ * Changes the map's zoom level and center to make sure the given area
  * is visible
  *
  * Since: 0.10
@@ -2363,7 +2363,7 @@
 /**
  * champlain_view_ensure_layers_visible:
  * @view: a #ChamplainView
- * @animate: perform animation
+ * @animate: TRUE to perform animation, FALSE otherwise
  *
  * Changes the map's zoom level and center to make sure that the bounding
  * boxes of all inserted layers are visible.
@@ -2614,7 +2614,7 @@
 
 /**
  * champlain_view_get_zoom_level:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Gets the view's current zoom level.
  *
@@ -2635,7 +2635,7 @@
 
 /**
  * champlain_view_get_min_zoom_level:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Gets the view's minimal allowed zoom level.
  *
@@ -2656,11 +2656,11 @@
 
 /**
  * champlain_view_get_max_zoom_level:
- * @view: The view
+ * @view: a #ChamplainView
  *
- * Gets the view's maximal allowed zoom level.
+ * Gets the view's maximum allowed zoom level.
  *
- * Returns: the view's maximal allowed zoom level.
+ * Returns: the view's maximum allowed zoom level.
  *
  * Since: 0.4
  */
@@ -2677,12 +2677,12 @@
 
 /**
  * champlain_view_get_map_source:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Gets the view's current map source.
  *
  * Returns: (transfer none): the view's current map source. If you need to keep a reference to the
- * map source then you have to call #g_object_ref.
+ * map source then you have to call #g_object_ref().
  *
  * Since: 0.4
  */
@@ -2699,7 +2699,7 @@
 
 /**
  * champlain_view_get_deceleration:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Gets the view's deceleration rate.
  *
@@ -2722,7 +2722,7 @@
 
 /**
  * champlain_view_get_kinetic_mode:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Gets the view's scroll mode behaviour.
  *
@@ -2743,7 +2743,7 @@
 
 /**
  * champlain_view_get_keep_center_on_resize:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Checks whether to keep the center on resize
  *
@@ -2764,7 +2764,7 @@
 
 /**
  * champlain_view_get_zoom_on_double_click:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Checks whether the view zooms on double click.
  *
@@ -2785,7 +2785,7 @@
 
 /**
  * champlain_view_get_animate_zoom:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Checks whether the view animates zoom level changes.
  *
@@ -2806,12 +2806,12 @@
 
 /**
  * champlain_view_bin_layout_add:
- * @view: The view
+ * @view: a #ChamplainView
  * @child: The child to be inserted
  * @x_align: x alignment
  * @y_align: y alignment
  *
- * This function iserts a custom actor to the undrelying #ClutterBinLayout
+ * This function inserts a custom actor to the undrelying #ClutterBinLayout
  * manager. The inserted actors appear on top of the map. See clutter_bin_layout_add()
  * for reference.
  *
@@ -2838,7 +2838,7 @@
 
 /**
  * champlain_view_get_license_actor:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Returns the #ChamplainLicense actor which is inserted by default into the
  * layout manager. It can be manipulated using standard #ClutterActor methods
@@ -2861,7 +2861,7 @@
 
 /**
  * champlain_view_get_center_latitude:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Gets the latitude of the view's center.
  *
@@ -2882,11 +2882,11 @@
 
 /**
  * champlain_view_get_center_longitude:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Gets the longitude of the view's center.
  *
- * Returns: the latitude.
+ * Returns: the longitude.
  *
  * Since: 0.10
  */
@@ -2903,7 +2903,7 @@
 
 /**
  * champlain_view_get_state:
- * @view: The view
+ * @view: a #ChamplainView
  *
  * Gets the view's state.
  *
diff -Nru libchamplain-0.12.2/ChangeLog libchamplain-0.12.3/ChangeLog
--- libchamplain-0.12.2/ChangeLog	2012-03-12 00:23:27.000000000 +0100
+++ libchamplain-0.12.3/ChangeLog	2012-07-14 23:28:07.000000000 +0200
@@ -1,5 +1,71 @@
 # Generated by Makefile. Do not edit.
 
+commit fe1fa2ae8977bcec4ccf43adc91da54e932c6ae2
+Author: Jiří Techet <techet@gmail.com>
+Date:   Sat Jul 14 23:12:00 2012 +0200
+
+    0.12.3
+
+commit 0313f980bee319b87f881153b0cf649fa959f202
+Author: Jiří Techet <techet@gmail.com>
+Date:   Sat Jul 14 23:25:23 2012 +0200
+
+    Update demos makefile
+
+commit 9b3a35b43cb4850ebc793d5eb3813400e08f5f9c
+Author: Jiří Techet <techet@gmail.com>
+Date:   Sat Jul 14 22:38:11 2012 +0200
+
+    Merge launcher-gtk.py and markers.py
+
+commit b4e95b0228038ada9d304db49b7ca1733f405c63
+Author: Pablo Castellano <pablo@anche.no>
+Date:   Mon Jul 9 22:19:31 2012 +0200
+
+    [demos] Added polygons.py (similar to polygons.c)
+
+commit 0dd0bbbecf3b4960dbfe2b85de11cb5865b5f933
+Author: Pablo Castellano <pablo@anche.no>
+Date:   Mon Jun 18 14:27:43 2012 +0200
+
+    Minor changes
+
+commit 8cd9347ad42abe7812983ab75d3706f1234636eb
+Author: Thomas Bechtold <thomasbechtold@jpberlin.de>
+Date:   Sun Jul 8 10:27:59 2012 +0200
+
+    fix osm cycle map source
+
+commit 5169e770c3fb3047badec0ffdcebf8fdb29599e3
+Author: Jiří Techet <techet@gmail.com>
+Date:   Fri Jun 29 00:30:26 2012 +0200
+
+    Resize containing clutter actor together with the point
+
+commit dc1d0ba2fdc2aca99dd9a32f05a5fec9b8a0a19b
+Author: Pablo Castellano <pablo@anche.no>
+Date:   Sun May 27 01:28:30 2012 +0200
+
+    Improvements in several files
+
+commit 223769f060394b09ec85220fe278fb03a9064fe9
+Author: Pablo Castellano <pablo@anche.no>
+Date:   Sat May 26 19:54:07 2012 +0200
+
+    Fixed call to unexisting get_coords() method in launcher-gtk.py
+
+commit d79049c49f5931ace5559c8612b1da6ad88947ae
+Author: Pablo Castellano <pablog@gnome.org>
+Date:   Sun May 27 19:53:45 2012 +0200
+
+    Fixed typo. Closes bug #676892
+
+commit 3b8b2937732e00d281f512ab7a8e3393dfda5844
+Author: Jiří Techet <techet@gmail.com>
+Date:   Wed Apr 4 22:52:44 2012 +0200
+
+    Correct comment in minimal-gtk demo
+
 commit f81ed70babd5728c70705ead24ca2194ec4fea0c
 Author: Jiří Techet <techet@gmail.com>
 Date:   Mon Mar 12 00:21:19 2012 +0100
diff -Nru libchamplain-0.12.2/configure libchamplain-0.12.3/configure
diff -Nru libchamplain-0.12.2/configure.ac libchamplain-0.12.3/configure.ac
--- libchamplain-0.12.2/configure.ac	2012-03-12 00:18:18.000000000 +0100
+++ libchamplain-0.12.3/configure.ac	2012-07-14 23:26:36.000000000 +0200
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 m4_define([champlain_major_version], [0])
 m4_define([champlain_minor_version], [12])
-m4_define([champlain_micro_version], [2])
+m4_define([champlain_micro_version], [3])
 m4_define([champlain_version],
           [champlain_major_version.champlain_minor_version.champlain_micro_version])
 m4_define([champlain_minor_api_version], [m4_eval(champlain_minor_version + champlain_minor_version%2)])
@@ -36,7 +36,7 @@
 # - If binary compatibility has been broken (eg removed or changed interfaces)
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
-LIBRARY_VERSION=1:1:1
+LIBRARY_VERSION=1:2:1
 CHAMPLAIN_API_VERSION=champlain_api_version
 CHAMPLAIN_API_VERSION_NORM=champlain_major_version[_]champlain_minor_api_version
 CHAMPLAIN_MAJOR_VERSION=champlain_major_version
diff -Nru libchamplain-0.12.2/debian/changelog libchamplain-0.12.3/debian/changelog
--- libchamplain-0.12.2/debian/changelog	2012-03-29 20:25:21.000000000 +0200
+++ libchamplain-0.12.3/debian/changelog	2012-08-14 17:37:43.000000000 +0200
@@ -1,3 +1,10 @@
+libchamplain (0.12.3-1) unstable; urgency=low
+
+  * New upstream release (Closes: #681650)
+    - fix OSM cycle map source URL
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 14 Aug 2012 17:37:41 +0200
+
 libchamplain (0.12.2-1) unstable; urgency=low
 
   * New upstream release
diff -Nru libchamplain-0.12.2/demos/launcher-gtk.py libchamplain-0.12.3/demos/launcher-gtk.py
--- libchamplain-0.12.2/demos/launcher-gtk.py	2012-03-12 00:01:35.000000000 +0100
+++ libchamplain-0.12.3/demos/launcher-gtk.py	2012-07-14 22:57:19.000000000 +0200
@@ -3,10 +3,10 @@
 
 from gi.repository import GtkClutter, Clutter
 GtkClutter.init([]) # Must be initialized before importing those:
-from gi.repository import GObject, Gtk, Champlain, GtkChamplain
-
-from markers import create_marker_layer
+from gi.repository import GObject, Gtk, Champlain, GtkChamplain, Pango
 
+import os, sys
+os.chdir(os.path.dirname(os.path.abspath(sys.argv[0])))
 
 class LauncherGTK:
 
@@ -38,7 +38,7 @@
 
         self.view.center_on(45.466, -73.75)
 
-        self.layer = create_marker_layer(self.view)
+        self.layer = self.create_marker_layer(self.view)
         self.view.add_layer(self.layer)
         self.layer.hide_all_markers()
 
@@ -120,7 +120,7 @@
             self.layer.animate_out_all_markers()
 
     def mouse_click_cb(self, actor, event, view):
-        x, y = event.get_coords()
+        x, y = event.x, event.y
         lat, lon = view.x_to_longitude(x), view.y_to_latitude(y)
         print "Mouse click at: %f %f" % (lon, lat)
         return True
@@ -146,6 +146,56 @@
         else:
             image.clear()
 
+    def marker_button_release_cb(self, actor, event, view):
+        if event.button != 1 and event.click_count > 1:
+            return False
+
+        print "Montreal was clicked\n"
+        return True
+
+
+    def create_marker_layer(self, view):
+        orange = Clutter.Color.new(0xf3, 0x94, 0x07, 0xbb)
+        layer = Champlain.MarkerLayer()
+
+        marker = Champlain.Label.new_with_text(
+            "Montréal\n<span size=\"xx-small\">Québec</span>", "Serif 14", None,
+            orange)
+        marker.set_use_markup(True)
+        marker.set_alignment(Pango.Alignment.RIGHT)
+        marker.set_color(orange)
+
+        marker.set_location(45.528178, -73.563788)
+        layer.add_marker(marker)
+        marker.set_reactive(True)
+        marker.connect("button-release-event", self.marker_button_release_cb, view)
+
+        marker = Champlain.Label.new_from_file(
+            "icons/emblem-generic.png")
+        marker.set_text("New York")
+        marker.set_location(40.77, -73.98)
+        layer.add_marker(marker)
+
+        marker = Champlain.Label.new_from_file(
+            "icons/emblem-important.png")
+        marker.set_location(47.130885, -70.764141)
+        layer.add_marker(marker)
+
+        marker = Champlain.Label.new_from_file(
+            "icons/emblem-favorite.png")
+        marker.set_draw_background(False)
+        marker.set_location(45.41484, -71.918907)
+        layer.add_marker(marker)
+
+        marker = Champlain.Label.new_from_file(
+            "icons/emblem-new.png")
+        marker.set_draw_background(False)
+        marker.set_location(50.639663, 5.570798)
+        layer.add_marker(marker)
+
+        layer.set_all_markers_draggable()
+        layer.show()
+        return layer
 
 if __name__ == "__main__":
     GObject.threads_init()
diff -Nru libchamplain-0.12.2/demos/Makefile.am libchamplain-0.12.3/demos/Makefile.am
--- libchamplain-0.12.2/demos/Makefile.am	2011-12-29 01:59:38.000000000 +0100
+++ libchamplain-0.12.3/demos/Makefile.am	2012-07-14 23:26:36.000000000 +0200
@@ -62,5 +62,5 @@
        $(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
 endif
 
-EXTRA_DIST = markers.h launcher.js minimal.py launcher-gtk.py markers.py default-rules.xml high-contrast.xml las_palmas.osm schaffhausen.osm
+EXTRA_DIST = markers.h launcher.js minimal.py launcher-gtk.py polygons.py default-rules.xml high-contrast.xml las_palmas.osm schaffhausen.osm
 
diff -Nru libchamplain-0.12.2/demos/Makefile.in libchamplain-0.12.3/demos/Makefile.in
diff -Nru libchamplain-0.12.2/demos/markers.py libchamplain-0.12.3/demos/markers.py
--- libchamplain-0.12.2/demos/markers.py	2011-12-29 01:59:30.000000000 +0100
+++ libchamplain-0.12.3/demos/markers.py	1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-from gi.repository import Clutter
-from gi.repository import Champlain
-from gi.repository import Pango
-
-def marker_button_release_cb(actor, event, view):
-    if event.button != 1 and event.click_count > 1:
-        return False
-
-    print "Montreal was clicked\n"
-    return True
-
-
-def create_marker_layer(view):
-    orange = Clutter.Color.new(0xf3, 0x94, 0x07, 0xbb)
-    layer = Champlain.MarkerLayer()
-
-    marker = Champlain.Label.new_with_text(
-        "Montréal\n<span size=\"xx-small\">Québec</span>", "Serif 14", None,
-        orange)
-    marker.set_use_markup(True)
-    marker.set_alignment(Pango.Alignment.RIGHT)
-    marker.set_color(orange)
-
-    marker.set_location(45.528178, -73.563788)
-    layer.add_marker(marker)
-    marker.set_reactive(True)
-    marker.connect("button-release-event", marker_button_release_cb, view)
-
-    marker = Champlain.Label.new_from_file(
-        "icons/emblem-generic.png")
-    marker.set_text("New York")
-    marker.set_location(40.77, -73.98)
-    layer.add_marker(marker)
-
-    marker = Champlain.Label.new_from_file(
-        "icons/emblem-important.png")
-    marker.set_location(47.130885, -70.764141)
-    layer.add_marker(marker)
-
-    marker = Champlain.Label.new_from_file(
-        "icons/emblem-favorite.png")
-    marker.set_draw_background(False)
-    marker.set_location(45.41484, -71.918907)
-    layer.add_marker(marker)
-
-    marker = Champlain.Label.new_from_file(
-        "icons/emblem-new.png")
-    marker.set_draw_background(False)
-    marker.set_location(50.639663, 5.570798)
-    layer.add_marker(marker)
-
-    layer.set_all_markers_draggable()
-    layer.show()
-    return layer
diff -Nru libchamplain-0.12.2/demos/minimal-gtk.c libchamplain-0.12.3/demos/minimal-gtk.c
--- libchamplain-0.12.2/demos/minimal-gtk.c	2012-03-12 00:02:52.000000000 +0100
+++ libchamplain-0.12.3/demos/minimal-gtk.c	2012-04-04 22:53:29.000000000 +0200
@@ -28,7 +28,7 @@
 {
   GtkWidget *window, *widget;
 
-  /* initialize threads and clutter */
+  /* initialize clutter */
   if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
diff -Nru libchamplain-0.12.2/demos/polygons.py libchamplain-0.12.3/demos/polygons.py
--- libchamplain-0.12.2/demos/polygons.py	1970-01-01 01:00:00.000000000 +0100
+++ libchamplain-0.12.3/demos/polygons.py	2012-07-14 22:57:11.000000000 +0200
@@ -0,0 +1,129 @@
+#!/usr/bin/env python
+# Copyright (C) 2012 Pablo Castellano <pablog@gnome.org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+from gi.repository import Clutter, Champlain
+Clutter.init([])
+
+PADDING = 10
+
+def zoom_in(widget, event, view):
+	view.zoom_in()
+	
+def zoom_out(widget, event, view):
+	view.zoom_out()
+	
+def make_button(text):
+	black = Clutter.Color.new(0x00, 0x00, 0x00, 0xff)
+	white = Clutter.Color.new(0xff, 0xff, 0xff, 0xff)
+  
+	button = Clutter.Group()
+	
+	button_bg = Clutter.Rectangle.new_with_color(white)
+	button_bg.set_opacity(0xcc)
+	button.add_actor(button_bg)
+	
+	button_text = Clutter.Text.new_full("Sans 10", text, black)
+	button.add_actor(button_text)
+	
+	(width, height) = button_text.get_size()
+	button_bg.set_size(width + PADDING * 2, height + PADDING * 2)
+	button_bg.set_position(0, 0)
+	button_text.set_position(PADDING, PADDING)
+
+	return button
+	
+def append_point(layer, lon, lat):
+	coord = Champlain.Coordinate.new_full(lon, lat)
+	layer.add_node(coord)
+
+def main_quit(data):
+	Clutter.main_quit()
+
+
+if __name__ == '__main__':
+	total_width = 0
+	
+	stage = Clutter.Stage()
+	stage.set_size(800, 600)
+	# It complains about the number of arguments passed to main_quit()
+	#stage.connect('destroy', Clutter.main_quit)
+	stage.connect('destroy', main_quit)
+	
+	# Create the map view
+	view = Champlain.View()
+	view.set_size(800, 600)
+	stage.add_actor(view)
+
+	# Create the buttons
+	buttons = Clutter.Group()
+	buttons.set_position(PADDING, PADDING)
+
+	button = make_button('Zoom in')
+	buttons.add_actor(button)
+	button.set_reactive(True)
+	(width, height) = button.get_size()
+	total_width += width + PADDING;
+	#button.connect('button-release-event', zoom_in, view)
+	button.connect('button-release-event', zoom_in, view)
+	
+	button = make_button('Zoom out')
+	buttons.add_actor(button)
+	button.set_reactive(True)
+	button.set_position(total_width, 0)
+	(width, height) = button.get_size()
+	button.connect('button-release-event', zoom_out, view)
+
+	stage.add_actor(buttons)
+
+	# Draw a line
+	layer = Champlain.PathLayer()
+	# Cheap approx of Highway 10
+	append_point(layer, 45.4104, -73.2846)
+	append_point(layer, 45.4178, -73.2239)
+	append_point(layer, 45.4176, -73.2181)
+	append_point(layer, 45.4151, -73.2126)
+	append_point(layer, 45.4016, -73.1926)
+	append_point(layer, 45.3994, -73.1877)
+	append_point(layer, 45.4000, -73.1815)
+	append_point(layer, 45.4151, -73.1218)
+	layer.set_stroke_width(4.0)
+	view.add_layer(layer)
+
+	dash = [6, 2]
+	layer.set_dash(dash)
+  
+	# Draw a path
+	layer = Champlain.PathLayer()
+	append_point(layer, 45.1386, -73.9196)
+	append_point(layer, 45.1229, -73.8991)
+	append_point(layer, 45.0946, -73.9531)
+	append_point(layer, 45.1085, -73.9714)
+	append_point(layer, 45.1104, -73.9761)
+	layer.set_closed(True)
+	layer.set_fill(True)
+	layer.set_visible(True)
+	view.add_layer(layer)
+	
+	# Finish initialising the map view
+	view.set_zoom_level(8)
+	view.set_kinetic_mode(True)
+	
+	view.center_on(45.466, -73.75)
+
+	stage.show()
+	Clutter.main()
diff -Nru libchamplain-0.12.2/docs/reference/html/ch01.html libchamplain-0.12.3/docs/reference/html/ch01.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ch02.html libchamplain-0.12.3/docs/reference/html/ch02.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ch03.html libchamplain-0.12.3/docs/reference/html/ch03.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ch04.html libchamplain-0.12.3/docs/reference/html/ch04.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ch05.html libchamplain-0.12.3/docs/reference/html/ch05.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ch06.html libchamplain-0.12.3/docs/reference/html/ch06.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainBoundingBox.html libchamplain-0.12.3/docs/reference/html/ChamplainBoundingBox.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainCoordinate.html libchamplain-0.12.3/docs/reference/html/ChamplainCoordinate.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainCustomMarker.html libchamplain-0.12.3/docs/reference/html/ChamplainCustomMarker.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainErrorTileRenderer.html libchamplain-0.12.3/docs/reference/html/ChamplainErrorTileRenderer.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainFileCache.html libchamplain-0.12.3/docs/reference/html/ChamplainFileCache.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainFileTileSource.html libchamplain-0.12.3/docs/reference/html/ChamplainFileTileSource.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainImageRenderer.html libchamplain-0.12.3/docs/reference/html/ChamplainImageRenderer.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainLabel.html libchamplain-0.12.3/docs/reference/html/ChamplainLabel.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainLayer.html libchamplain-0.12.3/docs/reference/html/ChamplainLayer.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainLicense.html libchamplain-0.12.3/docs/reference/html/ChamplainLicense.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainLocation.html libchamplain-0.12.3/docs/reference/html/ChamplainLocation.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainMapSourceChain.html libchamplain-0.12.3/docs/reference/html/ChamplainMapSourceChain.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainMapSourceDesc.html libchamplain-0.12.3/docs/reference/html/ChamplainMapSourceDesc.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainMapSourceFactory.html libchamplain-0.12.3/docs/reference/html/ChamplainMapSourceFactory.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainMapSource.html libchamplain-0.12.3/docs/reference/html/ChamplainMapSource.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainMarker.html libchamplain-0.12.3/docs/reference/html/ChamplainMarker.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainMarkerLayer.html libchamplain-0.12.3/docs/reference/html/ChamplainMarkerLayer.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainMemoryCache.html libchamplain-0.12.3/docs/reference/html/ChamplainMemoryCache.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainMemphisRenderer.html libchamplain-0.12.3/docs/reference/html/ChamplainMemphisRenderer.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainNetworkBboxTileSource.html libchamplain-0.12.3/docs/reference/html/ChamplainNetworkBboxTileSource.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainNetworkTileSource.html libchamplain-0.12.3/docs/reference/html/ChamplainNetworkTileSource.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainNullTileSource.html libchamplain-0.12.3/docs/reference/html/ChamplainNullTileSource.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainPathLayer.html libchamplain-0.12.3/docs/reference/html/ChamplainPathLayer.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainPoint.html libchamplain-0.12.3/docs/reference/html/ChamplainPoint.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainRenderer.html libchamplain-0.12.3/docs/reference/html/ChamplainRenderer.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainScale.html libchamplain-0.12.3/docs/reference/html/ChamplainScale.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainTileCache.html libchamplain-0.12.3/docs/reference/html/ChamplainTileCache.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainTile.html libchamplain-0.12.3/docs/reference/html/ChamplainTile.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainTileSource.html libchamplain-0.12.3/docs/reference/html/ChamplainTileSource.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ChamplainView.html libchamplain-0.12.3/docs/reference/html/ChamplainView.html
diff -Nru libchamplain-0.12.2/docs/reference/html/index.html libchamplain-0.12.3/docs/reference/html/index.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ix01.html libchamplain-0.12.3/docs/reference/html/ix01.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ix02.html libchamplain-0.12.3/docs/reference/html/ix02.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ix03.html libchamplain-0.12.3/docs/reference/html/ix03.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ix04.html libchamplain-0.12.3/docs/reference/html/ix04.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ix05.html libchamplain-0.12.3/docs/reference/html/ix05.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ix06.html libchamplain-0.12.3/docs/reference/html/ix06.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ix07.html libchamplain-0.12.3/docs/reference/html/ix07.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ix08.html libchamplain-0.12.3/docs/reference/html/ix08.html
diff -Nru libchamplain-0.12.2/docs/reference/html/ix09.html libchamplain-0.12.3/docs/reference/html/ix09.html
diff -Nru libchamplain-0.12.2/docs/reference/html/libchamplain-ChamplainVersion.html libchamplain-0.12.3/docs/reference/html/libchamplain-ChamplainVersion.html
diff -Nru libchamplain-0.12.2/docs/reference/html/pt01.html libchamplain-0.12.3/docs/reference/html/pt01.html
diff -Nru libchamplain-0.12.2/docs/reference/html/pt02.html libchamplain-0.12.3/docs/reference/html/pt02.html
diff -Nru libchamplain-0.12.2/docs/reference/html/pt03.html libchamplain-0.12.3/docs/reference/html/pt03.html
diff -Nru libchamplain-0.12.2/docs/reference/html/pt04.html libchamplain-0.12.3/docs/reference/html/pt04.html
diff -Nru libchamplain-0.12.2/docs/reference/html/pt05.html libchamplain-0.12.3/docs/reference/html/pt05.html
diff -Nru libchamplain-0.12.2/docs/reference/html/pt06.html libchamplain-0.12.3/docs/reference/html/pt06.html
diff -Nru libchamplain-0.12.2/docs/reference/html/pt07.html libchamplain-0.12.3/docs/reference/html/pt07.html
diff -Nru libchamplain-0.12.2/docs/reference/version.xml libchamplain-0.12.3/docs/reference/version.xml
diff -Nru libchamplain-0.12.2/docs/reference-gtk/html/GtkChamplainEmbed.html libchamplain-0.12.3/docs/reference-gtk/html/GtkChamplainEmbed.html
diff -Nru libchamplain-0.12.2/docs/reference-gtk/html/index.html libchamplain-0.12.3/docs/reference-gtk/html/index.html
diff -Nru libchamplain-0.12.2/docs/reference-gtk/html/pt01.html libchamplain-0.12.3/docs/reference-gtk/html/pt01.html
diff -Nru libchamplain-0.12.2/docs/reference-gtk/version.xml libchamplain-0.12.3/docs/reference-gtk/version.xml
diff -Nru libchamplain-0.12.2/NEWS libchamplain-0.12.3/NEWS
--- libchamplain-0.12.2/NEWS	2012-03-12 00:16:51.000000000 +0100
+++ libchamplain-0.12.3/NEWS	2012-07-14 23:26:36.000000000 +0200
@@ -1,3 +1,15 @@
+libchamplain 0.12.3 (2012-07-14)
+===============================
+
+Stable release
+
+Changes:
+* Fix OpenCycleMap source URL (Thomas Bechtold)
+* Fix ChmplainPoint resizing issue (Jiří Techet)
+* Many minor documentation improvements (Pablo Castellano)
+* New polygons.py Python demo
+* Other minor fixes and improvements (Pablo Castellano, Jiří Techet)
+
 libchamplain 0.12.2 (2012-03-12)
 ===============================
 
>From 5169e770c3fb3047badec0ffdcebf8fdb29599e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
Date: Fri, 29 Jun 2012 00:30:26 +0200
Subject: [PATCH 1/2] Resize containing clutter actor together with the point

---
 champlain/champlain-point.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/champlain/champlain-point.c b/champlain/champlain-point.c
index 7fb4c4a..29e6bdd 100644
--- a/champlain/champlain-point.c
+++ b/champlain/champlain-point.c
@@ -418,7 +418,14 @@ champlain_point_set_size (ChamplainPoint *point,
 {
   g_return_if_fail (CHAMPLAIN_IS_POINT (point));
 
+  ChamplainPointPrivate *priv = point->priv;
+
+  if (priv->point_actor)
+    clutter_actor_unparent (CLUTTER_ACTOR (priv->point_actor));
+
   point->priv->size = size;
+  priv->point_actor = clutter_cairo_texture_new (size, size);
+  clutter_actor_set_parent (CLUTTER_ACTOR (priv->point_actor), CLUTTER_ACTOR (point));
   g_object_notify (G_OBJECT (point), "size");
   draw_point (point);
 }
-- 
1.7.10.4

>From 8cd9347ad42abe7812983ab75d3706f1234636eb Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <thomasbechtold@jpberlin.de>
Date: Sun, 8 Jul 2012 10:27:59 +0200
Subject: [PATCH 2/2] fix osm cycle map source

---
 champlain/champlain-map-source-factory.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index 59a4f6a..b3aeb8f 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -170,7 +170,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         17,
         256,
         CHAMPLAIN_MAP_PROJECTION_MERCATOR,
-        "http://tah.openstreetmap.org/Tiles/tile/#Z#/#X#/#Y#.png";,
+        "http://a.tah.openstreetmap.org/Tiles/tile/#Z#/#X#/#Y#.png";,
         champlain_map_source_new_generic,
         NULL);
   champlain_map_source_factory_register (factory, desc);
@@ -198,7 +198,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         18,
         256,
         CHAMPLAIN_MAP_PROJECTION_MERCATOR,
-        "http://andy.sandbox.cloudmade.com/tiles/cycle/#Z#/#X#/#Y#.png";,
+        "http://tile.opencyclemap.org/cycle/#Z#/#X#/#Y#.png";,
         champlain_map_source_new_generic,
         NULL);
   champlain_map_source_factory_register (factory, desc);
-- 
1.7.10.4


Reply to: