Merge authors: Matthieu Baerts (matttbe) ------------------------------------------------------------ revno: 11 [merge] tags: 2.1.3-6-0ubuntu1 fixes bug(s): https://launchpad.net/bugs/521534 author: Matthieu Baerts (matttbe) <[email protected]>, Matthieu Baerts (matttbe), Didier Roche committer: Bazaar Package Importer <[email protected]> branch nick: lucid timestamp: Mon 2010-03-01 22:24:00 +0100 message: [ 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 removed: compile data/ChangeLog-2.0.9.txt data/help.svg data/icon-accessibility.svg data/icon-icons.svg data/icon-views.svg debian/patches/02-merge-changelog.patch po/en_GB.po src/cairo-dock-gui-callbacks.c src/cairo-dock-gui-callbacks.h src/cairo-dock-gui-filter.c src/cairo-dock-gui-filter.h added: ChangeLog data/cairo-dock-simple.conf data/cairo-dock-simple.conf.in data/default-theme/icons/firefox.svg data/icon-accessories.png data/icon-appearance.svg data/icon-behavior.svg data/icon-close.png data/icon-connection.svg data/icon-controler.png data/icon-desktop.svg data/icon-help.png data/icon-icons.png data/icon-maximize.png data/icon-minimize.png data/icon-plug-ins.png data/icon-restore.png data/icon-views.png data/icon-visibility.png po/be.po po/cs.po po/en.po po/eu.po po/hu.po po/uk.po po/zh_TW.po src/cairo-dock-application-facility.c src/cairo-dock-application-facility.h src/cairo-dock-gui-launcher.c src/cairo-dock-gui-launcher.h src/cairo-dock-gui-main.c src/cairo-dock-gui-main.h src/cairo-dock-gui-simple.c src/cairo-dock-gui-simple.h src/cairo-dock-opengl.c src/cairo-dock-opengl.h src/texture-blur.h modified: INSTALL Makefile.am Makefile.in aclocal.m4 cairo-dock-package-theme cairo-dock.pc.in config.guess config.h.in config.sub configure configure.ac copyright data/ChangeLog.txt data/Makefile.am data/Makefile.in data/cairo-dock-cairo.desktop data/cairo-dock-logo.png data/cairo-dock.conf data/cairo-dock.conf.in data/cairo-dock.desktop data/container.conf data/default-theme/Makefile.in data/default-theme/cairo-dock.conf data/default-theme/icons/Makefile.am data/default-theme/icons/Makefile.in data/default-theme/launchers/Makefile.in data/default-theme/plug-ins/Animated-icons/Animated-icons.conf data/default-theme/plug-ins/Animated-icons/Makefile.in data/default-theme/plug-ins/GMenu/GMenu.conf data/default-theme/plug-ins/GMenu/Makefile.in data/default-theme/plug-ins/Makefile.in data/default-theme/plug-ins/clock/Makefile.in data/default-theme/plug-ins/clock/clock.conf data/default-theme/plug-ins/dialog-rendering/Makefile.in data/default-theme/plug-ins/dialog-rendering/dialog-rendering.conf data/default-theme/plug-ins/dustbin/Makefile.in data/default-theme/plug-ins/dustbin/dustbin.conf data/default-theme/plug-ins/icon-effect/Makefile.in data/default-theme/plug-ins/icon-effect/icon-effect.conf data/default-theme/plug-ins/illusion/Makefile.in data/default-theme/plug-ins/illusion/illusion.conf data/default-theme/plug-ins/logout/Makefile.in data/default-theme/plug-ins/logout/logout.conf data/default-theme/plug-ins/rendering/Makefile.in data/default-theme/plug-ins/rendering/rendering.conf data/default-theme/plug-ins/shortcuts/Makefile.in data/default-theme/plug-ins/shortcuts/shortcuts.conf data/default-theme/plug-ins/showDesktop/Makefile.in data/default-theme/plug-ins/showDesktop/showDesktop.conf data/default-theme/plug-ins/switcher/Makefile.in data/default-theme/plug-ins/switcher/switcher.conf data/emblems/Makefile.in data/explosion/Makefile.in data/file.conf data/gauges/Makefile.in data/gauges/battery/Makefile.in data/gauges/turbo-night-fuel/Makefile.in data/help.conf data/icon-background.svg data/icon-desklets.png* data/icon-indicators.png data/icon-labels.png* data/icon-position.png data/launcher.conf data/main-dock.conf data/main-dock.conf.in data/readme-default-view data/separator.conf debian/cairo-dock-dev.install debian/cairo-dock.1 debian/changelog debian/control debian/copyright debian/patches/01-desktop-file-category.patch debian/rules debian/watch depcomp install-sh ltmain.sh missing po/LINGUAS po/Makevars po/cairo-dock.pot po/de.po po/el.po po/es.po po/fr.po po/it.po po/ja.po po/nl.po po/pt.po po/pt_BR.po po/ru.po po/sv.po po/zh_CN.po src/Makefile.am src/Makefile.in src/cairo-dock-X-utilities.c src/cairo-dock-X-utilities.h src/cairo-dock-animations.c src/cairo-dock-animations.h src/cairo-dock-applet-canvas.h src/cairo-dock-applet-facility.c src/cairo-dock-applet-facility.h src/cairo-dock-applet-factory.c src/cairo-dock-applet-factory.h src/cairo-dock-applet-multi-instance.h src/cairo-dock-applet-single-instance.h src/cairo-dock-application-factory.c src/cairo-dock-application-factory.h src/cairo-dock-applications-manager.c src/cairo-dock-applications-manager.h src/cairo-dock-callbacks.c src/cairo-dock-callbacks.h src/cairo-dock-class-manager.c src/cairo-dock-class-manager.h src/cairo-dock-config.c src/cairo-dock-config.h src/cairo-dock-container.c src/cairo-dock-container.h src/cairo-dock-data-renderer.c src/cairo-dock-data-renderer.h src/cairo-dock-dbus.c src/cairo-dock-dbus.h src/cairo-dock-default-view.c src/cairo-dock-default-view.h src/cairo-dock-desklet.c src/cairo-dock-desklet.h src/cairo-dock-desktop-file-factory.c src/cairo-dock-desktop-file-factory.h src/cairo-dock-dialogs.c src/cairo-dock-dialogs.h src/cairo-dock-dock-facility.c src/cairo-dock-dock-facility.h src/cairo-dock-dock-factory.c src/cairo-dock-dock-factory.h src/cairo-dock-dock-manager.c src/cairo-dock-dock-manager.h src/cairo-dock-draw-opengl.c src/cairo-dock-draw-opengl.h src/cairo-dock-draw.c src/cairo-dock-draw.h src/cairo-dock-emblem.c src/cairo-dock-emblem.h src/cairo-dock-file-manager.c src/cairo-dock-file-manager.h src/cairo-dock-flying-container.c src/cairo-dock-flying-container.h src/cairo-dock-gauge.c src/cairo-dock-gauge.h src/cairo-dock-global-variables.h src/cairo-dock-graph.h src/cairo-dock-gui-factory.c src/cairo-dock-gui-factory.h src/cairo-dock-gui-manager.c src/cairo-dock-gui-manager.h src/cairo-dock-icons.c src/cairo-dock-icons.h src/cairo-dock-internal-accessibility.c src/cairo-dock-internal-accessibility.h src/cairo-dock-internal-background.c src/cairo-dock-internal-background.h src/cairo-dock-internal-desklets.c src/cairo-dock-internal-desklets.h src/cairo-dock-internal-dialogs.c src/cairo-dock-internal-dialogs.h src/cairo-dock-internal-hidden-dock.h src/cairo-dock-internal-icons.c src/cairo-dock-internal-icons.h src/cairo-dock-internal-indicators.c src/cairo-dock-internal-indicators.h src/cairo-dock-internal-labels.c src/cairo-dock-internal-labels.h src/cairo-dock-internal-position.c src/cairo-dock-internal-position.h src/cairo-dock-internal-system.c src/cairo-dock-internal-system.h src/cairo-dock-internal-taskbar.c src/cairo-dock-internal-taskbar.h src/cairo-dock-internal-views.c src/cairo-dock-internal-views.h src/cairo-dock-keyfile-utilities.c src/cairo-dock-keyfile-utilities.h src/cairo-dock-launcher-factory.c src/cairo-dock-launcher-factory.h src/cairo-dock-load.c src/cairo-dock-load.h src/cairo-dock-menu.c src/cairo-dock-menu.h src/cairo-dock-modules.c src/cairo-dock-modules.h src/cairo-dock-notifications.h src/cairo-dock-particle-system.c src/cairo-dock-particle-system.h src/cairo-dock-renderer-manager.c src/cairo-dock-renderer-manager.h src/cairo-dock-separator-factory.c src/cairo-dock-separator-factory.h src/cairo-dock-struct.h src/cairo-dock-surface-factory.c src/cairo-dock-surface-factory.h src/cairo-dock-task.c src/cairo-dock-task.h src/cairo-dock-themes-manager.c src/cairo-dock-themes-manager.h src/cairo-dock.c src/cairo-dock.h src/texture-gradation.h The size of the diff (181797 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
