summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-06-14 23:57:56 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-14 23:57:56 +0000
commitfc9beec2c099a3179d3407aeb18a6f84e1696e93 (patch)
treeaea3533e4d93d6a8a1fdef5fa848483f3faa6189 /packages
parent57ad8dc08734e9ecb1026af0a712efabea4f611a (diff)
parent18d8eeb8c0504dbfdfe7f11931dd30dcdd5fbcb8 (diff)
merge of 619c2a2f86cda6fa47d337c32bb59fd59bfd2697
and 6c5f6dd92dc9e167c3598305801931820379802a
Diffstat (limited to 'packages')
-rw-r--r--packages/gammu/gammu_1.06.00.bb65
-rw-r--r--packages/gammu/gammu_1.07.00.bb76
-rw-r--r--packages/linux/linux-openzaurus_2.6.16.bb14
-rw-r--r--packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty0
-rw-r--r--packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch40
-rw-r--r--packages/opie-mediummount/opie-mediummount_1.2.1.bb7
6 files changed, 127 insertions, 75 deletions
diff --git a/packages/gammu/gammu_1.06.00.bb b/packages/gammu/gammu_1.06.00.bb
deleted file mode 100644
index 2611050afb..0000000000
--- a/packages/gammu/gammu_1.06.00.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-DESCRIPTION = "GNU All Mobile Managment Utilities"
-SECTION = "console/network"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
-AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
-PR = "r1"
-
-SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz "
-
-EXTRA_OECONF = "--disable-mysql"
-
-inherit autotools pkgconfig
-
-do_compile () {
- oe_runmake shared
-}
-
-# FIXME instead of ripping the complete autotools_stage_all, just because
-# FIXME gammu needs an additional install target (installshared), it might
-# FIXME be more appropriate to a) make the install target in autotools_stage_all
-# FIXME customizable or b) alter gammu makefall to make 'install' depend on 'installshared'. :M:
-do_stage() {
- rm -rf ${STAGE_TEMP}
- mkdir -p ${STAGE_TEMP}
- oe_runmake DESTDIR="${STAGE_TEMP}" install
- oe_runmake DESTDIR="${STAGE_TEMP}" installshared
- if [ -d ${STAGE_TEMP}/${includedir} ]; then
- cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
- fi
- if [ -d ${STAGE_TEMP}/${libdir} ]
- then
- for i in ${STAGE_TEMP}/${libdir}/*.la
- do
- if [ ! -f "$i" ]; then
- cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
- break
- fi
- oe_libinstall -so $(basename $i .la) ${STAGING_LIBDIR}
- done
- fi
- if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
- install -d ${STAGING_DATADIR}/aclocal
- cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
- fi
- rm -rf ${STAGE_TEMP}
-}
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' installshared
-}
-
-PACKAGES =+ "libgammu"
-
-FILES_${PN} = "${bindir}/gammu"
-FILES_libgammu = "${libdir}/libGammu.so*"
-
-PACKAGES_DYNAMIC = "gammu-locale-*"
-
-python populate_packages_prepend () {
- help_dir = bb.data.expand('${datadir}/gammu/', d)
-
- do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
-}
diff --git a/packages/gammu/gammu_1.07.00.bb b/packages/gammu/gammu_1.07.00.bb
new file mode 100644
index 0000000000..514819935c
--- /dev/null
+++ b/packages/gammu/gammu_1.07.00.bb
@@ -0,0 +1,76 @@
+DESCRIPTION = "GNU All Mobile Managment Utilities"
+SECTION = "console/network"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
+AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+
+SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz "
+
+EXTRA_OECONF = "--disable-mysql"
+
+inherit autotools
+
+do_compile () {
+ oe_runmake shared
+}
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \
+ ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
+ ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
+ ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku \
+ ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
+ ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
+ ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
+ ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
+ ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
+ ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
+ ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
+ ${STAGING_INCDIR}/gammu/protocol/alcatel
+
+ oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
+
+ install -m 0644 common/*.h ${STAGING_INCDIR}/gammu/
+ install -m 0644 common/misc/*.h ${STAGING_INCDIR}/gammu/misc
+ install -m 0644 common/misc/coding/*.h ${STAGING_INCDIR}/gammu/misc/coding
+ install -m 0644 common/phone/*.h ${STAGING_INCDIR}/gammu/phone
+ install -m 0644 common/phone/at/*.h ${STAGING_INCDIR}/gammu/phone/at
+ install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex
+ install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia
+ install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3
+ install -m 0644 common/phone/nokia/dct4tiku/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku
+ install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian
+ install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel
+ install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service
+ install -m 0644 common/service/sms/*.h ${STAGING_INCDIR}/gammu/service/sms
+ install -m 0644 common/service/backup/*.h ${STAGING_INCDIR}/gammu/service/backup
+ install -m 0644 common/device/*.h ${STAGING_INCDIR}/gammu/device
+ install -m 0644 common/device/irda/*.h ${STAGING_INCDIR}/gammu/device/irda
+ install -m 0644 common/device/bluetoth/*.h ${STAGING_INCDIR}/gammu/device/bluetoth
+ install -m 0644 common/device/serial/*.h ${STAGING_INCDIR}/gammu/device/serial
+ install -m 0644 common/protocol/*.h ${STAGING_INCDIR}/gammu/protocol
+ install -m 0644 common/protocol/at/*.h ${STAGING_INCDIR}/gammu/protocol/at
+ install -m 0644 common/protocol/obex/*.h ${STAGING_INCDIR}/gammu/protocol/obex
+ install -m 0644 common/protocol/nokia/*.h ${STAGING_INCDIR}/gammu/protocol/nokia
+ install -m 0644 common/protocol/symbian/*.h ${STAGING_INCDIR}/gammu/protocol/symbian
+ install -m 0644 common/protocol/alcatel/*.h ${STAGING_INCDIR}/gammu/protocol/alcatel
+}
+
+do_install () {
+ oe_runmake 'DESTDIR=${D}' installshared
+}
+
+PACKAGES =+ "libgammu"
+
+FILES_${PN} = "${bindir}/gammu"
+FILES_libgammu = "${libdir}/libGammu.so*"
+
+PACKAGES_DYNAMIC = "gammu-locale-*"
+
+python populate_packages_prepend () {
+ help_dir = bb.data.expand('${datadir}/gammu/', d)
+
+ do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
+}
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 54605cd26a..dc187ad3b4 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r34"
+PR = "r35"
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -106,12 +106,12 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
file://defconfig-qemuarm \
file://defconfig-tosa "
-SRC_URI_append_c7x0 = "file://oz-logo-640.patch.bz2;patch=1"
-SRC_URI_append_akita = "file://oz-logo-640.patch.bz2;patch=1"
-SRC_URI_append_spitz = "file://oz-logo-640.patch.bz2;patch=1"
-SRC_URI_append_collie = "file://oz-logo-240.patch.bz2;patch=1"
-SRC_URI_append_poodle = "file://oz-logo-240.patch.bz2;patch=1"
-SRC_URI_append_tosa = "file://oz-logo-480.patch.bz2;patch=1"
+SRC_URI_append_c7x0 = " file://oz-logo-640.patch.bz2;patch=1 "
+SRC_URI_append_akita = " file://oz-logo-640.patch.bz2;patch=1 "
+SRC_URI_append_spitz = " file://oz-logo-640.patch.bz2;patch=1 "
+SRC_URI_append_collie = " file://oz-logo-240.patch.bz2;patch=1 "
+SRC_URI_append_poodle = " file://oz-logo-240.patch.bz2;patch=1 "
+SRC_URI_append_tosa = " file://oz-logo-480.patch.bz2;patch=1 "
SRC_URI += "file://squashfs3.0-2.6.15.patch;patch=1"
diff --git a/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty b/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty
diff --git a/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch b/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch
new file mode 100644
index 0000000000..fd5542e392
--- /dev/null
+++ b/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch
@@ -0,0 +1,40 @@
+Index: mainwindow.cc
+===================================================================
+RCS file: /cvs/opie/noncore/settings/mediummount/mainwindow.cc,v
+retrieving revision 1.7
+diff -u -r1.7 mainwindow.cc
+--- mediummount/mainwindow.cc 19 Sep 2004 19:11:07 -0000 1.7
++++ mediummount/mainwindow.cc 14 Jun 2006 15:30:05 -0000
+@@ -1,5 +1,6 @@
+
+
++#include <qpe/config.h>
+ #include <qtabwidget.h>
+ #include <qlayout.h>
+ #include <qtooltip.h>
+@@ -20,15 +21,20 @@
+ : QDialog( parent, name, modal, WStyle_ContextHelp )
+
+ {
+- setCaption ( tr( "Medium Mount Settings" ));
++ Config c( "qpe" );
++ c.setGroup( "Startup" );
++ if ( c.readNumEntry( "FirstUse", 42 ) != 0 )
++ {
++ setCaption ( tr( "Medium Mount Settings" ));
+
+- m_lay = new QVBoxLayout( this );
++ m_lay = new QVBoxLayout( this );
+
+- m_tab = new QTabWidget( this );
++ m_tab = new QTabWidget( this );
+
+- m_lay->addWidget( m_tab );
++ m_lay->addWidget( m_tab );
+
+- init();
++ init();
++ }
+ }
+
+ MainWindow::~MainWindow()
diff --git a/packages/opie-mediummount/opie-mediummount_1.2.1.bb b/packages/opie-mediummount/opie-mediummount_1.2.1.bb
index 0c887950a8..0eaff4ad86 100644
--- a/packages/opie-mediummount/opie-mediummount_1.2.1.bb
+++ b/packages/opie-mediummount/opie-mediummount_1.2.1.bb
@@ -1,7 +1,8 @@
include ${PN}.inc
-
-
+
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ file://firststart-no-popup.patch;patch=1"