[Pkg-cli-libs-commits] [SCM] gtk-sharp2 branch, master, updated. debian/2.12.10-2ubuntu4-7-g1a8ebc7

[Iain Lane]

The following commit has been merged in the master branch:
commit a626fe48cb266c612ccbdf1d0ccfb0e37684d6ee
Author: Iain Lane <laney at debian.org>
Date:   Wed Apr 11 11:50:13 2012 +0100

    Merge last two Ubuntu changelog entries
    
    The last two uploads to Ubuntu contained changes which we want in
    Debian; for a glib single-include change and others.
    
    Git-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index 45457ea..e6f1d71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,9 @@
-gtk-sharp2 (2.12.10-2ubuntu4) precise; urgency=low
+gtk-sharp2 (2.12.10-3) UNRELEASED; urgency=low
 
-  * Include <glib.h> rather than individual headers (see Debian #665550).
-
- -- Colin Watson <cjwatson at ubuntu.com>  Mon, 02 Apr 2012 23:52:19 +0100
-
-gtk-sharp2 (2.12.10-2ubuntu3) precise; urgency=low
+  [ Colin Watson ]
+  * Include <glib.h> rather than individual headers (Closes: #665550).
 
+  [ Christopher James Halse Rogers ]
   * debian/patches/04_fix_glib_2.31_threading.dpatch:
     + GLib 2.31 always has threading support, always initialises it, and has
       dropped some deprecated functions.  Update glibsharpglue and 
@@ -19,25 +17,7 @@ gtk-sharp2 (2.12.10-2ubuntu3) precise; urgency=low
   * debian/patches/99_ltmain_as_needed:
     + Drop; dh_autoreconf does this better
 
- -- Christopher James Halse Rogers <raof at ubuntu.com>  Fri, 02 Mar 2012 18:30:17 +1100
-
-gtk-sharp2 (2.12.10-2ubuntu2) precise; urgency=low
-
-  * debian/patches/03_resize_grips.dpatch:
-    - drop that patch to disable resize grip, that was needed because of 
-      Ubuntu had a backport of a gtk3 feature but it has been decided to
-      drop that distro specific change before the lts (lp: #944312)
-
- -- Sebastien Bacher <seb128 at ubuntu.com>  Thu, 01 Mar 2012 21:20:58 +0100
-
-gtk-sharp2 (2.12.10-2ubuntu1) oneiric; urgency=low
-
-  * Merge with Debian, remaining changes:
-    + debian/patches/03_resize_grips.dpatch: Add GtkWindow.HasResizeGrip
-      property.
-    + debian/rules: Bump API version to match addition of HasResizeGrip API.
-
- -- Iain Lane <laney at debian.org>  Tue, 12 Jul 2011 09:36:59 +0100
+ -- Iain Lane <laney at debian.org>  Wed, 11 Apr 2012 11:44:16 +0100
 
 gtk-sharp2 (2.12.10-2) unstable; urgency=low
 
@@ -49,17 +29,6 @@ gtk-sharp2 (2.12.10-2) unstable; urgency=low
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Mon, 11 Jul 2011 23:11:57 +0100
 
-gtk-sharp2 (2.12.10-1ubuntu1) natty; urgency=low
-
-  [ Cody Russell ]
-  * debian/patches/03_resize_grips.dpatch: Add GtkWindow.HasResizeGrip
-    property. (LP: #702642)
-
-  [ Christopher James Halse Rogers ]
-  * debian/rules: Bump API version to match addition of HasResizeGrip API.
-
- -- Christopher James Halse Rogers <raof at ubuntu.com>  Mon, 31 Jan 2011 09:55:15 +1100
-
 gtk-sharp2 (2.12.10-1) unstable; urgency=low
 
   * New upstream release

-- 
gtk-sharp2