diff options
Diffstat (limited to 'packages')
44 files changed, 313 insertions, 55 deletions
diff --git a/packages/dbus/dbus-native_0.50.bb b/packages/dbus/dbus-native_0.50.bb new file mode 100644 index 0000000000..916f7ad8e2 --- /dev/null +++ b/packages/dbus/dbus-native_0.50.bb @@ -0,0 +1,16 @@ +include dbus_${PV}.inc + +SRC_URI_EXTRA="" + +inherit native + +S = "${WORKDIR}/dbus-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus" +DEPENDS = "glib-2.0-native" + +do_stage() { + install -d ${STAGING_DATADIR}/dbus + install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus + install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus +} + diff --git a/packages/git/.mtn2git_empty b/packages/git/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/git/.mtn2git_empty diff --git a/packages/git/files/.mtn2git_empty b/packages/git/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/git/files/.mtn2git_empty diff --git a/packages/git/files/Makefile.patch b/packages/git/files/Makefile.patch new file mode 100644 index 0000000000..0a82649db9 --- /dev/null +++ b/packages/git/files/Makefile.patch @@ -0,0 +1,13 @@ +Index: git-snapshot-20050912/Makefile +=================================================================== +--- git-snapshot-20050912.orig/Makefile 2005-09-11 03:46:53.000000000 +0100 ++++ git-snapshot-20050912/Makefile 2005-09-12 12:18:38.000000000 +0100 +@@ -239,7 +240,7 @@ + $(CC) -o $*.o -c $(ALL_CFLAGS) $< + + git-%: %.o $(LIB_FILE) +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) ++ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) + + git-mailinfo : SIMPLE_LIB += $(LIB_4_ICONV) + $(SIMPLE_PROGRAMS) : $(LIB_FILE) diff --git a/packages/git/git-native.bb b/packages/git/git-native.bb new file mode 100644 index 0000000000..1bd495f085 --- /dev/null +++ b/packages/git/git-native.bb @@ -0,0 +1,8 @@ +include git.bb +inherit native + +do_stage () { + oe_runmake install bindir=${STAGING_BINDIR} \ + template_dir=${STAGING_DIR}/${BUILD_SYS}/share/git-core/templates/ \ + GIT_PYTHON_DIR=${STAGING_DIR}/${BUILD_SYS}/share/git-core/python +} diff --git a/packages/git/git.bb b/packages/git/git.bb new file mode 100644 index 0000000000..3a1228d621 --- /dev/null +++ b/packages/git/git.bb @@ -0,0 +1,21 @@ +SECTION = "console/utils" +LICENSE = "GPL" +DESCRIPTION = "The git revision control system used by the Linux kernel developers" +DEPENDS = "openssl curl" +MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>" + +PKGDATE = "${@time.strftime('%Y-%m-%d',time.gmtime())}" + +SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz \ + file://Makefile.patch;patch=1" + +S = "${WORKDIR}/git-snapshot-${DATE}" + +FILES_${PN} += "${datadir}/git-core" + +do_install () { + oe_runmake install prefix=${D} bindir=${D}${bindir} \ + template_dir=${D}${datadir}/git-core/templates \ + GIT_PYTHON_DIR=${D}${datadir}/git-core/python +} + diff --git a/packages/gpe-bluetooth/files/.mtn2git_empty b/packages/gpe-bluetooth/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-bluetooth/files/.mtn2git_empty diff --git a/packages/gpe-bluetooth/files/bluez-pin-gpe.glade b/packages/gpe-bluetooth/files/bluez-pin-gpe.glade new file mode 100644 index 0000000000..379ec5499a --- /dev/null +++ b/packages/gpe-bluetooth/files/bluez-pin-gpe.glade @@ -0,0 +1,182 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> +<requires lib="gnome"/> + +<widget class="GtkDialog" id="dialog1"> + <property name="visible">True</property> + <property name="title" translatable="yes">Bluetooth PIN</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_NONE</property> + <property name="modal">False</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="cancelbutton1"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="response_id">-6</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="okbutton1"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-ok</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="response_id">-5</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">8</property> + <property name="ypad">8</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Connection type</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">4</property> + + <child> + <widget class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">_PIN:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">entry1</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char" translatable="yes">*</property> + <property name="activates_default">False</property> + <accessibility> + <atkrelation target="entry1" type="label-for"/> + </accessibility> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb index 6a4e6dc907..cce7301b38 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb @@ -7,9 +7,16 @@ RDEPENDS = "bluez-utils-dbus blueprobe" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \ + file://bluez-pin-gpe.glade" FILES_${PN} += '${datadir}/bluez-pin' +do_install_append() { +install -d ${D}${datadir}/bluez-pin +install -m 644 ${WORKDIR}/bluez-pin-gpe.glade ${D}${datadir}/bluez-pin/ + +} + diff --git a/packages/module-init-tools/module-init-tools_3.2-pre7.bb b/packages/module-init-tools/module-init-tools_3.2-pre7.bb index 41aea223fe..017f288e7d 100644 --- a/packages/module-init-tools/module-init-tools_3.2-pre7.bb +++ b/packages/module-init-tools/module-init-tools_3.2-pre7.bb @@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \ the same function that the modutils package serves for Linux 2.4." LICENSE = "GPL" SECTION = "base" -PR = "r0" +PR = "r1" PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" RDEPENDS_${PN} += "module-init-tools-depmod" @@ -34,18 +34,22 @@ do_install() { pkg_postinst_module-init-tools() { #!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do bn=`basename $f` update-alternatives --install /$f $bn /$f.26 20 done +update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60 +update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60 } pkg_prerm_module-init-tools() { #!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do bn=`basename $f` update-alternatives --remove $bn /$f.26 done +update-alternatives --remove bin-lsmod /bin/lsmod.26 +update-alternatives --remove lsmod /bin/lsmod.26 } pkg_postinst_module-init-tools-depmod() { diff --git a/packages/opie-batteryapplet/opie-batteryapplet.inc b/packages/opie-batteryapplet/opie-batteryapplet.inc index bac400d95d..3df9f40f00 100644 --- a/packages/opie-batteryapplet/opie-batteryapplet.inc +++ b/packages/opie-batteryapplet/opie-batteryapplet.inc @@ -12,12 +12,12 @@ inherit opie pkg_postinst() { #!/bin/sh +if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" else exit 0 fi - if [ -n "$D" ]; then false; fi } pkg_postrm() { diff --git a/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb b/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb index cb561d860d..3feba24a63 100644 --- a/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb +++ b/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/batteryapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb index 3260d8052f..a092b795bf 100644 --- a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb +++ b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/batteryapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet.inc b/packages/opie-clipboardapplet/opie-clipboardapplet.inc index 03d75bef7f..b0340c0f1a 100644 --- a/packages/opie-clipboardapplet/opie-clipboardapplet.inc +++ b/packages/opie-clipboardapplet/opie-clipboardapplet.inc @@ -12,10 +12,10 @@ inherit opie pkg_postinst() { #!/bin/sh +if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" fi - if [ -n "$D" ]; then false; fi } pkg_postrm() { diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb index b799edfa67..a9d681b5b9 100644 --- a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb +++ b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clipboardapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb index 4c204aad92..4c63f7c108 100644 --- a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb +++ b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clipboardapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-clockapplet/opie-clockapplet.inc b/packages/opie-clockapplet/opie-clockapplet.inc index c312b1f2b8..ddf4d92677 100644 --- a/packages/opie-clockapplet/opie-clockapplet.inc +++ b/packages/opie-clockapplet/opie-clockapplet.inc @@ -12,10 +12,10 @@ inherit opie pkg_postinst() { #!/bin/sh +if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" fi - if [ -n "$D" ]; then false; fi } pkg_postrm() { diff --git a/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb b/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb index e315cd4c46..9d4dfa7723 100644 --- a/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb +++ b/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb index cbe50f3b64..d8be3b0402 100644 --- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb +++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-irdaapplet/opie-irdaapplet.inc b/packages/opie-irdaapplet/opie-irdaapplet.inc index 873515f358..56620416fb 100644 --- a/packages/opie-irdaapplet/opie-irdaapplet.inc +++ b/packages/opie-irdaapplet/opie-irdaapplet.inc @@ -12,10 +12,10 @@ inherit opie pkg_postinst() { #!/bin/sh +if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" fi - if [ -n "$D" ]; then false; fi } pkg_postrm() { diff --git a/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb b/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb index 10cacd8a75..0dda1a3918 100644 --- a/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb +++ b/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/irdaapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb index 3972be6cba..be475273c5 100644 --- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb +++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-lockapplet/opie-lockapplet.inc b/packages/opie-lockapplet/opie-lockapplet.inc index 10bf61eb4e..d54c854236 100644 --- a/packages/opie-lockapplet/opie-lockapplet.inc +++ b/packages/opie-lockapplet/opie-lockapplet.inc @@ -14,10 +14,10 @@ inherit opie pkg_postinst() { #!/bin/sh +if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" fi - if [ -n "$D" ]; then false; fi } pkg_postrm() { diff --git a/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb b/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb index 46163c7323..add4ad4b4f 100644 --- a/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb +++ b/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/lockapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/opie-lockapplet/opie-lockapplet_cvs.bb b/packages/opie-lockapplet/opie-lockapplet_cvs.bb index b800a9b334..29521fc3cc 100644 --- a/packages/opie-lockapplet/opie-lockapplet_cvs.bb +++ b/packages/opie-lockapplet/opie-lockapplet_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/lockapplet \ ${HANDHELDS_CVS};module=opie/pics " diff --git a/packages/opie-memoryapplet/opie-memoryapplet.inc b/packages/opie-memoryapplet/opie-memoryapplet.inc index eb1e17919f..b67321412f 100644 --- a/packages/opie-memoryapplet/opie-memoryapplet.inc +++ b/packages/opie-memoryapplet/opie-memoryapplet.inc @@ -11,10 +11,10 @@ inherit opie pkg_postinst() { #!/bin/sh +if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" fi - if [ -n "$D" ]; then false; fi } pkg_postrm() { diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb index 4c33d73086..0947c45cc1 100644 --- a/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb +++ b/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \ diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb index 93dc9ecba1..404b0b981d 100644 --- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb +++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/memoryapplet \ ${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \ diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet.inc b/packages/opie-multikeyapplet/opie-multikeyapplet.inc index 5b46c5fbec..5f32d6595c 100644 --- a/packages/opie-multikeyapplet/opie-multikeyapplet.inc +++ b/packages/opie-multikeyapplet/opie-multikeyapplet.inc @@ -12,10 +12,10 @@ inherit opie pkg_postinst() { #!/bin/sh +if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" fi - if [ -n "$D" ]; then false; fi } pkg_postrm() { diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb index 1f2acddb65..ee8694a02d 100644 --- a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb +++ b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/multikeyapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb index 209cbbf012..d11b191f73 100644 --- a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb +++ b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb index c3b043c7dc..15a76efde0 100644 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb +++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb @@ -1,8 +1,6 @@ include ${PN}.inc - + PR = "r0" -# don't consider this file yet, use CVS -PV = "0.0.0" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb index 8b1a7ab2b7..b5c913e29a 100644 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb +++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pcmcia \ diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc index b3655c54f6..706fe4d434 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc @@ -9,10 +9,10 @@ inherit opie pkg_postinst() { #!/bin/sh +if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" fi - if [ -n "$D" ]; then false; fi } pkg_postrm() { diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb index 0a3851cf9d..3e3dc6d919 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb index f504159802..db20019c6c 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pyquicklaunch \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet.inc b/packages/opie-screenshotapplet/opie-screenshotapplet.inc index 951e81b709..1ff889ab20 100644 --- a/packages/opie-screenshotapplet/opie-screenshotapplet.inc +++ b/packages/opie-screenshotapplet/opie-screenshotapplet.inc @@ -13,16 +13,16 @@ inherit opie pkg_postinst() { #!/bin/sh +if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" fi - if [ -n "$D" ]; then false; fi } pkg_postrm() { #!/bin/sh +if [ -n "$D" ]; then false; fi /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" - if [ -n "$D" ]; then false; fi } # FILES plugins/applets/libscreenshotapplet.so* diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb index da266ce171..ccc414ef94 100644 --- a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb +++ b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/screenshotapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb index 136739d68c..54f64162ab 100644 --- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb +++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-volumeapplet/opie-volumeapplet.inc b/packages/opie-volumeapplet/opie-volumeapplet.inc index 648effe846..c253857611 100644 --- a/packages/opie-volumeapplet/opie-volumeapplet.inc +++ b/packages/opie-volumeapplet/opie-volumeapplet.inc @@ -12,10 +12,10 @@ inherit opie pkg_postinst() { #!/bin/sh +if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" fi - if [ -n "$D" ]; then false; fi } pkg_postrm() { diff --git a/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb b/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb index 96cf720327..38cf693d0e 100644 --- a/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb +++ b/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/volumeapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb index be79bbd2d3..259291d79f 100644 --- a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb +++ b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/volumeapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb index bc41020b71..734dc310fb 100644 --- a/packages/syslog-ng/syslog-ng_1.6.8.bb +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -1,7 +1,7 @@ -PR = "r7" +PR = "r8" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" DESCRIPTION = "Alternative system logger daemon" -DEPENDS = "libol" +DEPENDS = "libol flex" SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \ file://initscript" diff --git a/packages/zaurus-updater/spitz/updater.sh b/packages/zaurus-updater/spitz/updater.sh index a0483a1371..07d81b1bda 100755 --- a/packages/zaurus-updater/spitz/updater.sh +++ b/packages/zaurus-updater/spitz/updater.sh @@ -44,7 +44,6 @@ Cleanup(){ rm -f $VTMPNAME > /dev/null 2>&1 rm -f $MTMPNAME > /dev/null 2>&1 rm $CTRLPATH/* > /dev/null 2>&1 - rm $DATAPATH/* > /dev/null 2>&1 exit $1 } trap 'Cleanup 1' 1 15 @@ -95,9 +94,9 @@ fi ### Check that we have a valid tar for TARNAME in gnu-tar GNU-TAR do - if [ -e /mnt/cf/$TARNAME ] + if [ -e $DATAPATH/$TARNAME ] then - TARBIN=/mnt/cf/$TARNAME + TARBIN=$DATAPATH/$TARNAME fi done |