[oe-commits] Thomas Zimmermann : ncurses: fix merge breakages

[git version control]

Module: openembedded.git
Branch: shr/testing2011.1
Commit: f217601f22a14b039c9e57e3fd49ae9051a13b0e
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=f217601f22a14b039c9e57e3fd49ae9051a13b0e

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Sat Sep 10 16:19:53 2011 +0200

ncurses: fix merge breakages

---

 recipes/ncurses/ncurses_5.7.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/recipes/ncurses/ncurses_5.7.bb b/recipes/ncurses/ncurses_5.7.bb
index 2c3c23b..77cc4e5 100644
--- a/recipes/ncurses/ncurses_5.7.bb
+++ b/recipes/ncurses/ncurses_5.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Ncurses library"
 HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html"
 LICENSE = "MIT"
 SECTION = "libs"
-PATCHDATE = "20110115"
+PATCHDATE = "20110108"
 PV = "5.7+${PATCHDATE}"
 PR = "r17"
 
@@ -14,7 +14,6 @@ inherit autotools binconfig test
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-5.7.tar.gz;name=tarball \
         file://ncurses-5.7-20110108-patch.sh.bz2;apply=yes;name=p20110108sh \
 \
-        ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-${PATCHDATE}.patch.gz;name=p${PATCHDATE} \
         file://tic-hang.patch \
         file://config.cache \
 "