[oe-commits] org.oe.dev gnuplot: update 4.2.2, add 4.3.0+cvs

[xjqian commit]

gnuplot: update 4.2.2, add 4.3.0+cvs
* restructure patch directories
* update angstrom-preferred

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 08302dde2b0020a01fd78d658d7aa2d736941c62
ViewMTN: http://monotone.openembedded.org/revision/info/08302dde2b0020a01fd78d658d7aa2d736941c62
Files:
1
packages/gnuplot/gnuplot-4.2.0
packages/gnuplot/files/debian-separate-x11-package.patch
packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch
packages/gnuplot/files/matrix.patch
packages/gnuplot/gnuplot-4.0.0/matrix.patch
packages/gnuplot/files/subdirs.patch
packages/gnuplot/gnuplot-4.0.0/subdirs.patch
packages/gnuplot/files/term.patch
packages/gnuplot/gnuplot-4.0.0/term.patch
packages/gnuplot/gnuplot-4.2.0/subdirs.patch
packages/gnuplot/gnuplot-4.2.0/term.patch
packages/gnuplot/gnuplot_4.2.0.bb
packages/gnuplot/gnuplot_4.2.2.bb
packages/gnuplot/gnuplot-4.0.0
packages/gnuplot/gnuplot_cvs.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
Diffs:

#
# mt diff -rb5e43fe5c6d401e028b978c17ce615d2a97900ef -r08302dde2b0020a01fd78d658d7aa2d736941c62
#
# 
# 
# delete "packages/gnuplot/gnuplot-4.2.0"
# 
# rename "packages/gnuplot/files/debian-separate-x11-package.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch"
# 
# rename "packages/gnuplot/files/matrix.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/matrix.patch"
# 
# rename "packages/gnuplot/files/subdirs.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/subdirs.patch"
# 
# rename "packages/gnuplot/files/term.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/term.patch"
# 
# rename "packages/gnuplot/gnuplot-4.2.0/subdirs.patch"
#     to "packages/gnuplot/files/subdirs.patch"
# 
# rename "packages/gnuplot/gnuplot-4.2.0/term.patch"
#     to "packages/gnuplot/files/term.patch"
# 
# rename "packages/gnuplot/gnuplot_4.2.0.bb"
#     to "packages/gnuplot/gnuplot_4.2.2.bb"
# 
# add_dir "packages/gnuplot/gnuplot-4.0.0"
# 
# add_file "packages/gnuplot/gnuplot_cvs.bb"
#  content [fc07214c5ba39477584bd102d53aa602c87ab77c]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [cb176be489c8cc84cc322cac2f96f85758f594fe]
#    to [c768b9d1c19df1d7e887abfa05c239ccf9218529]
# 
# patch "packages/gnuplot/gnuplot_4.2.2.bb"
#  from [03f32275753ca6d0330c16d5e953d3076ae0a61c]
#    to [2735c3e3ef088dab319af681d7d090294056717c]
# 
============================================================
--- packages/gnuplot/gnuplot_cvs.bb	fc07214c5ba39477584bd102d53aa602c87ab77c
+++ packages/gnuplot/gnuplot_cvs.bb	fc07214c5ba39477584bd102d53aa602c87ab77c
@@ -0,0 +1,17 @@
+require gnuplot.inc
+
+PV = "4.3.0+cvs${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@gnuplot.cvs.sourceforge.net/cvsroot/${PN};module=${PN} \
+           http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
+           file://subdirs.patch;patch=1 \
+           file://term.patch;patch=1 \
+           file://gnuplot.desktop \
+           file://gnuplot.png"
+
+S = "${WORKDIR}/${PN}"
+
+do_configure_prepend() {
+           ./prepare
+}
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	cb176be489c8cc84cc322cac2f96f85758f594fe
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	c768b9d1c19df1d7e887abfa05c239ccf9218529
@@ -509,7 +509,7 @@ PREFERRED_VERSION_gnupg ?= "1.4.2.2"
 PREFERRED_VERSION_gnuchess ?= "5.05"
 PREFERRED_VERSION_gnumeric ?= "1.6.3"
 PREFERRED_VERSION_gnupg ?= "1.4.2.2"
-PREFERRED_VERSION_gnuplot ?= "4.2.0"
+PREFERRED_VERSION_gnuplot ?= "4.2.2"
 PREFERRED_VERSION_gnuradio ?= "3.0.4"
 PREFERRED_VERSION_gnutls ?= "1.6.3"
 PREFERRED_VERSION_gob2 ?= "2.0.14"
============================================================
--- packages/gnuplot/gnuplot_4.2.0.bb	03f32275753ca6d0330c16d5e953d3076ae0a61c
+++ packages/gnuplot/gnuplot_4.2.2.bb	2735c3e3ef088dab319af681d7d090294056717c
@@ -1,6 +1,6 @@ require gnuplot.inc
 require gnuplot.inc
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
            http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \