[Pkg-cli-apps-commits] [SCM] gnome-do branch, ubuntu, updated. debian/0.8.4-1-1-g7a597c5

Christopher James Halse Rogers raof at ubuntu.com
Mon Mar 21 05:37:40 UTC 2011 

The following commit has been merged in the ubuntu branch:
commit 7a597c59f624a7b58255b5cec728491da287ace4
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Mon Mar 21 16:35:24 2011 +1100

    Merge Ubuntu changes to create ubuntu branch

diff --git a/debian/changelog b/debian/changelog
index adddcf8..99e3219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
-gnome-do (0.8.4-1) unstable; urgency=low
+gnome-do (0.8.4-0ubuntu1) natty; urgency=low
 
+  * The Race Against FF upload.  Merge from unreleased Debian git.
+    Remaining Ubuntu changes:
+    + debian/patches/05_disable_resize_grips.patch.diff:
+      Disable resize handles for the Do windows.
+    + debian/control:
+      Bump gtk# build dep for HasResizeGrip API.
+  * New Debian changes:
   * The long fortold release
     + Fixes a threadsafety issue resulting in 100% CPU usage (Closes: 565591,
       LP: #450852).
@@ -25,6 +32,27 @@ gnome-do (0.8.4-1) unstable; urgency=low
 
  -- Christopher James Halse Rogers <raof at ubuntu.com>  Tue, 15 Feb 2011 21:50:02 +1100
 
+gnome-do (0.8.3.1+dfsg-2ubuntu2) natty; urgency=low
+
+  [ Cody Russell ]
+  * debian/patches/05_disable_resize_grips.patch.dpatch: Disable
+    GTK+ resize grips on gnome-do windows.  (LP: #702642)
+
+  [ Christopher James Halse Rogers ]
+  * debian/rules: Bump build-dep to require a new enough gtk# for
+    HasResizeGrip API.
+
+ -- Christopher James Halse Rogers <raof at ubuntu.com>  Mon, 31 Jan 2011 10:32:20 +1100
+
+gnome-do (0.8.3.1+dfsg-2ubuntu1) maverick; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+    + debian/patches/03_fix_gks_crashers.dpatch:
+      - Proxy keyring calls to the GTK main thread.  Prevents libgnome-keyring
+        taking down Do with an assert().  
+
+ -- Iain Lane <laney at ubuntu.com>  Fri, 01 Oct 2010 11:54:43 +0100
+
 gnome-do (0.8.3.1+dfsg-2) unstable; urgency=low
 
   * debian/patches/03_disable_docky.dpatch: Add patch to disable Docky
@@ -39,6 +67,14 @@ gnome-do (0.8.3.1+dfsg-2) unstable; urgency=low
 
  -- Iain Lane <laney at ubuntu.com>  Wed, 29 Sep 2010 17:53:43 +0100
 
+gnome-do (0.8.3.1+dfsg-1ubuntu1) lucid; urgency=low
+
+  * debian/patches/03_fix_gks_crashers.dpatch:
+    + Proxy keyring calls to the GTK main thread.  Prevents libgnome-keyring
+      taking down Do with an assert().  (LP: #55137)
+
+ -- Christopher James Halse Rogers <raof at ubuntu.com>  Wed, 14 Apr 2010 12:30:07 +1000
+
 gnome-do (0.8.3.1+dfsg-1) unstable; urgency=low
 
   * New upstream bugfix release: (Closes: 561271)
diff --git a/debian/control b/debian/control
index 6349f93..d81da08 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: gnome-do
 Section: gnome
 Priority: optional
-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>, Iain Lane <laney at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50), 
                dh-autoreconf,
@@ -17,7 +18,7 @@ Build-Depends: debhelper (>= 7.0.50),
                libmono-cairo2.0-cil,
                cli-common-dev (>= 0.5.7),
                pkg-config,
-               libgtk2.0-cil-dev (>= 2.10),
+               libgtk2.0-cil-dev (>= 2.12.10-1ubuntu1),
                libglib2.0-cil-dev,
                libglade2.0-cil-dev,
                libgnome2.0-cil-dev,
diff --git a/debian/patches/05_disable_resize_grips.diff b/debian/patches/05_disable_resize_grips.diff
new file mode 100644
index 0000000..5ead892
--- /dev/null
+++ b/debian/patches/05_disable_resize_grips.diff
@@ -0,0 +1,67 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_disable_resize_grips.patch.dpatch by Cody Russell <bratsche at gnome.org>
+## Author: Cody Russell <bratsche at gnome.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disables resize grips on windows which should not have it.
+
+ at DPATCH@
+Index: gnome-do/Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs
+===================================================================
+--- gnome-do.orig/Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs	2011-02-24 11:34:53.435200266 +1100
++++ gnome-do/Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs	2011-02-24 11:35:38.906972880 +1100
+@@ -105,6 +105,7 @@
+ 			Alignment align;
+ 			Gtk.Image settings_icon;
+ 
++			HasResizeGrip = false;
+ 			AppPaintable = true;
+ 			KeepAbove = true;
+ 			Decorated = false;
+Index: gnome-do/Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/ResultsWindow.cs
+===================================================================
+--- gnome-do.orig/Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/ResultsWindow.cs	2011-02-24 11:34:53.415199502 +1100
++++ gnome-do/Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/ResultsWindow.cs	2011-02-24 11:35:38.906972880 +1100
+@@ -124,6 +124,7 @@
+ 			CellRenderer   cell;
+ 			HBox hbox;
+ 
++			HasResizeGrip = false;
+ 			KeepAbove = true;
+ 			AppPaintable = true;
+ 			AcceptFocus = false;
+Index: gnome-do/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs
+===================================================================
+--- gnome-do.orig/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs	2011-02-24 11:34:53.465201445 +1100
++++ gnome-do/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs	2011-02-24 11:35:38.906972880 +1100
+@@ -66,6 +66,7 @@
+ 		{
+ 			Decorated = false;
+ 			AppPaintable = true;
++			HasResizeGrip = false;
+ 			KeepAbove = true;
+ 			
+ 			TypeHint = WindowTypeHint.Splashscreen;
+Index: gnome-do/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs
+===================================================================
+--- gnome-do.orig/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs	2011-02-24 11:34:53.495202620 +1100
++++ gnome-do/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs	2011-02-24 11:35:38.916973264 +1100
+@@ -38,6 +38,7 @@
+ 			AppPaintable = true;
+ 			KeepAbove = true;
+ 			DoubleBuffered = false;
++			HasResizeGrip = false;
+ 			
+ 			TypeHint = WindowTypeHint.Splashscreen;
+ 			Util.Appearance.SetColormap (this);
+Index: gnome-do/po/POTFILES.skip
+===================================================================
+--- gnome-do.orig/po/POTFILES.skip	2011-02-24 11:34:53.445200655 +1100
++++ gnome-do/po/POTFILES.skip	2011-02-24 11:35:56.997677068 +1100
+@@ -2,3 +2,6 @@
+ Do.Addins/src/Do.UI/MonoDock/MonoDock.UI/ApplicationDockItem.cs
+ Do.Platform.Linux/src/Do.Universe/ApplicationItem.cs
+ 
++.pc/05_disable_resize_grips.diff/Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs
++
++# Stupid quilt / intltool-extract interaction
diff --git a/debian/patches/series b/debian/patches/series
index 4974bd4..da1da48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 01_fix_libX11_linkage.diff
 02_use_cli_for_wrapper.diff
 04_dont_disable_deprecated.diff
+05_disable_resize_grips.diff
 10_sk_translation_update.diff

-- 
gnome-do

More information about the Pkg-cli-apps-commits mailing list