linaro-pkg team mailing list archive

[Christian Reis <kiko@xxxxxxxxxxxx>]

On Tue, Apr 17, 2012 at 04:58:17PM -0000, Marcin Juszkiewicz wrote:
> +<<<<<<< TREE
>  linaro-headless-dev: minimal
>  linaro-nano-dev:
>  linaro-development-dev: linaro-headless-dev
> @@ -20,3 +30,6 @@
>  linaro-graphical-engineering-dev: linaro-development-dev
>  linaro-ubuntu-desktop-dev: linaro-headless-dev
>  linaro-lamp-server-dev: linaro-headless-dev
> +=======
> +linaro-lamp-server-dev: linaro-headless-dev
> +>>>>>>> MERGE-SOURCE

Bonk.

> === modified file 'linaro-alip'
> --- linaro-alip	2011-12-09 03:50:48 +0000
> +++ linaro-alip	2012-04-17 16:57:19 +0000
> @@ -16,7 +16,6 @@
>   * gstreamer0.10-x
>   * hal-info
>   * hicolor-icon-theme
> - * libjpeg-turbo62

Why?

> === renamed file 'linaro-alip-dev' => 'linaro-alip-dev.moved'
> === modified file 'linaro-development'
> --- linaro-development	2011-10-16 20:49:11 +0000
> +++ linaro-development	2012-04-17 16:57:19 +0000
> @@ -21,7 +21,6 @@
>   * i2c-tools
>   * lsof
>   * ltrace
> - * ltt-bin

Why?

> === renamed file 'linaro-nano-dev' => 'linaro-nano-dev.moved'
> === modified file 'linaro-ubuntu-desktop'
> --- linaro-ubuntu-desktop	2011-10-21 19:44:27 +0000
> +++ linaro-ubuntu-desktop	2012-04-17 16:57:19 +0000
> @@ -8,6 +8,4 @@
>  Task-Seeds: minimal linaro-headless
>  
>   * ubuntu-desktop
> - * libjpeg-turbo62
> - * command-not-found

Why?

That's all I see as surprising.
-- 
Christian Robottom Reis, Engineering VP
Brazil (GMT-3) | [+55] 16 9112 6430 | [+1] 612 216 4935
Linaro.org: Open Source Software for ARM SoCs

https://code.launchpad.net/~hrw/linaro-seeds/linaro.precise-dev/+merge/102355
Your team Linaro Maintainers is requested to review the proposed merge of lp:~hrw/linaro-seeds/linaro.precise-dev into lp:linaro-seeds.