Merge authors: Matthieu Baerts (matttbe) ------------------------------------------------------------ revno: 15 [merge] tags: 2.2.0~2-0ubuntu1 fixes bug(s): https://launchpad.net/bugs/638527 author: Matthieu Baerts (matttbe) <[email protected]> committer: Bazaar Package Importer <[email protected]> branch nick: maverick timestamp: Sat 2010-09-18 16:17:48 +0200 message: * 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. removed: data/messages modified: CMakeLists.txt INSTALL* LGPL-2* cairo-dock.pc.in* config.h.cmake.in copyright data/CMakeLists.txt data/ChangeLog.txt* data/cairo-dock-animated.xpm* data/cairo-dock-cairo.desktop data/cairo-dock.desktop data/cairo-dock.svg* data/default-indicator.png* data/default-theme/indicator.png* data/default-theme/launchers/01container.desktop* data/default-theme/launchers/01empathy.desktop* data/default-theme/launchers/01f-spot.desktop* data/default-theme/launchers/01firefox.desktop* data/default-theme/launchers/01gcalctool.desktop* data/default-theme/launchers/01gimp.desktop* data/default-theme/launchers/01gnome-terminal.desktop* data/default-theme/launchers/01inkscape.desktop* data/emblems/broken.svg* data/emblems/charge.svg* data/emblems/drop.svg* data/emblems/error.svg* data/emblems/locked.svg* data/emblems/pause.svg* data/emblems/play.svg* data/emblems/stop.svg* data/emblems/warning.svg* data/gauges/battery/background.svg* data/gauges/battery/battery0.svg* data/gauges/battery/battery1.svg* data/gauges/battery/battery2.svg* data/gauges/battery/battery3.svg* data/gauges/battery/battery4.svg* data/gauges/battery/battery5.svg* data/gauges/battery/battery6.svg* data/gauges/battery/battery7.svg* data/gauges/battery/foreground.svg* data/gauges/battery/readme* data/gauges/battery/theme.xml* data/gauges/turbo-night-fuel/background.svg* data/gauges/turbo-night-fuel/foreground.svg* data/gauges/turbo-night-fuel/needle.svg* data/gauges/turbo-night-fuel/readme* data/gauges/turbo-night-fuel/theme.xml* data/hand.svg* data/help_scripts.sh* data/icon-bubble.png* data/icon-frame.png* data/icon-movment.png* data/icon-subdock.png* data/icon-wave.png* data/main-dock.conf.in* data/man/CMakeLists.txt* data/man/cairo-dock_en.1.gz* data/preview-default.png* data/readme-default-view* data/themes.conf.in debian/changelog debian/patches/01-desktop-file-category.patch po/ar.po po/be.po po/ca.po po/cairo-dock.pot po/cs.po po/de.po po/el.po po/en.po po/es.po po/et.po po/eu.po po/fi.po po/fo.po po/fr.po po/hu.po po/it.po po/ja.po po/nb.po po/nl.po po/oc.po po/pt.po po/pt_BR.po po/ru.po po/sk.po po/sr.po po/sv.po po/tr.po po/uk.po po/zh_CN.po po/zh_TW.po src/cairo-dock-gui-launcher.c src/cairo-dock-gui-main.c src/cairo-dock-gui-simple.c src/cairo-dock-menu.c src/cairo-dock.c src/gldit/cairo-dock-animations.c src/gldit/cairo-dock-applet-facility.h src/gldit/cairo-dock-applications-manager.c src/gldit/cairo-dock-config.c src/gldit/cairo-dock-container.c src/gldit/cairo-dock-container.h src/gldit/cairo-dock-data-renderer.c src/gldit/cairo-dock-dialog-manager.c src/gldit/cairo-dock-dock-facility.c src/gldit/cairo-dock-dock-factory.c src/gldit/cairo-dock-dock-manager.c src/gldit/cairo-dock-dock-manager.h src/gldit/cairo-dock-file-manager.c src/gldit/cairo-dock-file-manager.h src/gldit/cairo-dock-gui-factory.c src/gldit/cairo-dock-icons.c src/gldit/cairo-dock-icons.h src/gldit/cairo-dock-internal-accessibility.c src/gldit/cairo-dock-opengl-font.c src/gldit/cairo-dock-packages.c src/gldit/cairo-dock-struct.h src/gldit/cairo-dock-themes-manager.c src/gldit/gldi.pc.in* src/gldit/texture-blur.h* src/icon-factory/cairo-dock-application-factory.c src/icon-factory/cairo-dock-launcher-factory.c src/implementations/cairo-dock-gauge.c src/implementations/cairo-dock-icon-container.c The size of the diff (101493 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
