From patchwork Tue May 3 14:54:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: error in push of origin/org.openmbedded.dev Date: Tue, 03 May 2011 14:54:45 -0000 From: Paul Menzel X-Patchwork-Id: 3109 Message-Id: <1304434485.13481.79.camel@mattotaupa> To: openembedded-devel@lists.openembedded.org Cc: Florian Boor Dear Florian, you pushed to org.open*mb*edded.dev and therefore a new branch was created. Before you push to the correct branch could you maybe clean up the commit log using `git rebase -i …` or take the improved patches I attached. I removed the wrong and reverted commit and for the ProFTP recipe I put `PR = "r0"`. Looking through the commits it would be better to review them first on the list in my opinion since they still have small style errors. Thanks, Paul >From 2497edd853c45455a10e309a0790f132f78b6699 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 7 Jan 2011 15:06:05 +0100 Subject: [PATCH] gpe-lights: fix license Signed-off-by: Florian Boor --- The sentence in the commit log was redundant. --- recipes/gpe-lights/gpe-lights_0.13.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/gpe-lights/gpe-lights_0.13.bb b/recipes/gpe-lights/gpe-lights_0.13.bb index 1930ae9..5968a61 100644 --- a/recipes/gpe-lights/gpe-lights_0.13.bb +++ b/recipes/gpe-lights/gpe-lights_0.13.bb @@ -1,11 +1,11 @@ inherit gpe -LICENSE = "PD" +LICENSE = "GPLv2+" DESCRIPTION = "A simple light puzzle." DEPENDS = "gtk+ libgpewidget gpe-icons" SECTION = "gpe/games" PRIORITY = "optional" -PR = "r1" +PR = "r2" SRC_URI += "file://fix-makefiles.patch" -- 1.7.4.4