Merge lp:~ubuntu-branches/ubuntu/oneiric/cairo-dock-plug-ins/oneiric-201110111206 into lp:ubuntu/oneiric/cairo-dock-plug-ins

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/cairo-dock-plug-ins reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/cairo-dock-plug-ins/oneiric-201110111206. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

24. By Iain Lane on 2011-10-11

releasing version 2.4.0~2-0ubuntu1

23. By Iain Lane on 2011-10-11

Fix Mono/CLI build to be ~policy compliant and use correct compiler

22. By Iain Lane on 2011-10-11

* New upstream bug fix release. (LP: #859984)
* Upstream (short) ChangeLog (2.4.0~0beta2 -> 2.4.0~1):
 - Powermanager: correctly release the reference on the device object
 - logout: now works if there is no session-manager
 - Status-Notifier: fixed a small bug
    (wrong callback in cairo_dock_stop_watching_dbus_name_owner)
 - Folders: fixed the positionning of the new icon
    and the dialog when dropping a folder inside the dock
    and fixed the icon-rendering
 - Dustbin: use the default theme if no icon is found
 - Impulse: the default context seems to be ok and not an error
 - Status-Notifier: On Ubuntu Oneiric (with indicator-0.4)
    the ApplicationAdded signal has changed and has a new parameter
 - Disable MeMenu on Oneiric (no longer available with indicator-0.4)
 - CMakeLists.txt: Improved output messages
 - Slide view: fixed a small offset in vertical view
 - musicPlayer:
  + split MPRIS 1.0 and 2.0 to help debugging and finding the right
     name of the bug.
  + 'rhythmbox-client' tool is no longer available: used MPRIS
  + Disable Amazon service (it no longer work)
  + Cover: fixed corrupted icons: some players (e.g. the latest version
     of RB) copy covers on their cache forlder but it takes a few time.
  + Fixed the update the icon and its name if the player is stopped.
  + Prevent a crash if the name given by MPRIS is NULL
 - Powermanager: try to prevent to have a few dialogues at the same time
 - PowerManager and AlsaMixer: hidden gnome2 or 3 apps if not available
 - Messaging-Menu: Updated for Natty and Oneiric
    (dbus-menu gives us GVariant instead of GValue objects)
 - Alsamixer: fixed a small bug on reload
 - Dbus: Bash interface: Fixed a typo with emblem positions
 - Sys-monitor: fixed a bug which prevented from getting
    the CPU temperature in some cases
 - Compiz (0.9): type filter: replaced type=utility by type=Utility
 - Updated the version of all applets that have gauges
   in order to use the right directory
 - Wifi: Fixed the status if we are not connected
 - Dbus: removed a conflict with the Help applet
 - Messaging-Menu: updated applet-menu.c => Memory leaks on pixbufs
 - Dbus: Fixed a crash when changing dock theme if a 'third-party' applet
    is running
 - Netspeed: in /proc/net/dev, there are 8 values to drop after the card id
    except if there is whitespaces just after this ':' character
    and fixed order and value for ON_ICON display
 - dock-rendering/toto: removed a useless file
 - Clipper: fixed the loading of the remembered items
    (they had the wrong type) and fixed a bug if we reduce the list of items
 - Folders, dustbin, Network-Monitor: tried to not use cast if it's possible
 - Code cleaned and re-organised a few functions
   (e.g. emblem references has been renamed)
 - Removed useless files: powermanager-dbus*
 - Updating translations
 - Fixed a few warnings at the compilation
 - Removed a few useless output messages
 - Fixed these LP bugs:
  + Empty trash from the trashcan does not delete files
     from usb harddisks: LP: #658681
  + Switcher applet doesn't respect desktop numbers LP: #626782
* Upstream (short) ChangeLog (2.4.0~1 -> 2.4.0~2):
 - Messaging-Menu: fixed a wrong g_object_unref (double free)
    and a small memory leak
 - Folders: fixed a tiny warning at the compilation (32bits)
 - switcher: removed an unnecessary config parameter
 - Folders: file size: used English instead of French translation.
 - Indicator applet: Forced a cast to remove an annoying warning
    due to clumsy dbusmenu_gtkmenu_new() declaration
 - Fixed the detection of the screensaver
 - Fixed tiny warnings at the compilation (with CAIRO_CONTAINER)
* debian/control:
 - Updated the version of cairo-dock-[core;data;dev].
 - Added gvfs as 'Suggests' for cairo-dock-plug-ins-integration
    (Used for managing files)
 - Removed 'libthunar-vfs-1-dev' (libthunar-vfs is no longer installed
    by default since XFCE 4.8 and it is replaced by gvfs)
 - Removed 'indicator-me' (no longer available
    and the installation of Cairo-Dock produces an error)
 - Moved 'indicator-messages' to 'Recommends'
* debian/rules:
 - Updated the name of CMake extras flags
* debian/cairo-dock-plug-ins-data.lintian-overrides:
 - Deleted (now useless)
* debian/cairo-dock-plug-ins.lintian-overrides:
 - Cairo-Dock Plug-Ins are not linked to gldi
 - shlib-without-versioned-soname: forwarded to upstream.
* debian/cairo-dock-plug-ins-integration.lintian-overrides:
 - Cairo-Dock Plug-Ins are not linked to gldi
 - ldconfig and shlibs are not needed
* debian/cairo-dock-plug-ins.install:
 - Fixed lintian errors: package-installs-python-bytecode
* debian/control: Fixed lintian warnings:
 - python-script-but-no-python-dep
 - description-synopsis-starts-with-article
* debian/changelog:
 - Fixed lintian warning: old-fsf-address-in-copyright-file
* debian/patches/01-switcher-force-compact-view.patch:
 - Forced the compact view because the other doesn't work

=== added directory '.pc'
=== renamed directory '.pc' => '.pc.moved'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2011-10-11 12:11:29 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2011-10-11 12:11:29 +0000
@@ -0,0 +1,1 @@
+series

=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2011-10-11 12:11:29 +0000
@@ -0,0 +1,1 @@
+2

=== added directory '.pc/01-switcher-force-compact-view.patch'
=== added directory '.pc/01-switcher-force-compact-view.patch/switcher'
=== added directory '.pc/01-switcher-force-compact-view.patch/switcher/data'
=== added file '.pc/01-switcher-force-compact-view.patch/switcher/data/switcher.conf.in'
--- .pc/01-switcher-force-compact-view.patch/switcher/data/switcher.conf.in	1970-01-01 00:00:00 +0000
+++ .pc/01-switcher-force-compact-view.patch/switcher/data/switcher.conf.in	2011-10-11 12:11:29 +0000
@@ -0,0 +1,177 @@
+#@VERSION_SWITCHER@
+
+#[gtk-about]
+[Icon]
+
+#F[Icon]
+frame_maininfo=
+
+#d Name of the dock it belongs to:
+dock name =
+
+#s Name of the icon as it will appear in its caption in the dock:
+name = 
+ #v
+sep_display=
+
+#S+ Image filename:
+#{Leave empty to use the default one.}
+icon = 
+
+#j+[0;400] Desired icon size for this applet
+#{Set to 0 to use the default applet size}
+icon size = 0;0
+
+order=
+
+#F[Applet's Handbook]
+frame_hand=
+#A
+handbook=switcher
+
+#[gtk-convert]
+[Desklet]
+
+#X[Position]
+frame_pos =
+
+#b Lock position?
+#{If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.}
+locked = false
+
+#j+[24;512] Desklet dimensions (width x height):
+#{Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.}
+size = 96;96
+
+#i[-2048;2048] Desklet position (x, y):
+x position=10
+#i[-2048;2048] ...
+y position=10
+
+#X[Visibility]
+frame_visi =
+
+#b Is detached from the dock
+initially detached=false
+#l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
+accessibility=0
+#b Should be visible on all desktops?
+sticky=true
+
+
+
+
+#F[Decorations;gtk-orientation-portrait]
+frame_deco=
+
+#o+ Choose a decoration theme for this desklet:
+#{Choose 'Custom decorations' to define your own decorations below.}
+decorations = default
+
+#v
+sep_deco =
+
+#S+ Background image:
+#{Image to be displayed below drawings, e.g. a frame. Leave empty for no image.}
+bg desklet =
+#e+[0;1] Background transparency:
+bg alpha = 1
+#i+[0;256] Left offset:
+#{in pixels. Use this to adjust the left position of drawings.}
+left offset = 0
+#i+[0;256] Top offset:
+#{in pixels. Use this to adjust the top position of drawings.}
+top offset = 0
+#i+[0;256] Right offset:
+#{in pixels. Use this to adjust the right position of drawings.}
+right offset = 0
+#i+[0;256] Bottom offset:
+#{in pixels. Use this to adjust the bottom position of drawings.}
+bottom offset = 0
+#S+ Foreground image:
+#{Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.}
+fg desklet =
+#e+[0;1] Foreground tansparency:
+fg alpha = 1
+
+
+#[gtk-preferences]
+[Configuration]
+
+#F[Configuration]
+frame_conf =
+
+#B Use the compact mode?
+#{All desktops will be drawn on the main icon. Otherwise a sub-dock will contain all desktops.}
+Vue Simple = true
+
+#b Preserve the ratio of the screen ?
+preserve ratio = true
+
+#b Map wallpaper to icons?
+Map Wallpaper = true
+
+#b Show desktop number on icons?
+display numero desktop = true
+
+#B Draw windows on icons?
+Draw Windows = true
+
+#b Draw hidden windows?
+Draw hidden Windows = false
+
+#v
+sep_conf =
+
+#l[Show windows' list;Show desktop;Expose all the desktops;Expose all the windows] Action on middle-click:
+action on click = 0
+
+#U Workspace names :
+desktop names = 
+
+
+#F[Display options]
+frame_disp =
+
+#i+[0;8] Size of the inside lines :
+inlinesize = 3
+
+#C+ Internal line colour:
+#{r, g, b, a}
+rgbinlinecolor = 0.0; 0.0; 0.5; 1.
+
+#i+[0;8] External line size:
+linesize = 3
+
+#C+ External line colour:
+#{r, g, b, a}
+rgblinecolor = 0.0; 0.0; 0.5; 1.
+
+#C+ Window line colour:
+#{r, g, b, a}
+rgbwlinecolor = 0.0; 0.0; 0.5; 1.
+
+#v
+sep_cur =
+
+#C+ Current desktop colour:
+#{r, g, b, a}
+rgbindcolor = 0.0; 0.0; 0.5; 0.5
+
+#l+[draw a frame;fill;fill others] How to draw the current desktop:
+fill current = 1
+
+#v
+sep_other =
+
+#S+ Icon to use in expanded mode if wallpaper is not mapped:
+#{Leave empty to use the default one.}
+default icon = 
+
+
+#n+ Sub-dock view name:
+#{Leave empty to use default sub-dock view.}/
+renderer = 
+
+#b+ In expanded mode, render the desklet in 3D?
+3D desklet = true

=== added directory '.pc/01-switcher-force-compact-view.patch/switcher/src'
=== added file '.pc/01-switcher-force-compact-view.patch/switcher/src/applet-config.c'
--- .pc/01-switcher-force-compact-view.patch/switcher/src/applet-config.c	1970-01-01 00:00:00 +0000
+++ .pc/01-switcher-force-compact-view.patch/switcher/src/applet-config.c	2011-10-11 12:11:29 +0000
@@ -0,0 +1,78 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <string.h>
+
+#include "applet-struct.h"
+#include "applet-config.h"
+#include "applet-load-icons.h"
+
+
+CD_APPLET_GET_CONFIG_BEGIN
+	//\_________________ On recupere toutes les valeurs de notre fichier de conf.
+	myConfig.bCompactView = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Vue Simple", TRUE);
+	myConfig.bPreserveScreenRatio = CD_CONFIG_GET_BOOLEAN ("Configuration", "preserve ratio");
+	myConfig.bMapWallpaper = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Map Wallpaper", TRUE);
+	myConfig.bDisplayNumDesk = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "display numero desktop", TRUE);
+	myConfig.bDrawWindows = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Draw Windows", TRUE);
+	myConfig.bDisplayHiddenWindows = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Draw hidden Windows", TRUE);
+	myConfig.iActionOnMiddleClick = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "action on click", 0);
+	
+	// couleur des lignes interieures
+	myConfig.iInLineSize = CD_CONFIG_GET_INTEGER("Configuration", "inlinesize");
+	double inlinecouleur[4] = {0., 0., 0.5, 1.};
+	CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgbinlinecolor",myConfig.RGBInLineColors, inlinecouleur);
+	
+	// couleur du bureau courant.
+	double indcouleur[4] = {0., 0., 0.5, 1.};
+	CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgbindcolor",myConfig.RGBIndColors, indcouleur);
+	myConfig.iDrawCurrentDesktopMode = CD_CONFIG_GET_INTEGER ("Configuration", "fill current");
+	
+	// couleur des lignes exterieures.
+	myConfig.iLineSize = CD_CONFIG_GET_INTEGER("Configuration", "linesize");
+	double linecouleur[4] = {0., 0., 0.5, 1.};
+	CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgblinecolor",myConfig.RGBLineColors, linecouleur);
+	
+	// couleur des traits des fenetres.
+	double wlinecouleur[4] = {0., 0., 0.5, 1.};
+	CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgbwlinecolor",myConfig.RGBWLineColors, wlinecouleur);
+
+	myConfig.cDefaultIcon = CD_CONFIG_GET_FILE_PATH ("Configuration", "default icon", "default.svg");
+	myConfig.cRenderer = CD_CONFIG_GET_STRING ("Configuration", "renderer");
+	myConfig.bDesklet3D = CD_CONFIG_GET_BOOLEAN ("Configuration", "3D desklet");
+	
+	gsize iNbNamesSize;
+	myConfig.cDesktopNames = CD_CONFIG_GET_STRING_LIST_WITH_DEFAULT ("Configuration", "desktop names", &iNbNamesSize, "Work;Game;Video;Chat");
+	myConfig.iNbNames = (gint) iNbNamesSize;
+CD_APPLET_GET_CONFIG_END
+
+
+CD_APPLET_RESET_CONFIG_BEGIN
+	g_free (myConfig.cRenderer);
+	g_free (myConfig.cDefaultIcon);
+	if (myConfig.cDesktopNames != NULL)
+		g_strfreev (myConfig.cDesktopNames);
+CD_APPLET_RESET_CONFIG_END
+
+
+CD_APPLET_RESET_DATA_BEGIN
+	CD_APPLET_DELETE_MY_ICONS_LIST;
+	cairo_surface_destroy (myData.pDefaultMapSurface);
+	cairo_surface_destroy (myData.pDesktopBgMapSurface);
+CD_APPLET_RESET_DATA_END

