[Pkg-cli-apps-commits] [SCM] docky branch, master, updated. debian/2.0.3.1-2-4-g94fd65c
Christopher James Halse Rogers
raof at ubuntu.com
Mon May 31 13:46:04 UTC 2010
The following commit has been merged in the master branch:
commit 94fd65cd76b6e9f7d4c2b4c0bd21a4abb2b54cb0
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date: Mon May 31 23:45:09 2010 +1000
Import new upstream release, build against system gio-sharp
diff --git a/debian/changelog b/debian/changelog
index 630936e..dbc27d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,63 @@
-docky (2.0.3.1-3) UNRELEASED; urgency=low
+docky (2.0.4-1) UNRELEASED; urgency=low
+ [ Iain Lane ]
* debian/control: Specify that only python version >= 2.5 are supported,
thanks to Stefano Rivera for the report (Closes: #582046)
- -- Iain Lane <laney at ubuntu.com> Tue, 18 May 2010 10:24:56 +0100
+ [ Rico Tzschichholz ]
+ * New upstream release 2.0.4 "Do you think you're better off alone?",
+ changes include:
+ + fix positioning of menus/hovers on multimon setups (LP: #544047)
+ + make settings dialog smaller so it fits on netbook screens (LP: #581458)
+ + FileApplicationProvider.PinToDock misses a handle-removal
+ This caused a duplicated item when restarting a just pinned application and
+ leads to a crash when trying to pin the new item (LP: #585136)
+ + update transient items when moving the active window (LP: #581077)
+ + fix crash when a file is on the dock where this file no longer exists
+ (LP: #581074)
+ + fix drag'n'drop-hover-strings (LP: #556041)
+ + add call to GLib.Thread.Init (LP: #586969)
+ + Window-Matching
+ - better OpenOffice handling (LP: #486887) (LP: #580275)
+ (LP: #504486) (LP: #580275)
+ + Helper
+ - fix a crash regarding helpers terminating
+ - fix killing helpers from prefs menu
+ - fix potential crash when disabling helpers
+ - cleanup the helpers, fix a few possible leaks in them
+ + Clock: fix problems with the small clock rendering
+ + GMail:
+ - fix compose mail url in GMail docklet for Google app domains (LP: #582212)
+ - fix crash when removing a gmail label (LP: #576596)
+ - refresh be set up to 1 day (1440 mins) long (LP: #580441)
+ - missing string internationalization in GMail
+ + RecentDocuments: better locking to avoid crashes when clearing
+ recent documents (LP: #580723)
+ + Weather: make sure weather doesn't reload when prefs open (LP: #580314)
+ + Bookmarks: stop spurious errors when dragging files over
+ unmounted bookmarks (LP: #580361)
+ + NPR: fix failing to load after network comes back up (LP: #523155)
+ + make banshee and rhythmbox helper a bit smarter looking
+ for art-cover-files (LP: #578254)
+ + fix class-names in the deluge helper
+ + change open terminal here helper to use the gnome default terminal,
+ with a fallback to gnome-terminal if the default is not set
+ + fix issues with newer zeitgeist version (LP: #570286)
+
+ [Christopher James Halse Rogers]
+ * debian/patches/mail_label_crash:
+ * debian/patches/window_grouping_reliability:
+ + Drop patches incorporated in new upstream release.
+ * debian/rules:
+ + Run autoreconf before configure for GIO buildsystem patch.
+ + Remove autofoo cruft on clean.
+ * debian/patches/use-system-gio-sharp.patch:
+ + Build against the system gio-sharp
+ * debian/control:
+ + Add build-depends on libgconf2-dev for autoreconf,
+ libgio2.0-cil-dev.
+
+ -- Christopher James Halse Rogers <raof at ubuntu.com> Mon, 31 May 2010 23:03:30 +1000
docky (2.0.3.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e065fcc..1e13eb4 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,9 @@ Build-Depends-Indep:
libnotify-cil-dev,
libwnck1.0-cil-dev,
libgtk2.0-dev,
- libglib2.0-dev
+ libglib2.0-dev,
+ libgconf2-dev,
+ libgio2.0-cil-dev,
Standards-Version: 3.8.4
XS-Python-Version: >= 2.5
Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/docky.git
diff --git a/debian/patches/mail_label_crash b/debian/patches/mail_label_crash
deleted file mode 100644
index c0787a6..0000000
--- a/debian/patches/mail_label_crash
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix "Deleting label in mail applet causes docky to crash"
-Origin: upstream, commit: 1327
-Bug-Upstream: https://bugs.launchpad.net/docky/+bug/576596
-
-=== modified file 'Docky.Widgets/Docky.Widgets/ListOnlyTileView.cs'
-Index: docky.git/Docky.Widgets/Docky.Widgets/ListOnlyTileView.cs
-===================================================================
---- docky.git.orig/Docky.Widgets/Docky.Widgets/ListOnlyTileView.cs 2010-05-14 09:10:13.976709841 +0100
-+++ docky.git/Docky.Widgets/Docky.Widgets/ListOnlyTileView.cs 2010-05-14 09:11:10.196709296 +0100
-@@ -36,11 +36,11 @@
-
- public override void OnTileActiveChanged (object o, EventArgs args)
- {
-+ base.OnTileActiveChanged (o, args);
-+
- Tile t = o as Tile;
-
- RemoveTile (t.OwnedObject);
--
-- base.OnTileActiveChanged (o, args);
- }
- }
- }
-Index: docky.git/Docky.Widgets/Docky.Widgets/TileView.cs
-===================================================================
---- docky.git.orig/Docky.Widgets/Docky.Widgets/TileView.cs 2010-05-14 09:10:14.056708576 +0100
-+++ docky.git/Docky.Widgets/Docky.Widgets/TileView.cs 2010-05-14 09:11:10.206719952 +0100
-@@ -125,11 +125,11 @@
- tile.ActiveChanged -= OnTileActiveChanged;
- tile.SizeAllocated -= OnTileSizeAllocated;
- tile.Owner = null;
-- tile.Dispose ();
-- tile.Destroy ();
-
- tiles.Remove (tile);
- box.Remove (tile);
-+ tile.Dispose ();
-+ tile.Destroy ();
- }
-
- public virtual void ClearSelection ()
diff --git a/debian/patches/series b/debian/patches/series
index 530dee8..6fb8d90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-mail_label_crash
-window_grouping_reliability
+use-system-gio-sharp.patch
diff --git a/debian/patches/use-system-gio-sharp.patch b/debian/patches/use-system-gio-sharp.patch
new file mode 100644
index 0000000..715af4c
--- /dev/null
+++ b/debian/patches/use-system-gio-sharp.patch
@@ -0,0 +1,35 @@
+Index: docky/configure.ac
+===================================================================
+--- docky.orig/configure.ac 2010-05-31 21:02:35.577466139 +1000
++++ docky/configure.ac 2010-05-31 21:41:51.636241823 +1000
+@@ -138,7 +138,7 @@
+ DOCKY_WINDOWING_LIBS="-r:$(pwd)/build/Docky.Windowing.dll"
+ AC_SUBST([DOCKY_WINDOWING_LIBS])
+
+-GIO_SHARP_LIBS="-r:$(pwd)/build/gio-sharp.dll"
++PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0])
+ AC_SUBST([GIO_SHARP_LIBS])
+
+ PKG_CHECK_MODULES([NUNIT], [nunit], have_nunit=yes, have_nunit=no)
+@@ -175,9 +175,6 @@
+
+ AC_CONFIG_FILES([
+ lib/Makefile
+-lib/gio-sharp/Makefile
+-lib/gio-sharp/generator/Makefile
+-lib/gio-sharp/gio/Makefile
+ scripts/Makefile
+ scripts/docky/Makefile
+ scripts/docky/docky.py
+Index: docky/Makefile.am
+===================================================================
+--- docky.orig/Makefile.am 2010-05-31 21:41:58.956209626 +1000
++++ docky/Makefile.am 2010-05-31 21:42:11.246235746 +1000
+@@ -9,7 +9,6 @@
+ . \
+ data \
+ scripts \
+- lib \
+ po \
+ Docky.CairoHelper \
+ Docky.Services \
diff --git a/debian/patches/window_grouping_reliability b/debian/patches/window_grouping_reliability
deleted file mode 100644
index 0844eb1..0000000
--- a/debian/patches/window_grouping_reliability
+++ /dev/null
@@ -1,104 +0,0 @@
-Description: Fix "Two Icons Showing for Two Openoffice Writer Windows"
-Origin: upstream, commit: 1329
-
-=== modified file 'Docky.Items/Docky.Items/ApplicationDockItem.cs'
-Index: docky.git/Docky.Items/Docky.Items/ApplicationDockItem.cs
-===================================================================
---- docky.git.orig/Docky.Items/Docky.Items/ApplicationDockItem.cs 2010-05-15 12:27:32.186709859 +0100
-+++ docky.git/Docky.Items/Docky.Items/ApplicationDockItem.cs 2010-05-15 12:29:41.696710648 +0100
-@@ -142,6 +142,12 @@
- Windows = Enumerable.Empty<Wnck.Window> ();
- }
-
-+ public void RecollectWindows ()
-+ {
-+ UpdateWindows ();
-+ OnPaintNeeded ();
-+ }
-+
- protected override MenuList OnGetMenuItems ()
- {
- MenuList list = base.OnGetMenuItems ();
-Index: docky.git/Docky.Items/Docky.Items/FileApplicationProvider.cs
-===================================================================
---- docky.git.orig/Docky.Items/Docky.Items/FileApplicationProvider.cs 2010-05-15 12:27:32.216710159 +0100
-+++ docky.git/Docky.Items/Docky.Items/FileApplicationProvider.cs 2010-05-15 12:29:41.696710648 +0100
-@@ -117,23 +117,33 @@
- if (args.Window.IsSkipTasklist)
- return;
-
-- if (!WindowMatcher.Default.WindowIsReadyForMatch (args.Window)) {
-- int i = 0;
-- // try to give open office enough time to open and set its title
-- GLib.Timeout.Add (150, delegate {
-- if (!WindowMatcher.Default.WindowIsReadyForMatch (args.Window) && i < 20) {
-- i++;
-- return true;
-- }
-- UpdateTransientItems ();
-- return false;
-- });
-- } else {
-- // ensure we run last (more or less) so that all icons can update first
-- GLib.Timeout.Add (150, delegate {
-+ // ensure we run last (more or less) so that all icons can update first
-+ GLib.Timeout.Add (150, delegate {
-+ if (WindowMatcher.Default.WindowIsReadyForMatch (args.Window)) {
- UpdateTransientItems ();
-- return false;
-- });
-+ } else {
-+ // handle applications which set their proper (matchable) window title very late,
-+ // like OpenOffice
-+ // their windows will be monitored for name changes (give up after 5 seconds)
-+ args.Window.NameChanged += HandleUnmatchedWindowNameChanged;
-+ GLib.Timeout.Add (5000, delegate {
-+ if (!WindowMatcher.Default.WindowIsReadyForMatch (args.Window)) {
-+ args.Window.NameChanged -= HandleUnmatchedWindowNameChanged;
-+ UpdateTransientItems ();
-+ }
-+ return false;
-+ });
-+ }
-+ return false;
-+ });
-+ }
-+
-+ void HandleUnmatchedWindowNameChanged (object sender, EventArgs e)
-+ {
-+ Wnck.Window window = (sender as Wnck.Window);
-+ if (WindowMatcher.Default.WindowIsReadyForMatch (window)) {
-+ window.NameChanged -= HandleUnmatchedWindowNameChanged;
-+ UpdateTransientItems ();
- }
- }
-
-@@ -175,6 +185,19 @@
- desktopFile = WindowMatcher.Default.DesktopFileForWindow (window);
-
- if (!string.IsNullOrEmpty (desktopFile)) {
-+ //This fixes WindowMatching for OpenOffice which is a bit slow setting up its window title
-+ //Check if a existing ApplicationDockItem already uses this DesktopItem
-+ ApplicationDockItem appdi;
-+ if ((appdi = transient_items
-+ .Where (adi => (adi is ApplicationDockItem && (adi as ApplicationDockItem).OwnedItem.Location == desktopFile))
-+ .Cast<ApplicationDockItem> ()
-+ .FirstOrDefault ()) != null) {
-+
-+ //Try again to gain this missing window
-+ appdi.RecollectWindows ();
-+ continue;
-+ }
-+
- item = ApplicationDockItem.NewFromUri (new Uri (desktopFile).AbsoluteUri);
- } else {
- item = new WindowDockItem (window);
-Index: docky.git/po/POTFILES.skip
-===================================================================
---- docky.git.orig/po/POTFILES.skip 2010-05-15 12:29:48.057960634 +0100
-+++ docky.git/po/POTFILES.skip 2010-05-15 12:29:51.267958750 +0100
-@@ -1,2 +1,4 @@
- data/docky.desktop.in
- Docky.Windowing/Windowing/WindowMatcher.cs
-+.pc/window_grouping_reliability/Docky.Items/Docky.Items/ApplicationDockItem.cs
-+.pc/window_grouping_reliability/Docky.Items/Docky.Items/FileApplicationProvider.cs
diff --git a/debian/rules b/debian/rules
index a055b64..c4956a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,15 @@ override_dh_pysupport:
dh_pysupport -X /usr/share/docky/helpers/
override_dh_auto_configure:
+ autoreconf -vi
dh_auto_configure -- MCS=/usr/bin/mono-csc
+override_dh_auto_clean:
+ dh_auto_clean
+# Clean up the autofoo changes
+ find . -name Makefile.in -type f -delete
+ -rm configure aclocal.m4 lib/Makefile
+
override_dh_auto_install:
dh_auto_install
# Upstream installs the metadata as executable.
--
docky
More information about the Pkg-cli-apps-commits
mailing list