--- cairo-dock-2.2.0~4.orig/data/help.conf.in +++ cairo-dock-2.2.0~4/data/help.conf.in @@ -311,10 +311,10 @@ config_terminal = #X [So then, how can I remove completely the gnome-panel?] Xremove= -#> Open gconf-editor, edit the key /desktop/gnome/session/required_components_list/panel, and replace its content with "cairo-dock". +#> Open gconf-editor, edit the key /desktop/gnome/session/required_components/panel, and replace its content with "cairo-dock". #Then restart your session : the gnome-panel has not been started, and the dock has been started (if not, you can add it to the startup programs). remove= -#G [sh -c "gconftool-2 --type string --set /desktop/gnome/session/required_components_list/panel '(cairo-dock'";sh -c "ps aux | grep -v grep | grep -c 'gnome-settings-daemon'"]If you are on Gnome, you can click on this button in order to automatically modify this key: +#G [sh -c "gconftool-2 --type string --set /desktop/gnome/session/required_components/panel '(cairo-dock'";sh -c "ps aux | grep -v grep | grep -c 'gnome-settings-daemon'"]If you are on Gnome, you can click on this button in order to automatically modify this key: #{Tip: If this line is grayed, it's because this tip is not for you.) widget_compiz= --- cairo-dock-2.2.0~4.orig/debian/cairo-dock-dev.install +++ cairo-dock-2.2.0~4/debian/cairo-dock-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include +debian/tmp/usr/lib*/pkgconfig --- cairo-dock-2.2.0~4.orig/debian/watch +++ cairo-dock-2.2.0~4/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/cairo-dock-core/+download .*/cairo-dock-([\d\.\-]+)(-.*)?.tar.gz --- cairo-dock-2.2.0~4.orig/debian/cairo-dock-core.install +++ cairo-dock-2.2.0~4/debian/cairo-dock-core.install @@ -0,0 +1,6 @@ +debian/tmp/usr/bin/cairo-dock +debian/tmp/usr/share/locale +debian/tmp/usr/share/applications +debian/apport/cairo-dock.py usr/share/apport/package-hooks/ +debian/tmp/usr/share/man/ +debian/tmp/usr/lib*/*.so* --- cairo-dock-2.2.0~4.orig/debian/cairo-dock-data.lintian-overrides +++ cairo-dock-2.2.0~4/debian/cairo-dock-data.lintian-overrides @@ -0,0 +1,5 @@ +# Cairo-dock plugin config files uses shebang +# upstream is warned +cairo-dock-data: interpreter-not-absolute +cairo-dock-data: script-not-executable +cairo-dock-data: unusual-interpreter --- cairo-dock-2.2.0~4.orig/debian/rules +++ cairo-dock-2.2.0~4/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +DH_ALWAYS_EXCLUDE=CVS:.bzr + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_INSTALL_CHANGELOGS_ALL := ChangeLog + +get-orig-source: + dh_testdir + uscan --force-download --verbose --repack --- cairo-dock-2.2.0~4.orig/debian/control +++ cairo-dock-2.2.0~4/debian/control @@ -0,0 +1,112 @@ +Source: cairo-dock +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Matthieu Baerts (matttbe) , Julien Lavergne , Fabrice Rey +Build-Depends: cdbs, + debhelper (>= 7), + cmake, + libcairo2-dev, + libgtk2.0-dev, + librsvg2-dev, + libdbus-glib-1-dev, + libxml2-dev, + libxtst-dev, + libxrender-dev, + libxcomposite-dev, + libgtkglext1-dev, + libxinerama-dev, + libglib2.0-dev, + libcurl4-gnutls-dev, + gawk +Standards-Version: 3.9.1 +Homepage: http://www.glx-dock.org/ + +Package: cairo-dock +Section: graphics +Architecture: all +Conflicts: cairo-dock (<= 2.0.8.0) +Depends: cairo-dock-core (>= ${source:Version}), + cairo-dock-plug-ins (>= ${source:Version}), + ${misc:Depends} +Description: A light and eye-candy dock to launch your programs (metapackage) + It uses Cairo / OpenGL to render graphics (many in correlation + with Compiz) with full hardware acceleration. It's fully configurable and + fully customisable and can be used as a taskbar too. + You can easily add applets in the dock or as a desklet. + It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to + have acces to more views, dialogs and many plug-ins and applets. + Some screenshots are available : http://pics.glx-dock.org + . + This metapackage provides the components necessary for running Cairo-Dock. It + provides the Cairo-Dock core, a set of standard plugins and the files necessary + to integrate Cairo-Dock with your desktop environment. + +Package: cairo-dock-core +Section: graphics +Architecture: any +Conflicts: cairo-dock (<= 2.0.8.0) +Replaces: cairo-dock (<= 2.0.8.0) +Depends: cairo-dock-data (>= ${source:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Recommends: cairo-dock-plug-ins +Description: A light and eye-candy dock to launch your programs (core package) + It uses Cairo / OpenGL to render graphics (many in correlation + with Compiz) with full hardware acceleration. It's fully configurable and + fully customisable and can be used as a taskbar too. + You can easily add applets in the dock or as a desklet. + It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to + have acces to more views, dialogs and many plug-ins and applets. + Some screenshots are available : http://pics.glx-dock.org + . + This package is the core of Cairo-Dock project. + +Package: cairo-dock-dev +Section: libdevel +Architecture: all +Depends: cairo-dock-core (>= ${source:Version}), + ${misc:Depends}, + cmake, + libcairo2-dev, + libgtk2.0-dev, + librsvg2-dev, + libdbus-glib-1-dev, + libxml2-dev, + libxtst-dev, + libxrender-dev, + libxcomposite-dev, + libgtkglext1-dev, + libxinerama-dev, + libglib2.0-dev, + gawk +Recommends: cairo-dock-plug-ins +Description: A light and eye-candy dock to launch your programs (dev package) + It uses Cairo / OpenGL to render graphics (many in correlation + with Compiz) with full hardware acceleration. It's fully configurable and + fully customisable and can be used as a taskbar too. + You can easily add applets in the dock or as a desklet. + It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to + have acces to more views, dialogs and many plug-ins and applets. + Some screenshots are available : http://pics.glx-dock.org + . + This package provides the include files and static library for cairo-dock + functions. + +Package: cairo-dock-data +Section: graphics +Architecture: all +Conflicts: cairo-dock (<= 2.0.8.0) +Replaces: cairo-dock (<= 2.0.8.0) +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: A light and eye-candy dock to launch your programs (common files) + It uses Cairo / OpenGL to render graphics (many in correlation + with Compiz) with full hardware acceleration. It's fully configurable and + fully customisable and can be used as a taskbar too. + You can easily add applets in the dock or as a desklet. + It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to + have acces to more views, dialogs and many plug-ins and applets. + Some screenshots are available : http://pics.glx-dock.org + . + This package contains default icons and themes for Cairo-Dock. --- cairo-dock-2.2.0~4.orig/debian/changelog +++ cairo-dock-2.2.0~4/debian/changelog @@ -0,0 +1,262 @@ +cairo-dock (2.2.0~4-0ubuntu1) maverick; urgency=low + + * New Upstream Version (LP: #653702) + * Fixed a few bugs: + - Fixed a random crash if CD is launched much time before the WM + - Improved the OpenGL backend. + - Some Images paths were wrong + - Icon label text was truncated (LP: #611738) + - Fixed a bug when the font was too big + - Gauges: Add a line return in order to read all Readme file + - Dialogues don't respect selected font (LP: #518628) + * data/help.conf.in: + - Removed the Gnome-Panel: Used the right gconf key + + -- Matthieu Baerts (matttbe) Wed, 06 Oct 2010 19:23:03 +0200 + +cairo-dock (2.2.0~2-0ubuntu1) maverick; urgency=low + + * New Upstream Version (LP: #638527) + * Fixed a few bugs: + - Third-party applets can be deleted if the user switch to offline + - Fixed a crash when changing the theme + - Fixed transparency for data-renderer texts + - Installed in lib/ directory by default for 64bits architecture + - Fixed the name of applets in the launchers config panel + - Fixed address of third-party applets in the menu + - Code cleaning. + * Updated Translations + * debian/patches + - Updated 01-desktop-file-category.patch (desktop files has changed) + * data/messages: Removed an useless file + * Removed a few useless excecution rights. + + -- Matthieu Baerts (matttbe) Sat, 18 Sep 2010 14:17:48 +0200 + +cairo-dock (2.2.0~0rc1-0ubuntu1) maverick; urgency=low + + * New Upstream Version (LP: #632055) + * Fixed a few bugs on LP: + - LP: #618336 all button tips visible if icons 'maximum zoom' set to 1.0 + - LP: #614686 create new sud-dock icon that looking like flat + - LP: #612617 Add custom launchers or sub-docks, can't modify name. + - LP: #612355 Add option in config file to set GL/Cairo mode + - LP: #611733 icon labels go off-screen + * Fixed a crash when changing theme or gauges + * Updated translations + + -- Matthieu Baerts (matttbe) Tue, 07 Sep 2010 20:31:25 +0200 + +cairo-dock (2.2.0~0beta4-0ubuntu1) maverick; urgency=low + + * New Upstream Version (LP: #614624) + * Fixed a few bugs on LP: + - LP: #518453: Dock appears under all windows + (Compiz - fullscreen window) + - LP: #521369: Separator are not removed when closing + grouped windows + - LP: #521762: Some sentences are not correct + - LP: #526466: Icons of apps with same class shouldn't + be stacked by default + - LP: #535083: Dialogues looks ugly when a lot of them + appears at the same time + - More details on the 'ChangeLog' file + * debian/rules: + - Autotools has been replaced by CMake + - Man pages are now included in the source code + * debian/copyright: + - Updated with the new pathes and new files + * debian/control: + - Autotools has been replaced by CMake + - Added libcurl4-gnutls-dev as Build-deps + - Bump Standard-Version to 3.9.1 + * debian/cairo-dock-core.install: + - Man pages are now included in the source code + - All sonames are now installed into lib32 or lib64 + * debian/cairo-dock-dev.install: + - pkgconfig is now installed into lib32 or lib64 + + -- Matthieu Baerts (matttbe) Mon, 09 Aug 2010 23:26:12 +0200 + +cairo-dock (2.1.3-10-lucid-0ubuntu1) lucid; urgency=low + + [ Matthieu Baerts (matttbe) ] + * New Upstream Version (LP: #568083). + * Fixed some bugs: + - Fixed a important crash when read several xml data + - LP: #521167 Cairo-dock crashes by theme changing + - Fixed a bug with desklets buttons + - Used icons of the system + - Fixed a bug when removing a container with OpenGL backend + - Fixed some typo on some define + - Fixed a little bug in the drag motion + - Reduced the disk access for SSD disk + * Used the official Ubuntu Lucid theme. + + [ Iain Lane ] + * debian/watch: Update to match current upstream version + + -- Matthieu Baerts (matttbe) Tue, 20 Apr 2010 02:44:22 +0200 + +cairo-dock (2.1.3-6-0ubuntu1) lucid; urgency=low + + [ Matthieu Baerts (matttbe) ] + * New Upstream Version. (LP: #521534) + * Updated debian/watch and debian/copyright with LP account. + * Removed debian/patches/02-merge-changelog.patch' + - data/ChangeLog.txt has to respect a syntax and is used by CD. + * debian/cairo-dock.1: + - Updated with the latest release. + - The domain name 'cairo-dock.org' has changed to 'glx-dock.org' + * debian/control: + - Changed the homepage and other links (glx-dock.org) + - Updated cairo-dock-dev architecture to 'all' (it no longer contains compiled files) + * debian/cairo-dock-dev.install + - libcairo-dock.a and libcairo-dock.so no longer exist + * debian/rules + - removed uneeded changelog file + * Updated debian/patches/01-desktop-file-category.patch + + [ Didier Roche ] + * Fix debian/watch + * Fix some issue in versionning + * debian/control: clean the packaging and add right -plugins depends + + -- Matthieu Baerts (matttbe) Mon, 01 Mar 2010 21:24:00 +0100 + +cairo-dock (2.0.9-0ubuntu1) karmic; urgency=low + + [ Matthieu Baerts (matttbe) ] + * New Upstream Version. (LP: #435587) + * Added apport hook in debian/apport + - Add debian/apport + - debian/cairo-dock-core.install: Added debian/apport/cairo-dock.py + * Use .desktop provided by upstream + - Removed debian/*.desktop + - debian/cairo-dock-core.install: install upstream desktop files. + + [ Julien Lavergne ] + * Adjust debian/changelog with Daniel Holbach suggestions. + * debian/patches/01_rename_cairo-dock-package-theme.patch: drop, + merged upstream. + * debian/patches/01-desktop-file-category.patch: + - Remove Encoding field and set category to Utility. + * debian/patches/02-merge-changelog.patch: + - Merge ChangeLog and ChangeLog-2.0.9. + * debian/apport: Remove commands with grep, python doesn't like it. + + -- Julien Lavergne Sun, 04 Oct 2009 16:33:52 +0200 + +cairo-dock (2.0.8.1-0ubuntu1) karmic; urgency=low + + [ Matthieu Baerts (matttbe) ] + * New Upstream Version. + * debian/control: + - Remove cairo-dock as depends for cairo-dock-data + * Update the man page + * Rename cairo-dock -> cairo-dock-core + * Add a new meta-package (cairo-dock) for cairo-dock-core and + cairo-dock-plug-ins + * Add licences + + [ Didier Roche ] + * Repackage to have a separated diff.gz (as debian/ directory is not in + upstream bz2) + * debian/rules: + - install manpage in cairo-dock-core + - remove uneeded dh_desktop call + * debian/control: + - add ${misc:Depends} to cairo-dock to fix lintian warning + - fix typos and wrong description usage + - bump Standard-Version to 3.8.3 + * debian/cairo-dock.install: removed + * debian/cairo-dock-core.install: add destkop file there + * debian/debian/cairo-dock-data.install: add some missing files and + renamed cairo-dock-package-theme.sh to cairo-dock-package-theme + * Add debian/cairo-dock-data.lintian-overrides as plugin config file + uses a shebang (upstream warned) + * add debian/patches/01_rename_cairo-dock-package-theme.patch (upstream + will apply it next time) + * debian/cairo-dock-dev.install: remove .la file + + -- Didier Roche Wed, 26 Aug 2009 17:13:42 +0200 + +cairo-dock (2.0.5-0ubuntu1) karmic; urgency=low + + * New Upstream Version. (LP: #390053) + * debian/rules: + - Drop autoreconf call, it's fixed upstream. + - Call dh_desktop for all desktop files. + * debian/control: + - Add libgtkglext1-dev as depends for cairo-dock-dev. + + -- Julien Lavergne Sat, 20 Jun 2009 23:46:54 +0200 + +cairo-dock (2.0.3-0ubuntu1) karmic; urgency=low + + [ Andrew Starr-Bochicchio ] + * New upstream release. (LP: #375125) + * debian/control: Bump Standards-Version + * debian/rules: Call autoreconf + - config.status should create po/stamp-it but does not, + causing an infinite loop in the build, probably due to + upstream using an older version of intltool. Hopefully + this can be dropped with next release. + + [ Julien Lavergne ] + * debian/control : + - Replace libglitz build-depends by libxrender-dev, libxcomposite-dev, + libgtkglext1-dev and libxinerama-dev. + - Add missing ${misc:Depends} for cairo-dock-dev. + * debian/cairo-dock-cairo.desktop + - New desktop file to launch the non-OpenGL version. + * debian/cairo-dock-data.install : + - Add new directorie usr/share/pixmaps + - update to install both desktop files. + + -- Andrew Starr-Bochicchio Wed, 03 Jun 2009 20:39:11 -0400 + +cairo-dock (1.6.3.1-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #297809). + * debian/cairo-dock-data.install: + - Update to new upstream installation. + * debian/copyright + - Update copyright of new files. + + -- Julien Lavergne Thu, 13 Nov 2008 22:04:19 +0100 + +cairo-dock (1.6.2.3-0ubuntu2) jaunty; urgency=low + + * debian/control: + - Recommends xdotool (LP: #292864). + * debian/cairo-dock.desktop: + - Add a desktop file. + * debian/cairo-dock.install: + - Install the .desktop file. (LP: #296095). + * debian/rules: + - Register the desktop file. + + -- Julien Lavergne Tue, 11 Nov 2008 00:35:44 +0100 + +cairo-dock (1.6.2.3-0ubuntu1) intrepid; urgency=low + + * New upstream release. + * debian/control + - Update to 3.8.0 (no change needed). + - Add libxtst-dev as Build-Depends. + * debian/cairo-dock-data.install + - Add usr/share/cairo-dock/emblems directory. + * debian/watch + - Update location. + * debian/rules + - Add a get-orig-source rule. + + -- Julien Lavergne Sun, 14 Sep 2008 16:26:12 +0200 + +cairo-dock (1.5.5.3-repack0-0ubuntu1) intrepid; urgency=low + + * Initial release (LP: #134091) + * Repack original tarball to pack only cairo-dock and generate configure. + + -- Julien Lavergne Sun, 04 May 2008 17:16:20 +0200 --- cairo-dock-2.2.0~4.orig/debian/cairo-dock-data.install +++ cairo-dock-2.2.0~4/debian/cairo-dock-data.install @@ -0,0 +1,3 @@ +debian/tmp/usr/bin/cairo-dock-package-theme +debian/tmp/usr/share/cairo-dock/* +debian/tmp/usr/share/pixmaps/ --- cairo-dock-2.2.0~4.orig/debian/copyright +++ cairo-dock-2.2.0~4/debian/copyright @@ -0,0 +1,63 @@ +X-Source-Downloaded-From: https://launchpad.net/cairo-dock +X-Upstream-Author: Fabrice Rey . + +Files: src/* +Copyright: Fabrice Rey +Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence) + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Files: src/gldit/cairo-dock-dbus.* +Copyright: Adrien Pilleboue +Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence) + +Files: src/gldit/cairo-dock-desklet.*, + src/gldit/cairo-dock-keybinder.*, + src/gldit/cairo-dock-log.* +Copyright: Copyright (C) 2008 Cedric GESTES +Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence) + +Files: src/gldit/egg* +Copyright: Copyright (C) 2002 Red Hat, Inc.; Copyright 1998, 2001 Tim Janik +Licence: GPL 2+ (See /usr/share/common-licenses/GPL-2 for complete licence) + * 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 2 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Files: src/gldit/texture-gradation.h +Copyright: Copyright (C) 2007 Gimp dev. +Licence: GPL 2+ (See /usr/share/common-licenses/GPL-2 for complete licence) + +Files: data/*.svg, data/*.png +Copyright: Humanity devs (some of them modified by Matthieu Baerts) +Licence: GPL 3+ + +Files: data/default-theme/ data/man/ +Copyright: Matthieu Baerts +Licence: LGPL + +Files: debian/* +Copyright: Copyright (C) Julien Lavergne +Licence: GPL 2+ (See /usr/share/common-licenses/GPL-2 for complete licence) +Updated by Matthieu Baerts for new releases. --- cairo-dock-2.2.0~4.orig/debian/compat +++ cairo-dock-2.2.0~4/debian/compat @@ -0,0 +1 @@ +7 --- cairo-dock-2.2.0~4.orig/debian/patches/01-desktop-file-category.patch +++ cairo-dock-2.2.0~4/debian/patches/01-desktop-file-category.patch @@ -0,0 +1,32 @@ +diff -Nur -x '*.orig' -x '*~' cairo-dock/data/cairo-dock-cairo.desktop cairo-dock.new/data/cairo-dock-cairo.desktop +--- cairo-dock/data/cairo-dock-cairo.desktop 2010-09-18 13:53:13.000000000 +0200 ++++ cairo-dock.new/data/cairo-dock-cairo.desktop 2010-09-18 14:08:20.861327185 +0200 +@@ -1,6 +1,5 @@ + + [Desktop Entry] +-Encoding=UTF-8 + Type=Application + Exec=cairo-dock -c + Icon=cairo-dock.svg +@@ -15,4 +14,4 @@ + GenericName=Multi-purpose Dock and Desklets + GenericName[fr]=Dock et Desklets multi-usage + +-Categories=System; ++Categories=Utility; +diff -Nur -x '*.orig' -x '*~' cairo-dock/data/cairo-dock.desktop cairo-dock.new/data/cairo-dock.desktop +--- cairo-dock/data/cairo-dock.desktop 2010-09-18 13:53:14.000000000 +0200 ++++ cairo-dock.new/data/cairo-dock.desktop 2010-09-18 14:08:31.961493531 +0200 +@@ -1,6 +1,5 @@ + + [Desktop Entry] +-Encoding=UTF-8 + Type=Application + Exec=cairo-dock -o + Icon=cairo-dock.svg +@@ -58,4 +57,4 @@ + GenericName=Multi-purpose Dock and Desklets + GenericName[fr]=Dock et Desklets multi-usage + +-Categories=System; ++Categories=Utility; --- cairo-dock-2.2.0~4.orig/debian/apport/cairo-dock.py +++ cairo-dock-2.2.0~4/debian/apport/cairo-dock.py @@ -0,0 +1,42 @@ +'''apport package hook for cairo-dock + +(c) 2009 Author: Matthieu Baerts +''' + +from apport.hookutils import * +from os import path + +def add_info(report): + # Build System Environment + report['system'] = "distro = Ubuntu, architecture = %s, kernel = %s" % (command_output(['uname','-m']), command_output(['uname','-r'])) + + attach_related_packages(report, [ + "xserver-xorg", + "libgl1-mesa-glx", + "libdrm2", + "xserver-xorg-video-intel", + "xserver-xorg-video-ati" + ]) + + attach_file_if_exists(report, path.expanduser('~/.config/cairo-dock/current_theme/cairo-dock.conf'), 'CairoDockConf') + # attach_hardware(report) + + # One-line description of display hardware + report['PciDisplay'] = pci_devices(PCI_DISPLAY).split('\n')[0] + + # GLX + report['glxinfo'] = command_output(['glxinfo']) + + # Compositing + report['CompositingMetacity'] = command_output(['gconftool-2', '--get', '/apps/metacity/general/compositing_manager']) + + # WM + report['WM'] = command_output(['gconftool-2', '--get', '/desktop/gnome/applications/window_manager/current']) + + +## DEBUGING ## +if __name__ == '__main__': + report = {} + add_info(report) + for key in report: + print '[%s]\n%s' % (key, report[key])