--- docky-2.0.11.orig/debian/rules +++ docky-2.0.11/debian/rules @@ -0,0 +1,35 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/cli-common/cli.make +include /usr/share/quilt/quilt.make + +override_dh_pysupport: +# Don't byte compile helpers — causes broken ones to also show up in prefs + 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. + chmod -x debian/tmp/usr/share/docky/helpers/metadata/*.info +# The NetworkManager docklet requires an unreleased ndesk-dbus to work. + rm debian/tmp/usr/lib/docky/plugins/NetworkManager.dll + +override_dh_makeclilibs: +# Docky's gio-sharp is private + dh_makeclilibs -X usr/lib/docky/* + +%: + dh --with quilt $@ --- docky-2.0.11.orig/debian/control +++ docky-2.0.11/debian/control @@ -0,0 +1,87 @@ +Source: docky +Section: x11 +Priority: optional +Maintainer: Debian CLI Applications Team +Uploaders: Christopher James Halse Rogers +Build-Depends: debhelper (>= 7.0.50~), + quilt (>= 0.46-7~), + autotools-dev, + intltool, + python-support (>= 0.9), + cli-common-dev (>= 0.7) +Build-Depends-Indep: + mono-devel (>= 2.4.3), + gtk-sharp2-gapi, + libgconf2.0-cil-dev, + libglade2.0-cil-dev, + libgnomedesktop2.0-cil-dev, + libgnome-keyring1.0-cil-dev, + libgnome-vfs2.0-cil-dev, + libgtk2.0-cil-dev, + librsvg2-2.0-cil-dev, + libmono-addins-cil-dev, + libmono-addins-gui-cil-dev, + libndesk-dbus1.0-cil-dev, + libndesk-dbus-glib1.0-cil-dev, + libnotify-cil-dev, + libwnck1.0-cil-dev, + libgtk2.0-dev, + libglib2.0-dev, + libgconf2-dev, + libgio2.0-cil-dev (>= 2.22.2), +Standards-Version: 3.9.1 +XS-Python-Version: >= 2.5 +Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/docky.git +Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/docky.git +Homepage: https://launchpad.net/docky + +Package: docky +Architecture: all +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${cli:Depends}, + python, + librsvg2-common, + python-docky +Description: Elegant, powerful, clean dock + A full fledged dock application that makes opening common applications and + managing windows easier and quicker. Docky is fully integrated into the GNOME + Desktop and features a no non-sense approach to configuration and usage. + It just works. + . + Docky provides an application launcher, running application management, and + various "docklets" including a CPU monitor, weather report and clock. It is + similar to other docks such as AWN and cairo-dock. + . + Applications can integrate with Docky to add extra items to their context + menus or modify their icons to display more information. This package + includes integration helpers for a number of applications, including Banshee, + Rhythmbox, Deluge, Tomboy and Zeitgeist. + . + Docky is derived from the GNOME Do "docky" interface. + +Package: python-docky +Section: python +Architecture: all +Depends: ${python:Depends}, + ${misc:Depends}, + python-gobject, + python-dbus +XB-Python-Version: ${python:Versions} +Description: Elegant, powerful, clean dock - Python support library + A full fledged dock application that makes opening common applications and + managing windows easier and quicker. Docky is fully integrated into the GNOME + Desktop and features a no non-sense approach to configuration and usage. + It just works. + . + Docky provides an application launcher, running application management, and + various "docklets" including a CPU monitor, weather report and clock. It is + similar to other docks such as AWN and cairo-dock. + . + Applications can integrate with Docky to add extra items to their context + menus or modify their icons to display more information. This package + includes integration helpers for a number of applications, including Banshee, + Rhythmbox, Deluge, Tomboy and Zeitgeist. + . + This package contains a Python library to assist with integrating applications + with docky. --- docky-2.0.11.orig/debian/copyright +++ docky-2.0.11/debian/copyright @@ -0,0 +1,118 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: Docky +Maintainer: Jason Smith +Source: https://launchpad.net/docky/+download + +Files: * +Copyright: © 2008-2010 Jason Smith , + © 2008-2010 Robert Dyer , + © 2008-2010 Chris Szikszoy , + © 2008-2010 Rico Tzschichholz , + © 2008-2010 Seif Lofty , + © 2008-2010 Chris Halse Rogers , + © 2008-2010 Alex Launi , + © 2009 Siegfried Gevatter + © 2010 Stefan Bethge < stefan+launchpad@lanpartei.de> + © 2010 Lukasz Piepiora +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License + can be found in `/usr/share/common-licenses/GPL-3'. + +Files: Docky.Services/Docky.Services/Logging/ConsoleCrayon.cs, + Docky.Widgets/Docky.Widgets/TileView.cs, + Docky.Widgets/Docky.Widgets/WrapLabel.cs, + Docky.Widgets/Docky.Widgets/SingleActorStage.cs, + Docky.Widgets/Docky.Widgets/Tile.cs, + Docky.Widgets/Docky.Widgets/Actor.cs, + Docky.Widgets/Docky.Widgets/SearchEntry.cs, + Docky.Widgets/Docky.Widgets/HoverImageButton.cs, + Docky.Widgets/Docky.Widgets/Stage.cs, + Docky.Windowing/Xlib/Xlib.cs, + Docky.Windowing/Xlib/X11Atoms.cs +Copyright: © 2006-2008 Novell, Inc. +License: MIT + +Files: Docky.Widgets/Docky.Widgets/AnimatedBox.cs, + Docky.Widgets/Docky.Widgets/AnimatedVBox.cs, + Docky.Widgets/Docky.Widgets/AnimatedWidget.cs, + Docky.Widgets/Docky.Widgets/AnimatedHBox.cs, + Docky.Widgets/Docky.Widgets/Choreographer.cs +Copyright: © 2008 Scott Peterson +License: MIT + +Files: lib/gio-sharp/generator/* +Copyright: © 2001-2003 Mike Kestner , + © 2003-2008 Novell, Inc, + © 2002-2003 Rachel Hestilow , + © 2003 Ximian Inc. +License: GPL-2 + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in `/usr/share/common-licenses/GPL-2'. + +Files: lib/gio-sharp/gio/* +Copyright: © 2008 Novell, Inc., + © 2008 Stephane Delcroix +License: LGPL-2 + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the Lesser GNU General + Public License as published by the Free Software Foundation. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the Lesser GNU General Public License + can be found in `/usr/share/common-licenses/LGPL-2'. + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- docky-2.0.11.orig/debian/docky.install +++ docky-2.0.11/debian/docky.install @@ -0,0 +1,4 @@ +usr/bin +usr/lib/docky +usr/share +etc/ --- docky-2.0.11.orig/debian/watch +++ docky-2.0.11/debian/watch @@ -0,0 +1,3 @@ +version=3 + +https://launchpad.net/docky/+download http://launchpad.net/docky/.*/.*/\+download/docky-(.*).tar.gz --- docky-2.0.11.orig/debian/python-docky.install +++ docky-2.0.11/debian/python-docky.install @@ -0,0 +1 @@ +usr/lib/python* --- docky-2.0.11.orig/debian/changelog +++ docky-2.0.11/debian/changelog @@ -0,0 +1,352 @@ +docky (2.0.11-1) experimental; urgency=low + + * New upstream release 2.0.11 "Clean up your desktop", + changes include: + + fix event-driven icon-update of MenuItemWidget + + fix Gdk.Pixbuf leak in MenuItem and MenuItemWidget + + add docky.desktop to translations + + fix startup-activation of plugins + + unregister of an event in DockWindow.Dispose was missing + + make sure to ignore launchers with Hidden set (LP: #700203) + + don't set geo on notifications (LP: #506084) + + don't have Log.Notify use string.Format, which causes random bugs such + as gmail breaking when messages contain {} in the subject (LP: #697981) + + NetworkMananger: fix typo and catch exception to prevent crash if dbus + access isn't granted + + -- Rico Tzschichholz Sun, 16 Jan 2011 19:44:44 +0100 + +docky (2.0.10-1) experimental; urgency=low + + * New upstream release 2.0.10 "Nice and Easy", + changes include: + + fix unhiding when there are multiple, differently sized monitors + (LP: #625332) + + fix RecentDocuments (LP: #660179) + + add manpage + + some optimizations + * remove debian/docky.manpages, debian/docky.1 + + manpage is installed by upstream now + + -- Rico Tzschichholz Tue, 04 Jan 2011 09:32:03 +0100 + +docky (2.0.9-1) experimental; urgency=low + + * New upstream release 2.0.9 "You can count on us", + changes include: + + fix compilation with mono 2.8+ (LP: #502650) + remove dependency on Mono.GetOptions, which is obsolete and use a + bundled Mono.Options source + + add better implementation of DockySurface.LoadToPixbuf + + fix potential X crash when hovertexts are reallllllllly long... + + fix the helper tile not properly toggling (caused by gconf buffering + updates) (LP: #694117) + + fix ArgumentOutOfRangeException for pids.ElementAt(...) + + add missing disposals of fileenumerator + + let FileDockItems open on middle click + + fix a problem with bookmarks crashing when reading bad bookmark files + + -- Rico Tzschichholz Sat, 01 Jan 2011 21:21:01 +0100 + +docky (2.0.8-1) experimental; urgency=low + + * New upstream release 2.0.8 "Turn it on again", + changes include: + + change location of autostart file to ~/.config/autostart/docky.desktop + (LP: #653981) + + add window-matcher support for LibreOffice + + fix hovertext for RTL font locales (LP: #610145) + + some better pixbuf handling + + fix indicators not updating on state changes (LP: #656653) + + fix crash if a file delete fails (LP: #604234) + + make sure separators don't darken + + fix typo in log message + + fix a NRE in the debug messages + + make window manager checkbox grey out when checked, so its clear it + can't be unchecked (LP: #657678) + + make sure everything uses the services RunOnMainThread instead of + calling Gtk.App.Invoke directly + + protect the system service events from crashing docklets and make + the events thread safe + + Bookmarks: make sure to update hovers + + Battery: now uses UPower if its available, then checks /sys/ + then defaults back to /proc/ (LP: #617293) + + Gmail: + - fix race condition when manually reloading gmail + (LP: #675001, LP: #675002) + - fix underscores in email topics making mnemonics in menus + (LP: #673181) + - fix crash when adding/removing gmail labels (LP: #670666) + + fix gmail/weather not working on reboot (LP: #661923) + + -- Rico Tzschichholz Sat, 04 Dec 2010 00:22:28 +0100 + +docky (2.0.7-1) experimental; urgency=low + + * New upstream release 2.0.7 "Your friendly docking station", + changes include: + + modify and fix align of 3D separator + + a little nicer 128px icon + + fix crash with invalid SetAlpha call (LP: #647072) + + add some more exec matches for OpenOffice (LP: #504486) + + Properly respect the autostart choice in preferences (LP: #550491) + + NPR: fix set of station icon (LP: #636027) + + Gmail: rename GMail to Gmail (LP: #634627) + + RecentDocuments: fix crash when opening (LP: #645864) + + rhythmbox: add AlbumArt.[jpg|png] to search list + + make banshee helper not query dbus if banshee is not currently + playing (LP: #613197) + + open terminal here was preventing unmounting external devices + (LP: #591918) + + -- Rico Tzschichholz Sat, 02 Oct 2010 13:33:15 +0200 + +docky (2.0.6-2) unstable; urgency=low + + * Upload to unstable. + + -- Mirco Bauer Sun, 05 Sep 2010 14:06:40 +0200 + +docky (2.0.6-1) experimental; urgency=low + + * New upstream release 2.0.6 "Just lovin' it", + changes include: + + fix check for existing instance + + hitting ESC should cancel drags (LP: #460071) + + make sure plugins enabled by default are added to the dock on first run + and enable Trash docklet by default + + update badge drawing so the text is consistently sized + + fix leak of ThemedIcon/FileIcon in IconFromGIcon + + fix non-square items arent properly darken (LP: #584094) + + remove MenuList.Dispose which is not really needed, solves (LP: #609170) + + shrink config dialog (LP: #591448) + + + RecentDocs: fix crash (LP: #580723) + + Mounter: use a better MountItem.UniqueID and don't fill up gconf with + useless keys (temporary fix for LP: #600311) + + Weather: add weather icon for Smoke (LP: #612437) + + CPUMonitor: fix CPU utilization percentage (LP: #604677) + + GMail: + - add debuging messages to gmail and log web response status when we + have a web exception + - fix crash and leak in Gmail + * debian/patches: + + drop 01_use_cli_for_wrapper.patch + * patch build-system and bump dependency for new gio-sharp >= 2.22.2 + + update debian/patches/use-system-gio-sharp.patch + + -- Rico Tzschichholz Wed, 01 Sep 2010 09:37:14 +0200 + +docky (2.0.5-1) unstable; urgency=low + + * New upstream release 2.0.5 "Be proud of your dock", + changes include: + + remove --debug flag from launcher for lower memory usage + + update the about dialog credits to list documenters and make translation + tab easier to read + + change url in about dialog to the launchpad project page + + Window-Matching + - fix for applications commandline + - properly match qt creator (LP: #594814) + - prefer local over global launchers (LP: #588073) (LP: #592841) + - match prefix for gksudo (LP: #516433) + - fix nautilus items showing active indicator when desktop + is focused (LP: #487113) + - fix matching wine apps that use a prefixed launcher (LP: #596092) + + Memory Leaks + - dispose of calendar painter when the clock item is disposed + - fix leak in AutoHideManager + - several fixes using Cairo.Context.Target and Pango.Layout + - fix leak in PagingPainters + - fix leak in recursive file-deletion + - fix leaking SeparatorItems, WnckDockItems + - fix leaks with FileEmblems + - fix Pixbuf related leaks + - fix some leaks regarding FileMonitors + - fix leaks regarding Tiles and AbtractTileObjects + - fix leaking Glib.FileAdapter caused by unreferenced Action in + FileDockItem + + Handle invalid desktopfile entry and UriFormatException in + FileApplicationProvider (LP: #595921) + + fix potential crash for invalid HelperMetadata + + handle drops correctly + + fix handling of Helpers in HelperService + + make the sliders in preferences behave better + + fix drawing of rotated items + + fix HoveredItem click-position + + avoids fatal errors on console when loading embedded icons when no + height or width is specified and when dock items have a null Icon + + fix icon theme change not refreshing the dock icons (LP: #590205) + + fix SVG rendering bug + + fix iconsize temporarily getting large when adding to full dock + (LP: #579576) + + fix the 'crash in PinToDock' (LP: #588073) + + make 3d background height more consistent and a tad larger (LP: #503038) + + fix dragging multiple files to a folder on the dock, which caused + a crash and data corruption (LP: #579049) + + don't request animations if urgent state is removed from a window and + fix glow location (LP: #596422) + + fix window previews being offset (LP: #495065) + + fix broken zoom after shrinking icon size (LP: #598924) + + fix problem with hovers still visible when painters show + + fix displaying default icon in place of missing file emblem (LP: #534651) + + fix crash when gconf key for menus_have_icons is not set (LP: #573751) + + make sure painters fit on screen (LP: #589978) + + fix icon minimize animations not working immediately for some newly + opened windows + + don't dispose our static DockyItem + + fix CurrentDesktopOnly not working when dragging a window across desktops + (LP: #600290) + + GMail: + - fix thread-guards and remove deprecated code + - fix problem with feeds that don't have an author entry (LP: #595530) + + NPR: fix bug where removing your last NPR station unloaded the docklet + and fix station icon + + NetworkManager: fix crash caused when NM goes away + and fix icons and add another fallback icon (LP: #588581) + + Mounter: + - fixed some leaks + - only remove mounted items if they were successfully unmounted + (LP: #597637) + - fix duplicate icons showing in mounter (LP: #525306) + + Weather: fix feels like temp showing incorrect for metric (LP: #597670) + + RecentDocuments: + - fixed some leaks + - fix sensitivity of recent docs clear menu item - even if docky shows + the list as empty does not mean it cant be cleared + * debian/patches/01_use_cli_for_wrapper.patch: + + patch wrapper script to meet the Debian CLI Policy + * debian/control: + + Bump Standards version to 3.9.0 (no changes needed) + + -- Rico Tzschichholz Thu, 01 Jul 2010 21:21:50 +0200 + +docky (2.0.4-1) unstable; urgency=low + + [ Iain Lane ] + * debian/control: Specify that only python version >= 2.5 are supported, + thanks to Stefano Rivera for the report (Closes: #582046) + + [ 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 Mon, 31 May 2010 23:03:30 +1000 + +docky (2.0.3.1-2) unstable; urgency=low + + * debian/patches/mail_label_crash: Add patch cherrypicked from upstream to + fix a crash bug when deleting mail labels. + * debian/patches/window_grouping_reliability: Add patch cherrypicked from + upstream to improve the window grouping reliability. Previously some + applications, particularly OOo, would show two icons when the windows + should have been grouped into one. + * debian/control: Add python dep to docky manually. When we stopped byte + compiling the helpers, this dependency wasn't removed, but we do still + need to have a python interpreter around to use them. + + -- Iain Lane Fri, 14 May 2010 09:32:56 +0100 + +docky (2.0.3.1-1) unstable; urgency=low + + * New upstream release 2.0.3.1 "You should have heard from us by now", + changes include: + + fix gnome-keyring related crash in Lucid caused by GMail docklet + (LP: #555562) + + catch exception for read-failure of cxoffice launcher (LP: #573294) + + check if authentication is used before using network proxy + + make sure to update screen regions when showing menus + + make transparent themed docks still glow in configuration mode + (LP: #572416) + + Memory Leaks + - some unlinked handlers and pixbufs (DockItemMenu, WindowDockItem, ...) + - proper disposal of tile-widgets in preferences dialog + - properly using DesktopAppInfo for launching application + + GMail: fix exception when reloading (LP: #573991) + + CLOCK: popup menu must always show icons (LP: #574003) + + helpers crash when dbus isn't available (LP: #540688) + * debian/rules: Don't byte compile python helpers as this causes them to + appear in the prefs window twice (and the compiled ones don't work) + * debian/control: Add dep on librsvg2-common to fix installability when this + isn't otherwise available. + + -- Iain Lane Tue, 04 May 2010 16:15:39 +0100 + +docky (2.0.2-1) unstable; urgency=low + + [ Stefan Ebner ] + * debian/copyright: Add missing copyright holders + + [ Iain Lane ] + * New upstream bugfix release 2.0.2 + * debian/source/format: Specify 1.0 explicitly + + -- Iain Lane Wed, 14 Apr 2010 19:01:31 +0100 + +docky (2.0.1-1) unstable; urgency=low + + * New upstream release + + -- Stefan Ebner Fri, 26 Mar 2010 14:33:28 +0100 + +docky (2.0.0-1) UNRELEASED; urgency=low + + [ Christopher James Halse Rogers ] + * Initial release (Closes: #570180) + + [ Iain Lane ] + * debian/docky.install: + + Install desktop file, fixes crash when opening settings dialog (LP: + #529320) + + Install translations + + -- Christopher James Halse Rogers Wed, 17 Feb 2010 15:10:07 +1100 --- docky-2.0.11.orig/debian/README.source +++ docky-2.0.11/debian/README.source @@ -0,0 +1,58 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + break + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- docky-2.0.11.orig/debian/compat +++ docky-2.0.11/debian/compat @@ -0,0 +1 @@ +7 --- docky-2.0.11.orig/debian/source/format +++ docky-2.0.11/debian/source/format @@ -0,0 +1 @@ +1.0 --- docky-2.0.11.orig/debian/patches/use-system-gio-sharp.patch +++ docky-2.0.11/debian/patches/use-system-gio-sharp.patch @@ -0,0 +1,55 @@ +Index: docky/configure.ac +=================================================================== +--- docky.orig/configure.ac ++++ docky/configure.ac +@@ -138,7 +138,18 @@ + DOCKY_WINDOWING_LIBS="-r:$(pwd)/build/Docky.Windowing.dll" + AC_SUBST([DOCKY_WINDOWING_LIBS]) + +-GIO_SHARP_LIBS="-r:$(pwd)/build/gio-sharp.dll" ++dnl gio-sharp is an unstable api library ++GIO_SHARP_REQUIRED_VERSION=2.22.2 ++PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0 >= $GIO_SHARP_REQUIRED_VERSION]) ++files="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0`" ++for file in $files; do ++ [ mkdir -p $top_srcdir/build ] && [ cp -vu $file $top_srcdir/build/ ] ++ GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file)" ++ GIO_SHARP_LIBS="$GIO_SHARP_LIBS -r:$top_srcdir/build/$(basename $file)" ++ [[ -r "$file.config" ]] && [ mkdir -p $top_srcdir/build ] && [ cp -vu $file.config $top_srcdir/build/ ] ++ [[ -r "$file.config" ]] && GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file).config" ++done ++AC_SUBST([GIO_SHARP_ASSEMBLIES]) + AC_SUBST([GIO_SHARP_LIBS]) + + PKG_CHECK_MODULES([NUNIT], [nunit], have_nunit=yes, have_nunit=no) +@@ -175,9 +186,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 ++++ docky/Makefile.am +@@ -5,11 +5,15 @@ + + ACLOCAL_AMFLAGS = -I m4 -I m4/shamrock + ++# Install copied assemblies to our libdir ++copiedlibsdir = $(pkglibdir) ++copiedlibs_DATA = \ ++ $(GIO_SHARP_ASSEMBLIES) ++ + SUBDIRS = \ + . \ + data \ + scripts \ +- lib \ + po \ + Docky.CairoHelper \ + Docky.Services \ --- docky-2.0.11.orig/debian/patches/series +++ docky-2.0.11/debian/patches/series @@ -0,0 +1 @@ +use-system-gio-sharp.patch