Merge authors: Matthieu Baerts (matttbe) ------------------------------------------------------------ revno: 11 [merge] tags: 2.2.0~0rc1-0ubuntu1 fixes bug(s): https://launchpad.net/bugs/632054 https://launchpad.net/bugs/616176 https://launchpad.net/bugs/604034 https://launchpad.net/bugs/582452 author: Matthieu Baerts (matttbe) <[email protected]> committer: Bazaar Package Importer <[email protected]> branch nick: maverick timestamp: Tue 2010-09-07 04:38:17 +0200 message: * New Upstream Version (LP: #632054) * Fixed a few bugs on LP: - LP: #616176 Dust Bin Hang and Incorrect Configuration - LP: #604034 Change terminal tab's name lost the color - LP: #582452 GMenu does not contain any applications * Fixed a few bugs on glx-dock forum: - Fixed support of GMusicBrowser. - AlsaMixer has no emblem. - Status-Notifier doesn't be drawed into the dock. * Updated translations * debian/control: - Added cairo-dock-core as build-depends in order to prevent some builds errors. removed: Animated-icons/data/messages Cairo-Penguin/data/messages Clipper/data/messages Dbus/data/messages Doncky/data/messages Folders/data/messages GMenu/data/messages MeMenu/data/messages Messaging-Menu/data/messages Network-Monitor/data/messages RSSreader/data/messages Scooby-Do/data/messages Status-Notifier/data/messages System-Monitor/data/messages Toons/data/messages Xgamma/data/messages alsaMixer/data/messages clock/data/messages compiz-icon/data/messages desklet-rendering/data/messages dialog-rendering/data/messages dnd2share/data/messages dock-rendering/data/messages drop-indicator/data/messages dustbin/data/messages icon-effect/data/messages illusion/data/messages keyboard-indicator/data/messages logout/data/messages mail/data/messages motion-blur/data/messages musicPlayer/data/messages netspeed/data/messages powermanager/data/messages quick-browser/data/messages shortcuts/data/messages show-mouse/data/messages showDesktop/data/messages slider/data/messages stack/data/messages stacks/ stacks/CMakeLists.txt stacks/data/ stacks/data/CMakeLists.txt stacks/data/icon.png stacks/data/messages stacks/data/preview.jpg stacks/data/stacks.conf.in stacks/src/ stacks/src/CMakeLists.txt stacks/src/applet-config.c stacks/src/applet-config.h stacks/src/applet-init.c stacks/src/applet-init.h stacks/src/applet-load-icons.c stacks/src/applet-load-icons.h stacks/src/applet-notifications.c stacks/src/applet-notifications.h stacks/src/applet-stacks.c stacks/src/applet-stacks.h stacks/src/applet-struct.h switcher/data/messages systray/data/messages template/data/messages terminal/data/messages tomboy/data/messages weather/data/messages weblets/data/messages wifi/data/messages added: Status-Notifier/src/applet-draw.c Status-Notifier/src/applet-draw.h Status-Notifier/src/applet-item.c Status-Notifier/src/applet-item.h alsaMixer/data/emblem-mute.svg musicPlayer/src/applet-gmusicbrowser.c musicPlayer/src/applet-gmusicbrowser.h po/et.po po/sr.po modified: CMakeLists.txt Cairo-Penguin/data/Cairo-Penguin.conf.in Cairo-Penguin/src/applet-notifications.c Clipper/data/Clipper.conf.in Clipper/src/applet-init.c Clipper/src/applet-notifications.c Dbus/src/applet-dbus.c Folders/data/Folders.conf.in Folders/src/applet-config.c Folders/src/applet-notifications.c GMenu/src/applet-menu.c GMenu/src/applet-notifications.c Indicator-applet/indicator-applet.c Network-Monitor/data/Network-Monitor.conf.in RSSreader/src/applet-notifications.c Status-Notifier/CMakeLists.txt Status-Notifier/data/Status-Notifier.conf.in Status-Notifier/src/CMakeLists.txt Status-Notifier/src/applet-config.c Status-Notifier/src/applet-host.c Status-Notifier/src/applet-host.h Status-Notifier/src/applet-init.c Status-Notifier/src/applet-notifications.c Status-Notifier/src/applet-struct.h System-Monitor/data/System-Monitor.conf.in System-Monitor/src/applet-init.c System-Monitor/src/applet-monitor.c System-Monitor/src/applet-monitor.h System-Monitor/src/applet-notifications.c Toons/data/Toons.conf.in Toons/src/applet-notifications.c Xgamma/src/applet-notifications.c alsaMixer/data/CMakeLists.txt alsaMixer/src/applet-notifications.c clock/data/clock.conf.in clock/src/applet-config.c clock/src/applet-draw.c clock/src/applet-init.c clock/src/applet-notifications.c clock/src/applet-struct.h compiz-icon/data/compiz-icon.conf.in compiz-icon/src/applet-notifications.c copyright debian/changelog debian/control debian/copyright desklet-rendering/src/rendering-desklet-slide.c desklet-rendering/src/rendering-desklet-viewport.c desklet-rendering/src/rendering-desklet-viewport.h desklet-rendering/src/rendering-init.c dialog-rendering/src/applet-decorator-tooltip.c dnd2share/src/applet-notifications.c dock-rendering/src/rendering-3D-plane.c dock-rendering/src/rendering-caroussel.c dock-rendering/src/rendering-commons.c dock-rendering/src/rendering-curve.c dock-rendering/src/rendering-diapo-simple.c dock-rendering/src/rendering-init.c dock-rendering/src/rendering-panel.c dock-rendering/src/rendering-parabole.c dock-rendering/src/rendering-rainbow.c dustbin/src/applet-config.c dustbin/src/applet-init.c dustbin/src/applet-notifications.c dustbin/src/applet-struct.h dustbin/src/applet-trashes-manager.c gvfs-integration/cairo-dock-gio-vfs.c keyboard-indicator/src/applet-notifications.c logout/src/applet-notifications.c mail/data/mail.conf.in mail/src/cd-mail-applet-accounts.c mail/src/cd-mail-applet-notifications.c musicPlayer/data/musicPlayer.conf.in musicPlayer/src/CMakeLists.txt musicPlayer/src/applet-config.c musicPlayer/src/applet-cover.c musicPlayer/src/applet-draw.c musicPlayer/src/applet-init.c musicPlayer/src/applet-mpris.c musicPlayer/src/applet-notifications.c musicPlayer/src/applet-struct.h netspeed/data/netspeed.conf.in netspeed/src/applet-init.c netspeed/src/applet-netspeed.c netspeed/src/applet-netspeed.h netspeed/src/applet-notifications.c po/ar.po po/cairo-dock.pot po/cs.po po/de.po po/en.po po/es.po po/fr.po po/hu.po po/it.po po/ja.po po/nl.po po/pt.po po/pt_BR.po po/ru.po po/sk.po po/sv.po po/tr.po po/uk.po po/zh_CN.po po/zh_TW.po powermanager/data/powermanager.conf.in powermanager/src/powermanager-dbus.c powermanager/src/powermanager-draw.c powermanager/src/powermanager-draw.h powermanager/src/powermanager-init.c powermanager/src/powermanager-menu-functions.c quick-browser/src/applet-menu.c quick-browser/src/applet-notifications.c shortcuts/data/shortcuts.conf.in shortcuts/src/applet-notifications.c show-mouse/data/show_mouse.conf.in showDesktop/src/applet-notifications.c slider/src/applet-notifications.c stack/data/stack.conf.in stack/src/applet-config.c stack/src/applet-notifications.c switcher/src/applet-desktops.c switcher/src/applet-draw.c switcher/src/applet-notifications.c template/data/template.conf.in template/src/applet-init.c terminal/src/terminal-menu-functions.c terminal/src/terminal-widget.c tomboy/data/tomboy.conf.in tomboy/src/tomboy-notifications.c weather/data/weather.conf.in weather/src/applet-notifications.c weblets/src/applet-notifications.c wifi/data/wifi.conf.in wifi/src/applet-notifications.c The size of the diff (94111 lines) is larger than your specified limit of 1000 lines
-- lp:ubuntu/maverick/cairo-dock-plug-ins https://code.launchpad.net/~ubuntu-branches/ubuntu/maverick/cairo-dock-plug-ins/maverick Your team Cairo-Dock Team is subscribed to branch lp:ubuntu/maverick/cairo-dock-plug-ins. To unsubscribe from this branch go to https://code.launchpad.net/~ubuntu-branches/ubuntu/maverick/cairo-dock-plug-ins/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
