| Message ID | 1471958867-6960-1-git-send-email-gustavo@zacarias.com.ar |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Tue, 23 Aug 2016 10:27:47 -0300, Gustavo Zacarias wrote: > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> > --- > package/diffutils/diffutils.hash | 2 +- > package/diffutils/diffutils.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) It doesn't apply on next, since we already bumped to 3.4. I've fixed up the conflict, but it would be useful if your patches aimed at the next branch would be based on the current next branch. Thanks! Thomas
diff --git a/package/diffutils/diffutils.hash b/package/diffutils/diffutils.hash index 27eace2..7e99f1f 100644 --- a/package/diffutils/diffutils.hash +++ b/package/diffutils/diffutils.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c diffutils-3.3.tar.xz +sha256 dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533 diffutils-3.5.tar.xz diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 191fd2e..d3e608c 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIFFUTILS_VERSION = 3.3 +DIFFUTILS_VERSION = 3.5 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/diffutils/diffutils.hash | 2 +- package/diffutils/diffutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)