=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2011-10-11 12:11:29 +0000
@@ -0,0 +1,1 @@
+01-switcher-force-compact-view.patch

=== added file 'debian/cairo-dock-plug-ins-integration.lintian-overrides'
--- debian/cairo-dock-plug-ins-integration.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/cairo-dock-plug-ins-integration.lintian-overrides	2011-10-11 12:11:29 +0000
@@ -0,0 +1,7 @@
+# Cairo-Dock Plug-Ins are not linked to gldi
+cairo-dock-plug-ins-integration: pkg-has-shlibs-control-file-but-no-actual-shared-libs
+# These integration plug-ins don't need shlibs and don't have to call ldconfig
+#  (these plug-ins are enable only if a lib is available)
+cairo-dock-plug-ins-integration: postinst-has-useless-call-to-ldconfig
+cairo-dock-plug-ins-integration: postrm-has-useless-call-to-ldconfig
+cairo-dock-plug-ins-integration: missing-dependency-on-libc

=== renamed file 'debian/cairo-dock-plug-ins-integration.lintian-overrides' => 'debian/cairo-dock-plug-ins-integration.lintian-overrides.moved'
=== added file 'debian/cairo-dock-plug-ins.lintian-overrides'
--- debian/cairo-dock-plug-ins.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/cairo-dock-plug-ins.lintian-overrides	2011-10-11 12:11:29 +0000
@@ -0,0 +1,6 @@
+# Cairo-Dock Plug-Ins are not linked to gldi
+cairo-dock-plug-ins: pkg-has-shlibs-control-file-but-no-actual-shared-libs
+# Bug reported to upstream.
+cairo-dock-plug-ins: shlib-without-versioned-soname
+# Temporally lintian override: This package is going to be split
+cairo-dock-plug-ins: package-name-doesnt-match-sonames

=== renamed file 'debian/cairo-dock-plug-ins.lintian-overrides' => 'debian/cairo-dock-plug-ins.lintian-overrides.moved'
=== added file 'debian/patches/01-switcher-force-compact-view.patch'
--- debian/patches/01-switcher-force-compact-view.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01-switcher-force-compact-view.patch	2011-10-11 12:11:29 +0000
@@ -0,0 +1,34 @@
+## From: Matthieu Baerts (matttbe) <[e-mail]>
+## Description: Forced the compact view because the other doesn't work
+## Forwarded: yes
+Index: cairo-dock-plug-ins/switcher/src/applet-config.c
+===================================================================
+--- cairo-dock-plug-ins.orig/switcher/src/applet-config.c	2011-10-08 23:26:53.222924952 +0200
++++ cairo-dock-plug-ins/switcher/src/applet-config.c	2011-10-08 23:26:53.306924951 +0200
+@@ -26,7 +26,7 @@
+ 
+ CD_APPLET_GET_CONFIG_BEGIN
+ 	//\_________________ On recupere toutes les valeurs de notre fichier de conf.
+-	myConfig.bCompactView = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Vue Simple", TRUE);
++	myConfig.bCompactView = TRUE; // CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Vue Simple", TRUE);
+ 	myConfig.bPreserveScreenRatio = CD_CONFIG_GET_BOOLEAN ("Configuration", "preserve ratio");
+ 	myConfig.bMapWallpaper = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Map Wallpaper", TRUE);
+ 	myConfig.bDisplayNumDesk = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "display numero desktop", TRUE);
+Index: cairo-dock-plug-ins/.bzr/checkout/dirstate
+===================================================================
+Binary files cairo-dock-plug-ins.orig/.bzr/checkout/dirstate	2011-10-08 23:28:01.502925141 +0200 and cairo-dock-plug-ins/.bzr/checkout/dirstate	2011-10-08 23:27:09.198924995 +0200 differ
+Index: cairo-dock-plug-ins/switcher/data/switcher.conf.in
+===================================================================
+--- cairo-dock-plug-ins.orig/switcher/data/switcher.conf.in	2011-10-08 23:28:00.542925138 +0200
++++ cairo-dock-plug-ins/switcher/data/switcher.conf.in	2011-10-08 23:27:55.810925124 +0200
+@@ -101,10 +101,6 @@
+ #F[Configuration]
+ frame_conf =
+ 
+-#B Use the compact mode?
+-#{All desktops will be drawn on the main icon. Otherwise a sub-dock will contain all desktops.}
+-Vue Simple = true
+-
+ #b Preserve the ratio of the screen ?
+ preserve ratio = true
+ 

=== renamed file 'debian/patches/01-switcher-force-compact-view.patch' => 'debian/patches/01-switcher-force-compact-view.patch.moved'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-10-11 12:11:29 +0000
@@ -0,0 +1,1 @@
+01-switcher-force-compact-view.patch

=== renamed file 'debian/patches/series' => 'debian/patches/series.moved'