From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [git commit] merge assuan
Date: Wed, 31 Jul 2013 13:56:35 +0200 [thread overview]
Message-ID: <20130731135635.299531db@skate> (raw)
In-Reply-To: <20130731114959.21F209AEB9@busybox.osuosl.org>
Hello,
On Wed, 31 Jul 2013 13:49:07 +0200, Thomas Petazzoni wrote:
> commit: http://git.buildroot.net/buildroot/commit/?id=fc8b560d8a6948553aa6396b8f0b784809b2df3d
> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> ---
> package/libassuan/libassuan.mk | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk
> index 6d4f7e5..5f5378b 100644
> --- a/package/libassuan/libassuan.mk
> +++ b/package/libassuan/libassuan.mk
> @@ -7,8 +7,8 @@
> LIBASSUAN_VERSION = 2.1.1
> LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan/
> LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2
> -LIBASSUAN_LICENSE = LGPLv2.1+
> -LIBASSUAN_LICENSE_FILES = COPYING.LIB
> +LIBASSUAN_LICENSE = LGPLv2.1+ (library), GPLv3 (tests, doc)
> +LIBASSUAN_LICENSE_FILES = COPYING.LIB COPYING
> LIBASSUAN_INSTALL_STAGING = YES
> LIBASSUAN_DEPENDENCIES = libgpg-error
> LIBASSUAN_CONF_OPT = \
Crap, my bad, forgot to rebase before pushing. Since I won't rebase now
that I have pushed, this is going to stay forever in the history. Sorry
for the mess.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
prev parent reply other threads:[~2013-07-31 11:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-31 11:49 [Buildroot] [git commit] merge assuan Thomas Petazzoni
2013-07-31 11:56 ` Thomas Petazzoni [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130731135635.299531db@skate \
--to=thomas.petazzoni@free-electrons.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox