[Pkg-cli-apps-commits] [SCM] gnome-do branch, ubuntu, updated. debian/0.8.5-1-2-gc6a5153
Christopher James Halse Rogers
raof at ubuntu.com
Mon Jun 27 16:24:02 UTC 2011
The following commit has been merged in the ubuntu branch:
commit c6a5153f315639d24477111ef23a6a77b69ecd05
Merge: 7a597c59f624a7b58255b5cec728491da287ace4 c560f7c30cb1ef66540066ddd317171ba52444dc
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date: Mon Jun 27 16:30:26 2011 +0100
Merge from Debian unstable
diff --combined debian/changelog
index 99e3219,21a2356..76fd52a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,58 -1,50 +1,116 @@@
++gnome-do (0.8.5-1ubuntu1) oneiric; urgency=low
++
++ * Merge from Debian unstable. 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.
++ * Include 0.8.4-1 changelog entry
++
++ -- Christopher James Halse Rogers <raof at ubuntu.com> Mon, 27 Jun 2011 16:30:06 +0100
++
+ gnome-do (0.8.5-1) unstable; urgency=low
+
+ [ Christopher James Halse Rogers ]
+ * Imported Upstream version 0.8.5
+ - Fix newline in Kazakh translation (Closes: #618415)
+ - Fix build with mono >= 2.8.
+ * Remove unneeded .la files. (Closes: #621335)
+ * Drop patches included in new release
+ * Use ‘dh --with’ rather than cli.make to avoid warning spam
+ * Drop mention of Evolution from package description.
+ - The evolution plugin is not going to be buildable for the forseeable
+ future. Including it in the package description is misleading.
+
+ [ Iain Lane ]
+ * Add missing dependency on librsvg2-common, required to load SVGs
+ (Closes: #619039)
+ * Update to use my d.o email address
+
+ -- Christopher James Halse Rogers <raof at ubuntu.com> Tue, 14 Jun 2011 22:32:21 +1000
+
+ gnome-do (0.8.4-1) unstable; urgency=low
+
+ * The long fortold release
+ + Fixes a threadsafety issue resulting in 100% CPU usage (Closes: 565591,
+ LP: #450852).
+ + Proxies all keyring calls to the GTK main thread, as required by the new
+ gnome-keyring (Closes: 603876, LP: #553643)
+ * debian/patches/00_bundledlibs.dpatch:
+ * debian/rules:
+ + Upstream has dropped bundled gmcs binary; now 100% DFSG-free, so we don't
+ have to repack the tarball or patch the buildsystem.
+ * debian/patches/03_disable_docky.dpatch:
+ + Drop. Docky is now gone in the upstream tarball.
+ * debian/rules:
+ * debian/control:
+ * debian/patches/*:
+ + Switch to quilt to harmonise with other pkg-cli-* packages.
+ * debian/control:
+ + Drop recommends on gnome-do-docklets. Docky is now a separate package,
+ so the docklets are useless for Do.
+ + Bump Breaks on gnome-do-plugins to 0.8.3. Do no longer provides the Wink
+ library, which has been imported into the 0.8.3 do-plugins sources.
+ + Bump standards-version; no changes needed.
+ + Migrate to git and update VCS fields appropriately
+
+ -- Christopher James Halse Rogers <raof at ubuntu.com> Tue, 15 Feb 2011 21:50:02 +1100
+
+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).
+ + Proxies all keyring calls to the GTK main thread, as required by the new
+ gnome-keyring (Closes: 603876, LP: #553643)
+ * debian/patches/00_bundledlibs.dpatch:
+ * debian/rules:
+ + Upstream has dropped bundled gmcs binary; now 100% DFSG-free, so we don't
+ have to repack the tarball or patch the buildsystem.
+ * debian/patches/03_disable_docky.dpatch:
+ + Drop. Docky is now gone in the upstream tarball.
+ * debian/rules:
+ * debian/control:
+ * debian/patches/*:
+ + Switch to quilt to harmonise with other pkg-cli-* packages.
+ * debian/control:
+ + Drop recommends on gnome-do-docklets. Docky is now a separate package,
+ so the docklets are useless for Do.
+ + Bump Breaks on gnome-do-plugins to 0.8.3. Do no longer provides the Wink
+ library, which has been imported into the 0.8.3 do-plugins sources.
+ + Bump standards-version; no changes needed.
+ + Migrate to git and update VCS fields appropriately
+
+ -- 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
@@@ -67,14 -59,6 +125,14 @@@
-- 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 --combined debian/control
index d81da08,b77bd99..22d87f9
--- a/debian/control
+++ b/debian/control
@@@ -1,9 -1,8 +1,9 @@@
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>
+ Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>, Iain Lane <laney at debian.org>
Build-Depends: debhelper (>= 7.0.50),
dh-autoreconf,
quilt (>= 0.46-7~),
@@@ -18,7 -17,7 +18,7 @@@
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,
@@@ -44,6 -43,7 +44,7 @@@ Architecture: an
Depends: ${cli:Depends},
${shlibs:Depends},
${misc:Depends},
+ librsvg2-common,
xdg-utils,
dbus,
procps
@@@ -51,10 -51,9 +52,9 @@@ Recommends: gnome-do-plugins (>= 0.8.3
Breaks: gnome-do-plugins (<< 0.8.3)
Description: Quickly perform actions on your desktop
Allows you to quickly search for many items present in your
- GNOME desktop environment (applications, Evolution contacts, Firefox
- bookmarks, files, artists and albums in Rhythmbox, Pidgin buddies,
- etc.) and perform commonly used actions on those items (Run, Open,
- Email, Chat, Play, etc.).
+ GNOME desktop environment (applications, Firefox bookmarks, files,
+ artists and albums in Rhythmbox, Pidgin buddies, etc.) and perform
+ commonly used actions on those items (Run, Open, Email, Chat, Play, etc.).
.
GNOME Do is plugin based, allowing it to be easily extended to handle
new items and actions. This package contains a core set of items and
diff --combined debian/patches/series
index da1da48,b227865..cf0b601
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,2 +1,3 @@@
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