[oe-commits] org.oe.dev merge of '13a2fd4a576e4ad16ad4a7365dddd911d1a008c9'

[hrw commit]

merge of '13a2fd4a576e4ad16ad4a7365dddd911d1a008c9'
     and '1df70c8f4e39ea30b3a0d2231271e7883161ff19'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 652ba8904b6a89303952bc2a381a883001ceda70
ViewMTN: http://monotone.openembedded.org/revision.psp?id=652ba8904b6a89303952bc2a381a883001ceda70
Files:
1
packages/less/less-381
packages/less/less-381/configure.patch
packages/less/less-382
packages/less/less-382/configure.patch
packages/less/less_381.bb
packages/powertop/powertop_1.5.bb
packages/powertop/powertop_1.8.bb
packages/less/less_406.bb
packages/gnuplot/gnuplot_4.2.0.bb
Diffs:

#
# mt diff -r13a2fd4a576e4ad16ad4a7365dddd911d1a008c9 -r652ba8904b6a89303952bc2a381a883001ceda70
#
# 
# 
# delete "packages/less/less-381"
# 
# delete "packages/less/less-381/configure.patch"
# 
# delete "packages/less/less-382"
# 
# delete "packages/less/less-382/configure.patch"
# 
# delete "packages/less/less_381.bb"
# 
# rename "packages/powertop/powertop_1.5.bb"
#     to "packages/powertop/powertop_1.8.bb"
# 
# add_file "packages/less/less_406.bb"
#  content [d956d9d1d4d67852b26b16d84e31d4a017470f9a]
# 
============================================================
--- packages/less/less_406.bb	d956d9d1d4d67852b26b16d84e31d4a017470f9a
+++ packages/less/less_406.bb	d956d9d1d4d67852b26b16d84e31d4a017470f9a
@@ -0,0 +1,20 @@
+DESCRIPTION = "Less is a program similar to more, i.e. a terminal \
+based program for viewing text files and the output from other \
+programs. Less offers many features beyond those that more does."
+HOMEPAGE = "http://www.greenwoodsoftware.com/"
+SECTION = "console/utils"
+LICENSE = "BSD"
+DEPENDS = "ncurses"
+
+SRC_URI = "http://www.greenwoodsoftware.com/less/less-406.tar.gz "
+
+inherit autotools update-alternatives
+
+do_install () {
+        oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install
+        mv ${D}${bindir}/less ${D}${bindir}/less.${PN}
+}
+
+ALTERNATIVE_NAME = "less"
+ALTERNATIVE_PATH = "less.${PN}"
+ALTERNATIVE_PRIORITY = "100"


#
# mt diff -r1df70c8f4e39ea30b3a0d2231271e7883161ff19 -r652ba8904b6a89303952bc2a381a883001ceda70
#
# 
# 
# patch "packages/gnuplot/gnuplot_4.2.0.bb"
#  from [d0d263d1d61f807aceb758a99edb727172c050bf]
#    to [120e6f9d0bc3eff2d1ea2ed71cc801ee358cb0db]
# 
============================================================
--- packages/gnuplot/gnuplot_4.2.0.bb	d0d263d1d61f807aceb758a99edb727172c050bf
+++ packages/gnuplot/gnuplot_4.2.0.bb	120e6f9d0bc3eff2d1ea2ed71cc801ee358cb0db
@@ -8,7 +8,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
 	   file://subdirs.patch;patch=1 \
-           file://matrix.patch;patch=1 \
 	   file://gnuplot.desktop \
 	   file://gnuplot.png"