Merge authors: Matthieu Baerts (matttbe) ------------------------------------------------------------ revno: 12 [merge] tags: 2.1.3-10-lucid-0ubuntu1 fixes bug(s): https://launchpad.net/bugs/568083 https://launchpad.net/bugs/521167 author: Matthieu Baerts (matttbe) <[email protected]>, Matthieu Baerts (matttbe), Iain Lane committer: Bazaar Package Importer <[email protected]> branch nick: lucid timestamp: Tue 2010-04-20 04:44:22 +0200 message: [ 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 removed: data/default-theme/bg.png data/default-theme/cairo-dock-cancel.svg data/default-theme/cairo-dock-ok.svg data/default-theme/icons/ data/default-theme/icons/Makefile.am data/default-theme/icons/Makefile.in data/default-theme/icons/firefox.svg data/default-theme/icons/logout.png data/default-theme/launchers/01thunderbird.desktop data/default-theme/plug-ins/clock/ data/default-theme/plug-ins/clock/Makefile.am data/default-theme/plug-ins/clock/Makefile.in data/default-theme/plug-ins/clock/clock.conf data/default-theme/plug-ins/dustbin/ data/default-theme/plug-ins/dustbin/Makefile.am data/default-theme/plug-ins/dustbin/Makefile.in data/default-theme/plug-ins/dustbin/dustbin.conf data/default-theme/separator.png added: data/default-theme/launchers/01container.desktop data/default-theme/launchers/01empathy.desktop data/default-theme/launchers/01f-spot.desktop data/default-theme/launchers/01gcalctool.desktop data/default-theme/launchers/01inkscape.desktop data/default-theme/plug-ins/Clipper/ data/default-theme/plug-ins/Clipper/Clipper.conf data/default-theme/plug-ins/Clipper/Makefile.am data/default-theme/plug-ins/Clipper/Makefile.in data/default-theme/plug-ins/Dbus/ data/default-theme/plug-ins/Dbus/Dbus.conf data/default-theme/plug-ins/Dbus/Makefile.am data/default-theme/plug-ins/Dbus/Makefile.in data/default-theme/plug-ins/dnd2share/ data/default-theme/plug-ins/dnd2share/Makefile.am data/default-theme/plug-ins/dnd2share/Makefile.in data/default-theme/plug-ins/dnd2share/dnd2share.conf data/default-theme/plug-ins/musicPlayer/ data/default-theme/plug-ins/musicPlayer/Makefile.am data/default-theme/plug-ins/musicPlayer/Makefile.in data/default-theme/plug-ins/musicPlayer/musicPlayer.conf data/default-theme/plug-ins/quick-browser/ data/default-theme/plug-ins/quick-browser/Makefile.am data/default-theme/plug-ins/quick-browser/Makefile.in data/default-theme/plug-ins/quick-browser/quick-browser.conf data/default-theme/plug-ins/stack/ data/default-theme/plug-ins/stack/Makefile.am data/default-theme/plug-ins/stack/Makefile.in data/default-theme/plug-ins/stack/stack.conf data/icon-all.svg data/icon-extensions.svg modified: ChangeLog configure configure.ac data/Makefile.am data/Makefile.in data/cairo-dock-cancel.svg* data/cairo-dock-ok.svg* data/cairo-dock-simple.conf data/cairo-dock.conf data/cairo-dock.svg data/default-class-indicator.svg data/default-icon-appli.svg data/default-icon.svg* data/default-theme/Makefile.am data/default-theme/Makefile.in data/default-theme/active.png* data/default-theme/cairo-dock.conf data/default-theme/indicator.png* data/default-theme/launchers/01firefox.desktop data/default-theme/launchers/01gimp.desktop data/default-theme/launchers/01gnome-terminal.desktop data/default-theme/launchers/Makefile.am data/default-theme/launchers/Makefile.in data/default-theme/plug-ins/Animated-icons/Animated-icons.conf data/default-theme/plug-ins/Animated-icons/Makefile.am* data/default-theme/plug-ins/GMenu/GMenu.conf data/default-theme/plug-ins/GMenu/Makefile.am* data/default-theme/plug-ins/Makefile.am* data/default-theme/plug-ins/Makefile.in data/default-theme/plug-ins/dialog-rendering/Makefile.am* data/default-theme/plug-ins/dialog-rendering/dialog-rendering.conf data/default-theme/plug-ins/icon-effect/Makefile.am* data/default-theme/plug-ins/icon-effect/icon-effect.conf data/default-theme/plug-ins/illusion/Makefile.am* data/default-theme/plug-ins/illusion/illusion.conf data/default-theme/plug-ins/logout/Makefile.am* data/default-theme/plug-ins/logout/logout.conf data/default-theme/plug-ins/rendering/Makefile.am* data/default-theme/plug-ins/rendering/rendering.conf data/default-theme/plug-ins/shortcuts/Makefile.am* data/default-theme/plug-ins/shortcuts/shortcuts.conf data/default-theme/plug-ins/showDesktop/Makefile.am* data/default-theme/plug-ins/showDesktop/showDesktop.conf data/default-theme/plug-ins/switcher/Makefile.am* data/default-theme/plug-ins/switcher/switcher.conf data/depth-rotate-desklet.svg data/icon-accessories.png* data/icon-appearance.svg data/icon-background.svg data/icon-behavior.svg data/icon-buttons.png* data/icon-connection.svg data/icon-controler.png* data/icon-desklets.png* data/icon-desktop.svg* data/icon-dialogs.svg data/icon-gradation.png* data/icon-help.png data/icon-hidden-dock.png* data/icon-icons.png data/icon-indicators.png* data/icon-labels.png* data/icon-lock-icons.svg data/icon-mouse.png* data/icon-plug-ins.png data/icon-position.png data/icon-system.png* data/icon-taskbar.png data/icon-views.png* data/icon-visibility.png* data/main-dock.conf data/retach-desklet.svg data/rotate-desklet.svg debian/changelog debian/watch src/cairo-dock-animations.c src/cairo-dock-applet-facility.c src/cairo-dock-application-factory.c src/cairo-dock-callbacks.c src/cairo-dock-desklet.c src/cairo-dock-dock-facility.c src/cairo-dock-draw-opengl.c src/cairo-dock-draw.c src/cairo-dock-file-manager.c src/cairo-dock-flying-container.c src/cairo-dock-gui-main.c src/cairo-dock-gui-manager.c src/cairo-dock-internal-desklets.c src/cairo-dock-themes-manager.c The size of the diff (20786 lines) is larger than your specified limit of 1000 lines
-- lp:ubuntu/maverick/cairo-dock https://code.launchpad.net/~ubuntu-branches/ubuntu/maverick/cairo-dock/maverick Your team Cairo-Dock Team is subscribed to branch lp:ubuntu/maverick/cairo-dock. To unsubscribe from this branch go to https://code.launchpad.net/~ubuntu-branches/ubuntu/maverick/cairo-dock/maverick/+edit-subscription _______________________________________________ Mailing list: https://launchpad.net/~cairo-dock-team Post to : [email protected] Unsubscribe : https://launchpad.net/~cairo-dock-team More help : https://help.launchpad.net/ListHelp
