lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock/2.4.0-0beta2
- Get this branch:
- bzr branch lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock/2.4.0-0beta2
Branch merges
- Kees Cook: Approve
-
Diff: 363920 lines (+185597/-100973)295 files modified.pc/01-default_theme_with_default_apps/data/default-theme/launchers/01f-spot.desktop (+0/-53)
.pc/01-default_theme_with_default_apps/data/default-theme/launchers/01inkscape.desktop (+0/-92)
.pc/01-default_theme_with_default_apps/data/default-theme/launchers/01thunderbird.desktop (+0/-58)
.pc/01-default_theme_with_default_apps/data/default-theme/launchers/CMakeLists.txt (+0/-17)
.pc/01-default_theme_with_default_apps/data/default-theme/plug-ins/GMenu/GMenu.conf (+0/-133)
.pc/01-default_theme_with_default_apps/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf (+0/-172)
.pc/01-musicPlayer_with_banshee/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf (+174/-0)
.pc/applied-patches (+1/-1)
CMakeLists.txt (+8/-4)
cairo-dock.pc.in (+1/-1)
cairo-dock_theme-creator.sh (+0/-626)
compile-all.sh (+0/-354)
data/CMakeLists.txt (+14/-71)
data/ChangeLog.txt (+2/-0)
data/Help.conf.in (+549/-0)
data/apply-default-values-to-conf.sh (+0/-73)
data/cairo-dock-animated.xpm (+0/-97)
data/cairo-dock-cairo.desktop (+1/-1)
data/cairo-dock-cancel.svg (+0/-149)
data/cairo-dock-ok.svg (+0/-91)
data/cairo-dock-simple.conf.in (+13/-13)
data/cairo-dock.conf.in (+19/-16)
data/cairo-dock.desktop (+2/-2)
data/container.desktop (+0/-41)
data/container.desktop.in (+41/-0)
data/default-class-indicator.svg (+0/-131)
data/default-icon-appli.svg (+0/-207)
data/default-icon.svg (+0/-125)
data/default-theme/CMakeLists.txt (+1/-3)
data/default-theme/bg.svg (+0/-83)
data/default-theme/cairo-dock.conf (+57/-55)
data/default-theme/images/CMakeLists.txt (+8/-0)
data/default-theme/images/bg.svg (+83/-0)
data/default-theme/launchers/01container.desktop (+0/-34)
data/default-theme/launchers/01empathy.desktop (+0/-52)
data/default-theme/launchers/01eog.desktop (+0/-54)
data/default-theme/launchers/01evolution.desktop (+0/-47)
data/default-theme/launchers/01firefox.desktop (+26/-85)
data/default-theme/launchers/01gcalctool.desktop (+25/-27)
data/default-theme/launchers/01gimp.desktop (+25/-128)
data/default-theme/launchers/01gnome-terminal.desktop (+25/-167)
data/default-theme/launchers/01ooo-writer.desktop (+47/-0)
data/default-theme/launchers/01pidgin.desktop (+49/-0)
data/default-theme/launchers/01separator.desktop (+14/-37)
data/default-theme/launchers/01shotwell.desktop (+0/-52)
data/default-theme/launchers/01thunderbird.desktop (+49/-0)
data/default-theme/launchers/01ubuntu-software-center.desktop (+49/-0)
data/default-theme/launchers/02separator.desktop (+14/-37)
data/default-theme/launchers/03separator.desktop (+15/-37)
data/default-theme/launchers/CMakeLists.txt (+5/-6)
data/default-theme/plug-ins/Animated-icons/Animated-icons.conf (+5/-5)
data/default-theme/plug-ins/Clipper/Clipper.conf (+6/-6)
data/default-theme/plug-ins/GMenu/GMenu.conf (+14/-11)
data/default-theme/plug-ins/Recent-Events/Recent-Events.conf (+10/-7)
data/default-theme/plug-ins/dialog-rendering/dialog-rendering.conf (+1/-1)
data/default-theme/plug-ins/dnd2share/dnd2share.conf (+12/-10)
data/default-theme/plug-ins/logout/logout.conf (+17/-8)
data/default-theme/plug-ins/musicPlayer/musicPlayer.conf (+11/-9)
data/default-theme/plug-ins/quick-browser/quick-browser.conf (+9/-6)
data/default-theme/plug-ins/rendering/rendering.conf (+12/-12)
data/default-theme/plug-ins/shortcuts/shortcuts.conf (+11/-8)
data/default-theme/plug-ins/showDesktop/showDesktop.conf (+14/-11)
data/default-theme/plug-ins/stack/stack.conf (+3/-3)
data/default-theme/plug-ins/switcher/switcher.conf (+10/-8)
data/depth-rotate-desklet.svg (+0/-270)
data/hand.svg (+0/-91)
data/help.conf.in (+0/-500)
data/help_scripts.sh (+0/-112)
data/icon-accessibility.svg (+0/-409)
data/icon-accessories.svg (+0/-368)
data/icon-all.svg (+0/-1307)
data/icon-appearance.svg (+0/-689)
data/icon-background.svg (+0/-634)
data/icon-behavior.svg (+0/-454)
data/icon-connection.svg (+0/-377)
data/icon-controler.svg (+0/-529)
data/icon-desktop.svg (+0/-329)
data/icon-dialogs.svg (+0/-226)
data/icon-extensions.svg (+0/-260)
data/icon-files.svg (+0/-2304)
data/icon-fun.svg (+0/-535)
data/icon-help.svg (+0/-128)
data/icon-hidden-dock.svg (+0/-153)
data/icon-icons.svg (+0/-147)
data/icon-indicators.svg (+0/-200)
data/icon-internet.svg (+0/-232)
data/icon-labels.svg (+0/-362)
data/icon-lock-icons.svg (+0/-143)
data/icon-mouse.svg (+0/-187)
data/icon-plug-ins.svg (+0/-895)
data/icon-position.svg (+0/-877)
data/icon-system.svg (+0/-450)
data/icon-views.svg (+0/-1125)
data/icon-visibility.svg (+0/-545)
data/icons/CMakeLists.txt (+54/-2)
data/icons/cairo-dock-animated.xpm (+97/-0)
data/icons/cairo-dock-cancel.svg (+149/-0)
data/icons/cairo-dock-ok.svg (+91/-0)
data/icons/default-class-indicator.svg (+131/-0)
data/icons/default-icon-appli.svg (+207/-0)
data/icons/default-icon.svg (+125/-0)
data/icons/depth-rotate-desklet.svg (+270/-0)
data/icons/icon-accessories.svg (+368/-0)
data/icons/icon-all.svg (+1307/-0)
data/icons/icon-appearance.svg (+689/-0)
data/icons/icon-background.svg (+634/-0)
data/icons/icon-behavior.svg (+454/-0)
data/icons/icon-close.svg (+126/-0)
data/icons/icon-connection.svg (+415/-0)
data/icons/icon-controler.svg (+529/-0)
data/icons/icon-desktop.svg (+329/-0)
data/icons/icon-dialogs.svg (+226/-0)
data/icons/icon-extensions.svg (+260/-0)
data/icons/icon-files.svg (+2304/-0)
data/icons/icon-fun.svg (+535/-0)
data/icons/icon-help.svg (+128/-0)
data/icons/icon-hidden-dock.svg (+153/-0)
data/icons/icon-icons.svg (+147/-0)
data/icons/icon-indicators.svg (+200/-0)
data/icons/icon-internet.svg (+232/-0)
data/icons/icon-labels.svg (+362/-0)
data/icons/icon-lock-icons.svg (+143/-0)
data/icons/icon-maximize.svg (+198/-0)
data/icons/icon-minimize.svg (+126/-0)
data/icons/icon-mouse.svg (+187/-0)
data/icons/icon-plug-ins.svg (+895/-0)
data/icons/icon-position.svg (+877/-0)
data/icons/icon-restore.svg (+198/-0)
data/icons/icon-system.svg (+450/-0)
data/icons/icon-views.svg (+1125/-0)
data/icons/icon-visibility.svg (+545/-0)
data/icons/retach-desklet.svg (+106/-0)
data/icons/rotate-desklet.svg (+202/-0)
data/images/CMakeLists.txt (+10/-0)
data/launcher.desktop (+0/-48)
data/launcher.desktop.in (+49/-0)
data/main-dock.conf.in (+9/-6)
data/man/cairo-dock_en.1 (+26/-36)
data/retach-desklet.svg (+0/-106)
data/rotate-desklet.svg (+0/-202)
data/scripts/CMakeLists.txt (+10/-0)
data/scripts/help_scripts.sh (+94/-0)
data/scripts/initial-setup.sh (+54/-0)
data/separator.desktop (+0/-30)
data/separator.desktop.in (+27/-0)
data/themes.conf.in (+1/-1)
debian/changelog (+20/-0)
debian/control (+3/-5)
debian/patches/01-default_theme_with_default_apps (+0/-430)
debian/patches/01-musicPlayer_with_banshee (+17/-0)
debian/patches/series (+1/-1)
generate-deb.sh (+0/-167)
launch-cairo-dock-with-delay (+0/-6)
po/ar.po (+2394/-2029)
po/be.po (+3813/-2141)
po/bn.po (+1950/-1904)
po/ca.po (+2443/-2054)
po/cairo-dock.pot (+1562/-1692)
po/cs.po (+3243/-2109)
po/de.po (+4924/-2148)
po/el.po (+5460/-2369)
po/en_GB.po (+7007/-2285)
po/es.po (+6333/-2306)
po/et.po (+2037/-1970)
po/eu.po (+4071/-2102)
po/fi.po (+2089/-1899)
po/fo.po (+2212/-2024)
po/fr.po (+7817/-2334)
po/gl.po (+1757/-1941)
po/hu.po (+5067/-2145)
po/it.po (+7865/-2303)
po/ja.po (+12133/-2487)
po/ko.po (+2288/-2070)
po/nb.po (+3202/-2153)
po/nl.po (+8065/-2297)
po/oc.po (+2097/-1945)
po/pl.po (+2337/-2142)
po/pt.po (+5416/-2182)
po/pt_BR.po (+7034/-2280)
po/ro.po (+2076/-2023)
po/ru.po (+8025/-2262)
po/sk.po (+5168/-2185)
po/sl.po (+2411/-2137)
po/sr.po (+3477/-2188)
po/sv.po (+3703/-2263)
po/tr.po (+2603/-2044)
po/uk.po (+7435/-2257)
po/vi.po (+2174/-1906)
po/zh_CN.po (+5915/-2146)
po/zh_TW.po (+6146/-2142)
src/CMakeLists.txt (+6/-10)
src/cairo-dock-gui-commons.c (+6/-5)
src/cairo-dock-gui-items.c (+12/-15)
src/cairo-dock-gui-main.c (+37/-67)
src/cairo-dock-gui-simple.c (+7/-6)
src/cairo-dock-gui-themes.c (+4/-2)
src/cairo-dock-menu.c (+129/-86)
src/cairo-dock-user-interaction.c (+24/-13)
src/cairo-dock.c (+798/-915)
src/gldit/CMakeLists.txt (+3/-3)
src/gldit/cairo-dock-X-manager.c (+2/-2)
src/gldit/cairo-dock-X-utilities.c (+13/-0)
src/gldit/cairo-dock-X-utilities.h (+1/-0)
src/gldit/cairo-dock-animations.c (+7/-3)
src/gldit/cairo-dock-applet-canvas.h (+3/-0)
src/gldit/cairo-dock-applet-facility.c (+9/-46)
src/gldit/cairo-dock-applet-facility.h (+1/-3)
src/gldit/cairo-dock-applet-manager.c (+0/-1)
src/gldit/cairo-dock-application-facility.c (+4/-1)
src/gldit/cairo-dock-applications-manager.c (+113/-54)
src/gldit/cairo-dock-applications-manager.h (+2/-5)
src/gldit/cairo-dock-backends-manager.c (+2/-2)
src/gldit/cairo-dock-callbacks.c (+82/-37)
src/gldit/cairo-dock-class-manager.c (+429/-132)
src/gldit/cairo-dock-class-manager.h (+28/-7)
src/gldit/cairo-dock-config.c (+3/-2)
src/gldit/cairo-dock-container.c (+41/-6)
src/gldit/cairo-dock-container.h (+9/-0)
src/gldit/cairo-dock-core.c (+1/-1)
src/gldit/cairo-dock-core.h (+1/-0)
src/gldit/cairo-dock-data-renderer-manager.c (+2/-2)
src/gldit/cairo-dock-desklet-factory.c (+4/-4)
src/gldit/cairo-dock-desklet-factory.h (+23/-22)
src/gldit/cairo-dock-desklet-manager.c (+16/-15)
src/gldit/cairo-dock-dialog-factory.c (+33/-6)
src/gldit/cairo-dock-dialog-factory.h (+3/-0)
src/gldit/cairo-dock-dialog-manager.c (+52/-17)
src/gldit/cairo-dock-dialog-manager.h (+0/-3)
src/gldit/cairo-dock-dock-facility.c (+66/-34)
src/gldit/cairo-dock-dock-facility.h (+3/-1)
src/gldit/cairo-dock-dock-factory.c (+11/-11)
src/gldit/cairo-dock-dock-factory.h (+17/-12)
src/gldit/cairo-dock-dock-manager.c (+25/-14)
src/gldit/cairo-dock-draw-opengl.c (+80/-36)
src/gldit/cairo-dock-draw.c (+9/-4)
src/gldit/cairo-dock-file-manager.c (+52/-18)
src/gldit/cairo-dock-file-manager.h (+4/-0)
src/gldit/cairo-dock-flying-container.c (+35/-83)
src/gldit/cairo-dock-flying-container.h (+1/-3)
src/gldit/cairo-dock-gui-factory.c (+7/-6)
src/gldit/cairo-dock-gui-factory.h (+1/-1)
src/gldit/cairo-dock-icon-facility.c (+12/-0)
src/gldit/cairo-dock-icon-facility.h (+2/-0)
src/gldit/cairo-dock-icon-factory.c (+14/-6)
src/gldit/cairo-dock-icon-factory.h (+4/-2)
src/gldit/cairo-dock-icon-manager.c (+11/-22)
src/gldit/cairo-dock-indicator-manager.c (+95/-117)
src/gldit/cairo-dock-indicator-manager.h (+1/-6)
src/gldit/cairo-dock-keybinder.c (+2/-2)
src/gldit/cairo-dock-keybinder.h (+25/-24)
src/gldit/cairo-dock-keyfile-utilities.c (+220/-32)
src/gldit/cairo-dock-keyfile-utilities.h (+16/-10)
src/gldit/cairo-dock-launcher-manager.c (+8/-30)
src/gldit/cairo-dock-log.c (+46/-15)
src/gldit/cairo-dock-log.h (+28/-22)
src/gldit/cairo-dock-manager.c (+4/-3)
src/gldit/cairo-dock-manager.h (+5/-4)
src/gldit/cairo-dock-module-factory.c (+49/-85)
src/gldit/cairo-dock-module-factory.h (+7/-4)
src/gldit/cairo-dock-module-manager.c (+10/-9)
src/gldit/cairo-dock-opengl.h (+1/-0)
src/gldit/cairo-dock-packages.c (+2/-2)
src/gldit/cairo-dock-packages.h (+1/-0)
src/gldit/cairo-dock-particle-system.h (+5/-3)
src/gldit/cairo-dock-separator-manager.c (+2/-1)
src/gldit/cairo-dock-surface-factory.c (+3/-3)
src/gldit/cairo-dock-themes-manager.c (+78/-12)
src/gldit/cairo-dock.h (+55/-67)
src/gldit/gldi.pc.in (+3/-3)
src/help/CMakeLists.txt (+31/-0)
src/help/applet-composite.c (+276/-0)
src/help/applet-composite.h (+32/-0)
src/help/applet-config.c (+43/-0)
src/help/applet-config.h (+30/-0)
src/help/applet-init.c (+85/-0)
src/help/applet-init.h (+31/-0)
src/help/applet-notifications.c (+66/-0)
src/help/applet-notifications.h (+37/-0)
src/help/applet-struct.h (+43/-0)
src/help/applet-tips-dialog.c (+325/-0)
src/help/applet-tips-dialog.h (+29/-0)
src/help/cairo-dock-help.c (+67/-0)
src/help/cairo-dock-help.h (+30/-0)
src/icon-factory/cairo-dock-application-factory.c (+9/-6)
src/icon-factory/cairo-dock-desktop-file-factory.c (+81/-164)
src/icon-factory/cairo-dock-desktop-file-factory.h (+2/-2)
src/icon-factory/cairo-dock-launcher-factory.c (+224/-202)
src/implementations/cairo-dock-compiz-integration.c (+10/-5)
src/implementations/cairo-dock-default-view.c (+7/-2)
src/implementations/cairo-dock-gauge.c (+63/-23)
src/implementations/cairo-dock-gauge.h (+0/-41)
src/implementations/cairo-dock-graph.c (+33/-18)
src/implementations/cairo-dock-graph.h (+7/-22)
src/implementations/cairo-dock-hiding-effect.c (+6/-5)
src/implementations/cairo-dock-icon-container.c (+4/-4)
Related bugs
Bug #823513: Please update Cairo-Dock to 2.4.0~0beta2 version (before the FF) | Undecided | Fix Released |
Related blueprints
Branch information
- Owner:
- Cairo-Dock Devs
- Status:
- Development
Recent revisions
- 20. By Matthieu Baerts
-
* New upstream release. (LP: #823513)
* Upstream (short) ChangeLog:
- A new Help applet has been added to help our beloved user.
- Improved integration in the XFCE and LXDE desktop.
- Improved the classifying of our files in the source code
and in share/cairo-dock directory.
- Launchers and applications now uses the linked .desktop file.
- Fixed a few bugs as usual
* debian/patches:
- Removed 01-default_theme_with_ default_ apps (now in upstream).
- Added 01-musicPlayer_with_banshee in order to use Banshee instead
of Rhythmbox for the default music player.
* debian/control:
- Bump Standard-Version to 3.9.2.
- Removed gawk from the build dependences list (no longer needed). - 18. By Matthieu Baerts
-
* New upstream release. (LP: #786104)
* Upstream ChangeLog:
- Fixed a crash that occured when a class sub-dock was destroyed
(LP: #773280)
- Fixed a major bug where the dock couldn't re-appear after a
menu has been triggerd from outside the dock (ie, from a shortcut)
* debian/patches:
- Added an upstream's patch to fix an annoying bug when we slowly
leave the dock with the cursor on the edge of it - 17. By Matthieu Baerts
-
* New Upstream Version (LP: #723994)
* Upstream short ChangeLog:
- Updated translations
- Updated the integration of the new versions of kwin and compiz
- Updated default theme
- Fixed a few bugs
- Updated the man
* debian/control:
- Added suggests apps for cairo-dock-core (needed by the default theme)
- Updated the description (from launchpad.net/cairo- dock)
- Added cairo-dock-plug-ins as a new suggestion for cairo-dock-core
* debian/patches:
- Updated the default theme to use default apps of Ubuntu Natty
* Switch to dpkg-source 3.0 (quilt) format
* Removed the desktop-file-category patch (sync with debian packages)
* debian/rules:
- Added a CMake flag to disable the gtk grip
- No longer used simple-patchsys
* Updated the debian/watch - 16. By Matthieu Baerts
-
* 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 - 15. By Matthieu Baerts
-
* 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. - 14. By Matthieu Baerts
-
* 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 - 13. By Matthieu Baerts
-
* 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 - 12. By Matthieu Baerts
-
[ 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 - 11. By Matthieu Baerts
-
[ 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
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/oneiric/cairo-dock