[oe-commits] org.oe.dev merge of '51181b2162a577bd188446458dc9adf512663dbb'

[coredump2 commit]

merge of '51181b2162a577bd188446458dc9adf512663dbb'
     and '9ffdda8ecbc743d98577c1b644c269dee54109e0'

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 4a9764846eca8e7a6608990c71feaab1b82bda1f
ViewMTN: http://monotone.openembedded.org/revision/info/4a9764846eca8e7a6608990c71feaab1b82bda1f
Files:
1
packages/fmtools
packages/fmtools/files
packages/fmtools/files/makefile.patch
packages/fmtools/fmtools_1.0.2.bb
packages/gammu/gammu_1.13.0.bb
packages/gammu/gammu_1.17.0.bb
packages/python/python-gammu_0.21.bb
packages/python/python-gammu_0.24.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
Diffs:

#
# mt diff -r51181b2162a577bd188446458dc9adf512663dbb -r4a9764846eca8e7a6608990c71feaab1b82bda1f
#
# 
# 
# add_dir "packages/fmtools"
# 
# add_dir "packages/fmtools/files"
# 
# add_file "packages/fmtools/files/makefile.patch"
#  content [9867b4fde17b60384925b1bd502bdde2cc250d30]
# 
# add_file "packages/fmtools/fmtools_1.0.2.bb"
#  content [4543389e888358f731bc6de60f770a46474047d5]
# 
============================================================
--- packages/fmtools/files/makefile.patch	9867b4fde17b60384925b1bd502bdde2cc250d30
+++ packages/fmtools/files/makefile.patch	9867b4fde17b60384925b1bd502bdde2cc250d30
@@ -0,0 +1,11 @@
+--- fmtools-1.0.2/Makefile	2002-08-17 06:05:09.000000000 +0200
++++ fmtools-1.0.2p/Makefile	2007-12-22 21:45:28.000000000 +0100
+@@ -1,8 +1,5 @@
+ # fmtools Makefile - just the basics for now
+ 
+-CC	= gcc
+-CFLAGS	= -Wall -O2
+-
+ INSTALL	= /usr/bin/install
+ 
+ # Since fmtools doesn't use configure, these paths are provided here
============================================================
--- packages/fmtools/fmtools_1.0.2.bb	4543389e888358f731bc6de60f770a46474047d5
+++ packages/fmtools/fmtools_1.0.2.bb	4543389e888358f731bc6de60f770a46474047d5
@@ -0,0 +1,15 @@
+DESCRIPTION = "fmtools - programs for Video for Linux radio cards"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.stanford.edu/~blp/fmtools/fmtools-1.0.2.tar.gz \
+           file://makefile.patch;patch=1"
+
+inherit autotools
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/fm ${D}${bindir}/fm
+    install -m 0755 ${S}/fmscan ${D}${bindir}/fmscan
+}
+


#
# mt diff -r9ffdda8ecbc743d98577c1b644c269dee54109e0 -r4a9764846eca8e7a6608990c71feaab1b82bda1f
#
# 
# 
# rename "packages/gammu/gammu_1.13.0.bb"
#     to "packages/gammu/gammu_1.17.0.bb"
# 
# rename "packages/python/python-gammu_0.21.bb"
#     to "packages/python/python-gammu_0.24.bb"
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [9bb6cf26f7a7451d99dda12e51b6584c26194aa5]
#    to [d0ef2c36f1b3189c7ab640814486bc42402933b7]
# 
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	9bb6cf26f7a7451d99dda12e51b6584c26194aa5
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	d0ef2c36f1b3189c7ab640814486bc42402933b7
@@ -174,7 +174,7 @@ PREFERRED_VERSION_clish ?= "0.7.1"
 PREFERRED_VERSION_classpath-minimal-native ?= "0.95"
 PREFERRED_VERSION_clearsilver ?= "0.10.3"
 PREFERRED_VERSION_clish ?= "0.7.1"
-PREFERRED_VERSION_cmake-native ?= "2.2.3"
+PREFERRED_VERSION_cmake-native ?= "2.4.7"
 PREFERRED_VERSION_cms92init ?= "0.1"
 PREFERRED_VERSION_compositeproto ?= "0.4"
 PREFERRED_VERSION_comprec ?= "0.02"
@@ -422,7 +422,7 @@ PREFERRED_VERSION_gamin ?= "0.1.8"
 PREFERRED_VERSION_galculator ?= "1.2.3"
 PREFERRED_VERSION_gallery ?= "1.5.5"
 PREFERRED_VERSION_gamin ?= "0.1.8"
-PREFERRED_VERSION_gammu ?= "1.13.0"
+PREFERRED_VERSION_gammu ?= "1.17.0"
 PREFERRED_VERSION_gawk ?= "3.1.4"
 PREFERRED_VERSION_gawk-native ?= "3.1.4"
 PREFERRED_VERSION_gcalctool ?= "5.7.32"
@@ -1169,7 +1169,6 @@ PREFERRED_VERSION_madplay ?= "0.15.2b"
 PREFERRED_VERSION_macchanger ?= "1.5.0"
 PREFERRED_VERSION_madfu ?= "1.2"
 PREFERRED_VERSION_madplay ?= "0.15.2b"
-PREFERRED_VERSION_madwifi-ng ?= "r2518-20070626"
 PREFERRED_VERSION_mahjongg ?= "1.0.0"
 PREFERRED_VERSION_mailutils ?= "0.3.1"
 PREFERRED_VERSION_mailx ?= "8.1.2-0.20050715cvs"
@@ -1502,7 +1501,7 @@ PREFERRED_VERSION_python-fpconst ?= "0.6
 PREFERRED_VERSION_python-fam ?= "1.1.1"
 PREFERRED_VERSION_python-fnorb ?= "1.3"
 PREFERRED_VERSION_python-fpconst ?= "0.6.0"
-PREFERRED_VERSION_python-gammu ?= "0.21"
+PREFERRED_VERSION_python-gammu ?= "0.24"
 PREFERRED_VERSION_python-gmpy ?= "1.0.1"
 PREFERRED_VERSION_python-gnosis ?= "1.2.2"
 PREFERRED_VERSION_python-gst ?= "0.10.8"