[frogr: 10/11] Merge branch 'frogr-0.6.x'

[Mario Sanchez Prada <msanchez src gnome org>]

commit a651a75116675a12f98a1b253766642534b162f3
Merge: 6fa1b9e b5aa704
Author: Mario Sanchez Prada <msanchez igalia com>
Date:   Fri Aug 19 16:19:00 2011 +0200

    Merge branch 'frogr-0.6.x'

 NEWS             |   15 +++++++++++++++
 debian/changelog |    9 ++++++++-
 frogr.spec       |    4 ++++
 3 files changed, 27 insertions(+), 1 deletions(-)
---
diff --cc NEWS
index 3be524f,d0c3ff1..ae0e8c4
--- a/NEWS
+++ b/NEWS
@@@ -1,6 -1,15 +1,21 @@@
 +0.7 (??)
 +========
 +
++  *
++
++
+ 0.6.1 (19 Aug 2011)
+ ===================
+ 
+   * Fix a big memory leak loading pixbufs in details window.
+   * Fixed several mem leaks as reported by valgrind. (Christophe Fergeau).
+   * Fixed segfault if using GTK < 2.24 when using combo boxes (Alberto Garcia)
+   * Fixed problems authorizing in the Mac version.
+ 
+ Bug fixes:
+ 
+   * #656519: memleak fixes
+ 
  
  0.6 (13 Aug 2011)
  =================
diff --cc debian/changelog
index 5421350,4a4e827..6fde192
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
 +frogr (0.7~unreleased) unstable; urgency=low
 +
 +  * New upstream release (see NEWS file for details).
 +  * Package manually generated out of any distro.
 +
-  -- Mario Sanchez Prada <msanchez igalia com>  Fri, 13 Aug 2011 00:42:00 +0200
++ -- Mario Sanchez Prada <msanchez igalia com>  Fri, 19 Aug 2011 16:18:33 +0200
++
+ frogr (0.6.1) unstable; urgency=low
+ 
+   * New upstream release (see NEWS file for details).
+   * Package manually generated out of any distro.
+ 
+  -- Mario Sanchez Prada <msanchez igalia com>  Fri, 19 Aug 2011 15:30:20 +0200
  
  frogr (0.6) unstable; urgency=low