diff options
Diffstat (limited to 'packages')
263 files changed, 901 insertions, 414 deletions
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb index a322dacdd9..de5d780579 100644 --- a/packages/altboot/altboot.bb +++ b/packages/altboot/altboot.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" -PR = "r8" +PR = "r9" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 5c28edb5f3..2b7df14c86 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -243,7 +243,7 @@ wait_for_input() { # * * * * * * This is the main function * * * * * * -if ! test -z "$*" +if test -n "$*" -a "$*" != "tty1" then echo "altboot: Using real init [$REAL_INIT] [$*] *" >/dev/tty1 exec $REAL_INIT $* diff --git a/packages/atd/atd_0.70.bb b/packages/atd/atd_0.70.bb index 5ba524b916..9862fac0dd 100644 --- a/packages/atd/atd_0.70.bb +++ b/packages/atd/atd_0.70.bb @@ -4,10 +4,10 @@ LICENSE = "GPLV2" RCONFLICTS = "at" RREPLACES = "at" -PR = "r3" +PR = "r4" SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \ - file://no-oknodo.patch;patch=1" + file://atd-startup.patch;patch=1;pnum=0" S = "${WORKDIR}/atd" inherit update-rc.d diff --git a/packages/atd/files/atd-startup.patch b/packages/atd/files/atd-startup.patch new file mode 100644 index 0000000000..dc4c1195d1 --- /dev/null +++ b/packages/atd/files/atd-startup.patch @@ -0,0 +1,39 @@ +? atd-startup.patch +Index: ChangeLog +=================================================================== +RCS file: /cvs/apps/atd/ChangeLog,v +retrieving revision 1.2 +diff -B -b -u -r1.2 ChangeLog +--- ChangeLog 2 Feb 2004 15:30:39 -0000 1.2 ++++ ChangeLog 13 Jan 2006 11:54:00 -0000 +@@ -1,3 +1,8 @@ ++2006-01-13 Florian Boor <florian@kernelconcepts.de> ++ ++ * dist/etc/init.d/atd: Remove obsolete --oknodo and add -m to ++ enable pidfile. ++ + V0.7 + - removed waiting for childpid after having spawned an event + this caused trouble with events rescheduling themselves +Index: dist/etc/init.d/atd +=================================================================== +RCS file: /cvs/apps/atd/dist/etc/init.d/atd,v +retrieving revision 1.3 +diff -B -b -u -r1.3 atd +--- dist/etc/init.d/atd 24 Jan 2003 15:09:03 -0000 1.3 ++++ dist/etc/init.d/atd 13 Jan 2006 11:54:00 -0000 +@@ -11,12 +11,12 @@ + echo -n "Starting at daemon: atd" + mkdir -p /var/spool/at + chmod a+w /var/spool/at +- start-stop-daemon --start --quiet --pidfile /var/run/atd.pid --exec /usr/sbin/atd /var/spool/at >/dev/null 2>&1 & ++ start-stop-daemon --start --quiet -m --pidfile /var/run/atd.pid --exec /usr/sbin/atd /var/spool/at >/dev/null 2>&1 & + echo "." + ;; + stop) + echo -n "Stopping at daemon: atd" +- start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/atd.pid --exec /usr/sbin/atd ++ start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid --exec /usr/sbin/atd + rm -f /var/spool/at/trigger + echo "." + ;; diff --git a/packages/opie-securityplugins/opie-securityplugins.inc b/packages/blueprobe/blueprobe-0.16/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-securityplugins/opie-securityplugins.inc +++ b/packages/blueprobe/blueprobe-0.16/.mtn2git_empty diff --git a/packages/blueprobe/blueprobe-0.16/h6300.patch b/packages/blueprobe/blueprobe-0.16/h6300.patch new file mode 100644 index 0000000000..39de7758b0 --- /dev/null +++ b/packages/blueprobe/blueprobe-0.16/h6300.patch @@ -0,0 +1,17 @@ +diff -Naur blueprobe-0.15_orig/blueprobe.init blueprobe-0.15_h6300_fix/blueprobe.init +--- blueprobe-0.15_orig/blueprobe.init 2005-10-05 22:37:35.706302041 +0300 ++++ blueprobe-0.15_h6300_fix/blueprobe.init 2005-10-05 22:54:51.840676832 +0300 +@@ -57,6 +57,13 @@ + SCRIPT=/etc/bluetooth/TIInit_3.2.26.bts + PROBE=no + ;; ++ "HP iPAQ H6300") ++ BLUETOOTH=yes ++ PORT=/dev/ttyS0 ++ SPEED=115200 ++ PROTO=texas ++ PROBE=no ++ ;; + *) + BLUETOOTH=no + ;; diff --git a/packages/blueprobe/blueprobe-0.16/hx4700.patch b/packages/blueprobe/blueprobe-0.16/hx4700.patch new file mode 100644 index 0000000000..69610e8c7b --- /dev/null +++ b/packages/blueprobe/blueprobe-0.16/hx4700.patch @@ -0,0 +1,30 @@ +--- blueprobe-0.14/blueprobe.init.orig 2005-09-05 22:03:57 +0200 ++++ blueprobe-0.14/blueprobe.init 2005-09-05 22:09:34 +0200 +@@ -47,6 +47,18 @@ + PROTO=bcsp + PROBE=yes + ;; ++ "HP iPAQ HX4700") ++ BLUETOOTH=yes ++ PORT=/dev/ttyS1 ++ PROTO=texas ++ SCRIPT=/etc/bluetooth/TIInit_3.2.26.bts ++ if [ -f "$SCRIPT" ]; then ++ SPEED=921600 ++ else ++ SPEED=115200 ++ fi ++ PROBE=no ++ ;; + *) + BLUETOOTH=no + ;; +@@ -67,5 +75,8 @@ + echo "BLUETOOTH_PORT=$PORT" >>/etc/sysconfig/bluetooth + echo "BLUETOOTH_SPEED=$SPEED" >>/etc/sysconfig/bluetooth + echo "BLUETOOTH_PROTOCOL=$PROTO" >>/etc/sysconfig/bluetooth ++ if [ "$SCRIPT" != "" ] && [ -f "$SCRIPT" ]; then ++ echo "BLUETOOTH_SCRIPT=$SCRIPT" >>/etc/sysconfig/bluetooth ++ fi + fi + fi diff --git a/packages/blueprobe/blueprobe_0.16.bb b/packages/blueprobe/blueprobe_0.16.bb index e54d2ed066..7ec102d0eb 100644 --- a/packages/blueprobe/blueprobe_0.16.bb +++ b/packages/blueprobe/blueprobe_0.16.bb @@ -2,3 +2,7 @@ SECTION = "base" LICENSE = "GPL" inherit gpe +PR = "r1" + +SRC_URI += "file://hx4700.patch;patch=1 \ + file://h6300.patch;patch=1" diff --git a/packages/btsco/.mtn2git_empty b/packages/btsco/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/btsco/.mtn2git_empty diff --git a/packages/btsco/btsco-module-0.41/.mtn2git_empty b/packages/btsco/btsco-module-0.41/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/btsco/btsco-module-0.41/.mtn2git_empty diff --git a/packages/btsco/btsco-module-0.41/makefile.patch b/packages/btsco/btsco-module-0.41/makefile.patch new file mode 100644 index 0000000000..cf57b59475 --- /dev/null +++ b/packages/btsco/btsco-module-0.41/makefile.patch @@ -0,0 +1,16 @@ +--- btsco-0.41/kernel/Makefile.orig 2006-01-13 00:32:58.000000000 +0100 ++++ btsco-0.41/kernel/Makefile 2006-01-13 00:33:35.000000000 +0100 +@@ -10,10 +10,10 @@ + + + default: +- @make -C /lib/modules/`uname -r`/build M=`pwd` modules ++ $(MAKE) -C $(KERNEL_SRC) M=`pwd` modules + + install: +- @make -C /lib/modules/`uname -r`/build M=`pwd` modules_install ++ $(MAKE) -C $(KERNEL_SRC) M=`pwd` modules_install + + clean: +- @make -C /lib/modules/`uname -r`/build M=`pwd` clean ++ $(MAKE) -C $(KERNEL_SRC) M=`pwd` clean diff --git a/packages/btsco/btsco-module_0.41.bb b/packages/btsco/btsco-module_0.41.bb new file mode 100644 index 0000000000..c4997cf5bd --- /dev/null +++ b/packages/btsco/btsco-module_0.41.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Bluetooth-alsa headset module" +SECTION = "kernel/modules" +HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/" +LICENSE = "GPL" +DEPENDS = "alsa-lib bluez-libs" + +inherit module + +SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-0.41.tar.gz \ + file://makefile.patch;patch=1" + +S = "${WORKDIR}/btsco-${PV}/kernel" + +MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" + +do_install() { + install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra + install -m 0644 ${S}/snd-bt-sco${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/ +} diff --git a/packages/btsco/btsco_0.41.bb b/packages/btsco/btsco_0.41.bb new file mode 100644 index 0000000000..dae5877483 --- /dev/null +++ b/packages/btsco/btsco_0.41.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Bluetooth-alsa headset tool" +HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/" +LICENSE = "GPL" +MAINTAINER = "Robert Woerle <robert@linuxdevelopment.de>" +DEPENDS = "alsa-lib bluez-libs" + +inherit autotools pkgconfig + +SRC_URI = "${SOURCEFORGE_MIRROR}/bluetooth-alsa/btsco-0.41.tar.gz" + +S = "${WORKDIR}/${PN}-${PV}" diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb index ff58977b11..9fdad829b9 100644 --- a/packages/cumulus/cumulus_cvs.bb +++ b/packages/cumulus/cumulus_cvs.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" APPTYPE = "binary" APPNAME = "cumulus" APPDESKTOP = "${S}" -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r0" SRC_URI = "http://www.kflog.org/fileadmin/user_upload/cumulus_snapshots/cumulus-snapshot.tbz" diff --git a/packages/ffmpeg/ffmpeg_cvs.bb b/packages/ffmpeg/ffmpeg_cvs.bb index 3973ce0f48..bfd68eb3e2 100644 --- a/packages/ffmpeg/ffmpeg_cvs.bb +++ b/packages/ffmpeg/ffmpeg_cvs.bb @@ -1,4 +1,5 @@ -PV = "0.4.9-pre1+cvs${SRCDATE}" +#Remove the dash after cvs below when 0.4.9 changes in PV +PV = "0.4.9-pre1+cvs-${SRCDATE}" DESCRIPTION = "ffmpeg" SECTION = "libs" PRIORITY = "optional" diff --git a/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/gaim/gaim_2.0.0-cvs-mco1.bb index 7160d8120f..8ff63ee8b9 100644 --- a/packages/gaim/gaim_2.0.0-cvs-mco1.bb +++ b/packages/gaim/gaim_2.0.0-cvs-mco1.bb @@ -1,6 +1,7 @@ PR = "r3" SRCDATE_${PN} = "20050904" -PV = "2.0.0+cvs${SRCDATE}-mco1" +#Change to x.y.z+cvs${SRCDATE}-mco1 when 2.0.0 changes +PV = "2.0.0-cvs-mco1-${SRCDATE}" WEBCVSURL = "http://handhelds.org/cgi-bin/cvsweb.cgi/~checkout~/gaim" diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb index 3daaf44c19..801ec7dd25 100644 --- a/packages/gaim/gaim_cvs.bb +++ b/packages/gaim/gaim_cvs.bb @@ -1,5 +1,6 @@ PR = "r0" -PV = "2.0+cvs${SRCDATE}" +#Remove the dash below when 2.0 changes in PV +PV = "2.0+cvs-${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ file://no-superimposed-version-on-logo.patch;patch=1 \ diff --git a/packages/gchub/gchub-module_svn.bb b/packages/gchub/gchub-module_svn.bb index fe951aaa4e..676e0b0804 100644 --- a/packages/gchub/gchub-module_svn.bb +++ b/packages/gchub/gchub-module_svn.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Kernel module for the GameCube Hub input device" DEPENDS = "virtual/kernel" MAINTAINER = "Micah Dowty <micah@navi.cx>" LICENSE = "GPL" -PV = "0.0+svn${SRCDATE}" +PV = "1:0.0+svn${SRCDATE}" SRC_URI = "svn://svn.navi.cx/misc/trunk/wasabi/devices;module=gchub;proto=http" diff --git a/packages/git/git.bb b/packages/git/git.bb index 3a1228d621..0bd00f8c93 100644 --- a/packages/git/git.bb +++ b/packages/git/git.bb @@ -6,8 +6,7 @@ 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" +SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz" S = "${WORKDIR}/git-snapshot-${DATE}" diff --git a/packages/gomunicator/gomunicator_cvs.bb b/packages/gomunicator/gomunicator_cvs.bb index 3c3f9352c7..d45d467d45 100644 --- a/packages/gomunicator/gomunicator_cvs.bb +++ b/packages/gomunicator/gomunicator_cvs.bb @@ -4,7 +4,8 @@ LICENSE = "GPLv2" AUTHOR = "Robert Woerle" MAINTAINER = "Koen Kooi <koen@handhelds.org>" DEPENDS = "libgpewidget gtk+ glib-2.0" -PV = "0.1.3+cvs${SRCDATE}" +#Remove the dash below when 0.1.3 changes in PV +PV = "0.1.3+cvs-${SRCDATE}" inherit autotools pkgconfig diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb index 302d78d109..86e5cabcf0 100644 --- a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb +++ b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb @@ -7,7 +7,8 @@ SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox" DEPENDS = "libgpewidget libgpelaunch" S = "${WORKDIR}/${PN}" -PV = "0.5+cvs${SRCDATE}" +#Remove the dash below when 0.5 changes in PV +PV = "0.5+cvs-${SRCDATE}" PR = "r0" inherit autotools diff --git a/packages/gpe-calendar/gpe-calendar_0.68.bb b/packages/gpe-calendar/gpe-calendar_0.68.bb new file mode 100644 index 0000000000..3c8fbbc148 --- /dev/null +++ b/packages/gpe-calendar/gpe-calendar_0.68.bb @@ -0,0 +1,12 @@ +LICENSE = "GPL" +PR = "r0" +GPE_TARBALL_SUFFIX = "bz2" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" + +inherit autotools gpe + +DEPENDS = "libeventdb libschedule libxsettings-client libgpepimc libgpevtype" +SECTION = "gpe" +RDEPENDS = "gpe-icons" +DESCRIPTION = "GPE calendar" + diff --git a/packages/gpe-clock/gpe-clock_0.23.bb b/packages/gpe-clock/gpe-clock_0.23.bb new file mode 100644 index 0000000000..51b001208b --- /dev/null +++ b/packages/gpe-clock/gpe-clock_0.23.bb @@ -0,0 +1,9 @@ +inherit gpe + +DESCRIPTION = "GPE panel clock" +DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" +RDEPENDS = "gpe-announce atd" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" + diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb new file mode 100644 index 0000000000..4a09fb827d --- /dev/null +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb @@ -0,0 +1,51 @@ +SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz" +DESCRIPTION = "A lightweight webbrowser for the GPE platform" +LICENSE = "GPL" +DEPENDS = "osb-nrcit sqlite libgpewidget" +RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" + + +S = "${WORKDIR}/gpe-mini-browser-${PV}" + +inherit autotools + +do_install() { + install -d ${D}/usr/share/applications + install -m 0644 ${S}/gpe-mini-browser.desktop ${D}/usr/share/applications/gpe-mini-browser.desktop + install -d ${D}/usr/share/pixmaps + install -m 0644 ${S}/gpe-mini-browser.png ${D}/usr/share/pixmaps/gpe-mini-browser.png + autotools_do_install +} + +pkg_postinst_${PN}-doc () { + #!/bin/sh + if [ "x$D" != "x" ]; then + if [ -e /etc/gpe/gpe-help.conf ]; then + echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf + else + echo [Help] >> /etc/gpe/gpe-help.conf + echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf + fi + if [ -x /usr/bin/gpe-helpindex ]; then + echo generating help-index + gpe-helpindex + else + echo not generating index for gpe-mini-browser + fi + fi +} + +pkg_postrm_${PN}-doc () { + #!/bin/sh + if [ -e /etc/gpe/gpe-help.conf ]; then + sed '/^\<gpe-mini-browser\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf + mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf + fi + if [ -x /usr/bin/gpe-helpindex ]; then + echo generating help-index + gpe-helpindex + else + echo not generating index for gpe-mini-browser + fi +} + diff --git a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb index 2f5574d91b..d2e9ed6edb 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb @@ -1,5 +1,5 @@ PR = "r2" -PV = "0.17+cvs${SRCDATE}" +PV = "0.18+cvs${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-mini-browser" DESCRIPTION = "A lightweight webbrowser for the GPE platform" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.21.bb b/packages/gpe-timesheet/gpe-timesheet_0.21.bb new file mode 100644 index 0000000000..0cd8b539f0 --- /dev/null +++ b/packages/gpe-timesheet/gpe-timesheet_0.21.bb @@ -0,0 +1,9 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "GPE time tracker" +DEPENDS = "libgpewidget gtk+ sqlite" +SECTION = "gpe" +RDEPENDS = "gpe-icons" + +SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz" diff --git a/packages/gpe-today/gpe-today_cvs.bb b/packages/gpe-today/gpe-today_cvs.bb index 1ce5babfbb..33af763f07 100644 --- a/packages/gpe-today/gpe-today_cvs.bb +++ b/packages/gpe-today/gpe-today_cvs.bb @@ -7,7 +7,8 @@ PRIORITY = "optional" S = "${WORKDIR}/${PN}" -PV = "0.10+cvs${SRCDATE}" +#Remove the dash below when 0.10 changes in PV +PV = "0.10+cvs-${SRCDATE}" PR = "r0" inherit gpe diff --git a/packages/gpe-what/gpe-what_0.42.bb b/packages/gpe-what/gpe-what_0.42.bb new file mode 100644 index 0000000000..b7f8d17201 --- /dev/null +++ b/packages/gpe-what/gpe-what_0.42.bb @@ -0,0 +1,8 @@ +LICENSE = "GPL" +DESCRIPTION = "GPE modal help" +DEPENDS = "x11 gtk+" + + +GPE_TARBALL_SUFFIX= "bz2" +inherit autotools gpe + diff --git a/packages/gpesyncd/gpesyncd_cvs.bb b/packages/gpesyncd/gpesyncd_cvs.bb index 457b75c343..94ce44f30e 100644 --- a/packages/gpesyncd/gpesyncd_cvs.bb +++ b/packages/gpesyncd/gpesyncd_cvs.bb @@ -8,7 +8,8 @@ SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpesyncd" DEPENDS = "libgpevtype sqlite libmimedir glib-2.0" S = "${WORKDIR}/${PN}" -PV = "0.0+cvs${SRCDATE}" +#Remove the dash below when 0.0 changes in PV +PV = "0.0+cvs-${SRCDATE}" PR = "r0" inherit autotools diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index c4bc1382c8..a01f12d094 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -1,7 +1,8 @@ inherit autotools pkgconfig PR = "r1" -PV = "2.10pre3+cvs${SRCDATE}" +#Remove the dash below when 2.10pre3 changes in PV +PV = "2.10pre3+cvs-${SRCDATE}" DEFAULT_PREFERENCE="-1" PACKAGES += "gpsdrive-add" diff --git a/packages/inputpipe/inputpipe_svn.bb b/packages/inputpipe/inputpipe_svn.bb index 87ececd731..ffa59a762a 100644 --- a/packages/inputpipe/inputpipe_svn.bb +++ b/packages/inputpipe/inputpipe_svn.bb @@ -3,7 +3,8 @@ PRIORITY = "optional" DESCRIPTION = "Inputpipe is a network transparency layer for linux input devices" MAINTAINER = "Micah Dowty <micah@navi.cx>" LICENSE = "GPL" -PV = "0.5+svn${SRCDATE}" +#Remove the dash below when 0.5 changes in PV +PV = "0.5+svn-${SRCDATE}" SRC_URI = "svn://svn.navi.cx/misc/trunk;module=inputpipe;proto=http" S = "${WORKDIR}/inputpipe" diff --git a/packages/kbdd/kbdd_cvs.bb b/packages/kbdd/kbdd_cvs.bb index a4ecc512a3..12516114f6 100644 --- a/packages/kbdd/kbdd_cvs.bb +++ b/packages/kbdd/kbdd_cvs.bb @@ -10,7 +10,8 @@ SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${SRCDATE} \ file://kbdd.conf \ file://kbdd-modules" -PV="0.8+cvs${SRCDATE}" +#Remove the dash below when 0.8 changes in PV +PV="0.8+cvs-${SRCDATE}" PR="r5" inherit update-rc.d linux_modules diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb index aaaec8cb77..7ba1398329 100644 --- a/packages/libgpevtype/libgpevtype_cvs.bb +++ b/packages/libgpevtype/libgpevtype_cvs.bb @@ -8,7 +8,7 @@ DEPENDS = "libmimedir" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.12+cvs${SRCDATE}" +PV = "0.14+cvs${SRCDATE}" PR = "r0" inherit pkgconfig gpe autotools diff --git a/packages/libgpewidget/libgpewidget_0.107.bb b/packages/libgpewidget/libgpewidget_0.107.bb new file mode 100644 index 0000000000..3bd2996e67 --- /dev/null +++ b/packages/libgpewidget/libgpewidget_0.107.bb @@ -0,0 +1,20 @@ +LICENSE = "LGPL" +DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" + +PACKAGES =+ "libgpewidget-bin" + +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" + +inherit pkgconfig autotools + +FILES_libgpewidget-bin = "${bindir}" + +EXTRA_OECONF = "--enable-cairo" + +do_stage () { + autotools_stage_all +} + diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb index b5b9a9b6aa..6e60b95133 100644 --- a/packages/libgpewidget/libgpewidget_cvs.bb +++ b/packages/libgpewidget/libgpewidget_cvs.bb @@ -9,7 +9,7 @@ LICENSE = "LGPL" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.105+cvs${SRCDATE}" +PV = "0.107+cvs${SRCDATE}" PR = "r0" inherit autotools pkgconfig diff --git a/packages/libmailwrapper/libmailwrapper_cvs.bb b/packages/libmailwrapper/libmailwrapper_cvs.bb index 408193f776..8a5722ee18 100644 --- a/packages/libmailwrapper/libmailwrapper_cvs.bb +++ b/packages/libmailwrapper/libmailwrapper_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/libmailwrapper " diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb index 370bed7f51..9a49853fe1 100644 --- a/packages/libmatchbox/libmatchbox_svn.bb +++ b/packages/libmatchbox/libmatchbox_svn.bb @@ -1,6 +1,7 @@ include libmatchbox.inc -PV = "1.7+cvs${SRCDATE}" +#Remove the dash below when 1.7 changes in PV +PV = "1.7+cvs-${SRCDATE}" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\ diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb index 9e8d904ba7..33e918b278 100644 --- a/packages/libmimedir/libmimedir_cvs.bb +++ b/packages/libmimedir/libmimedir_cvs.bb @@ -4,7 +4,8 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "intltool-native" PR = "r1" -PV = "0.3.1+cvs${SRCDATE}" +#Remove the dash below when 0.3.1 changes in PV +PV = "0.3.1+cvs-${SRCDATE}" DEFAULT_PREFERENCE = -1 diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index d9b16ff4e3..8d5ff7486b 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \ file://include.pro" diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb index cde3fb5859..c51ca8ecc6 100644 --- a/packages/libopieobex/libopieobex0_cvs.bb +++ b/packages/libopieobex/libopieobex0_cvs.bb @@ -1,5 +1,5 @@ include libopieobex0.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \ diff --git a/packages/libopietooth/libopietooth1_cvs.bb b/packages/libopietooth/libopietooth1_cvs.bb index e259dcb8c7..4d1a66acd6 100644 --- a/packages/libopietooth/libopietooth1_cvs.bb +++ b/packages/libopietooth/libopietooth1_cvs.bb @@ -1,4 +1,4 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib" -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" include libopietooth1.inc diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index db32c0e121..8e0278daa1 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +# Remove the dash below when 1.2.1 changes +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1" diff --git a/packages/libqtaux/libqtaux2_cvs.bb b/packages/libqtaux/libqtaux2_cvs.bb index db821756b9..85cd5bdbb3 100644 --- a/packages/libqtaux/libqtaux2_cvs.bb +++ b/packages/libqtaux/libqtaux2_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/libqtaux" diff --git a/packages/libsm/libsm_cvs.bb b/packages/libsm/libsm_cvs.bb index 6c64da33d4..ff5fcd8c0e 100644 --- a/packages/libsm/libsm_cvs.bb +++ b/packages/libsm/libsm_cvs.bb @@ -1,4 +1,4 @@ -PV = "0.0+cvs${SRCDATE}" +PV = "6.0.3+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "libs" PRIORITY = "optional" @@ -6,6 +6,8 @@ DEPENDS = "x11 ice" DESCRIPTION = "Session management library" PR = "r1" +DEFAULT_PREFERENCE="-1" + SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=SM" S = "${WORKDIR}/SM" diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb new file mode 100644 index 0000000000..5f5d618695 --- /dev/null +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -0,0 +1,20 @@ +SECTION = "gpe/libs" +LICENSE = "BSD-X" +PRIORITY = "optional" +DEPENDS = "libxsettings x11" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" + +inherit autotools pkgconfig gpe + +SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2" + + +headers = "xsettings-client.h xsettings-common.h" +do_stage () { + oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} + mkdir -p ${STAGING_INCDIR} + for h in ${headers}; do + install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h + done +} + diff --git a/packages/linux/ixp4xx-kernel/2.6.15/15-jffs2-endian-config.patch b/packages/linux/ixp4xx-kernel/2.6.15/15-jffs2-endian-config.patch index fdebb652a7..76e9c7e439 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/15-jffs2-endian-config.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/15-jffs2-endian-config.patch @@ -1,3 +1,15 @@ +This patch allows the endianness of the JFSS2 filesystem to be +specified by config options. + +It defaults to native-endian (the previously hard-coded option). + +Some architectures (in particular, the NSLU2) benefit from having a +single known endianness of JFFS2 filesystem (for data, not +executables) independent of the endianness of the processor (ARM +processors can be switched to either endianness at run-time). + +Signed-off-by: Rod Whitby <rod@whitby.id.au> + --- linux-2.6.15/fs/Kconfig~ 2006-01-03 13:51:10.000000000 +1030 +++ linux-2.6.15/fs/Kconfig 2006-01-05 01:35:36.000000000 +1030 @@ -1132,6 +1132,31 @@ config JFFS2_CMODE_SIZE diff --git a/packages/linux/ixp4xx-kernel/2.6.15/65-loft-config.patch b/packages/linux/ixp4xx-kernel/2.6.15/65-loft-config.patch new file mode 100644 index 0000000000..c6b0c7c679 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/65-loft-config.patch @@ -0,0 +1,84 @@ +support for the Giant Shoulder Inc Loft board - a very minor +variation on a standard Avila board + +--- linux-2.6.15/arch/arm/mach-ixp4xx/Kconfig 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/Kconfig 1970-01-01 00:00:00.000000000 +0000 +@@ -25,6 +25,12 @@ config ARCH_AVILA + Avila Network Platform. For more information on this platform, + see <file:Documentation/arm/IXP4xx>. + ++config MACH_LOFT ++ bool "Loft" ++ help ++ Say 'Y' here if you want your kernel to support the Giant ++ Shoulder Inc Loft board. ++ + config ARCH_ADI_COYOTE + bool "Coyote" + help +@@ -85,7 +91,7 @@ config MACH_NAS100D + # + config ARCH_IXDP4XX + bool +- depends on ARCH_IXDP425 || ARCH_AVILA || MACH_IXDP465 ++ depends on ARCH_IXDP425 || ARCH_AVILA || MACH_IXDP465 || MACH_LOFT + default y + + # +--- linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-pci.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-pci.c 1970-01-01 00:00:00.000000000 +0000 +@@ -51,7 +51,8 @@ static int __init ixdp425_map_irq(struct + + int irq = -1; + +- if (slot >= 1 && slot <= IXDP425_PCI_MAX_DEV && ++ if (slot >= 1 && ++ slot <= (machine_is_loft() ? LOFT_PCI_MAX_DEV : IXDP425_PCI_MAX_DEV) && + pin >= 1 && pin <= IXDP425_PCI_IRQ_LINES) { + irq = pci_irq_table[(slot + pin - 2) % 4]; + } +@@ -71,7 +72,8 @@ struct hw_pci ixdp425_pci __initdata = { + int __init ixdp425_pci_init(void) + { + if (machine_is_ixdp425() || machine_is_ixcdp1100() || +- machine_is_avila() || machine_is_ixdp465()) ++ machine_is_avila() || machine_is_ixdp465() || ++ machine_is_loft()) + pci_common_init(&ixdp425_pci); + return 0; + } +--- linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000 +@@ -185,3 +185,22 @@ MACHINE_START(AVILA, "Gateworks Avila Ne + MACHINE_END + #endif + ++/* ++ * Loft is functionally equivalent to Avila except that it has a ++ * different number for the maximum PCI devices. The MACHINE ++ * structure below is identical to Avila except for the comment. ++ */ ++#ifdef CONFIG_MACH_LOFT ++MACHINE_START(LOFT, "Giant Shoulder Inc Loft board") ++ /* Maintainer: Tom Billman <kernel@giantshoulderinc.com> */ ++ .phys_ram = PHYS_OFFSET, ++ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, ++ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, ++ .map_io = ixp4xx_map_io, ++ .init_irq = ixp4xx_init_irq, ++ .timer = &ixp4xx_timer, ++ .boot_params = 0x0100, ++ .init_machine = ixdp425_init, ++MACHINE_END ++#endif ++ +--- linux-2.6.15/include/asm-arm/arch-ixp4xx/ixdp425.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/include/asm-arm/arch-ixp4xx/ixdp425.h 1970-01-01 00:00:00.000000000 +0000 +@@ -26,6 +26,7 @@ + * IXDP425 PCI IRQs + */ + #define IXDP425_PCI_MAX_DEV 4 ++#define LOFT_PCI_MAX_DEV 6 + #define IXDP425_PCI_IRQ_LINES 4 + + diff --git a/packages/linux/ixp4xx-kernel/2.6.15/defconfig b/packages/linux/ixp4xx-kernel/2.6.15/defconfig index ff69ccc6f1..c05034de19 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.15/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15 -# Sun Jan 8 02:47:26 2006 +# Thu Jan 12 17:44:50 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -113,12 +113,14 @@ CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y # CONFIG_MACH_NSLU2=y # CONFIG_ARCH_AVILA is not set +CONFIG_MACH_LOFT=y # CONFIG_ARCH_ADI_COYOTE is not set # CONFIG_ARCH_IXDP425 is not set # CONFIG_MACH_IXDPG425 is not set # CONFIG_MACH_IXDP465 is not set # CONFIG_ARCH_PRPMC1100 is not set CONFIG_MACH_NAS100D=y +CONFIG_ARCH_IXDP4XX=y # CONFIG_MACH_GTWX5715 is not set # @@ -177,7 +179,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f noirqdebug console=ttyS0,115200n8" +CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f rtc-ds1672.probe=0,0x68 rtc-ds1672.hctosys=1 pcf8563.hctosys=1 noirqdebug console=ttyS0,115200n8" # CONFIG_XIP_KERNEL is not set # diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.bb index 39ad707916..4a7cd96d37 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.bb @@ -8,7 +8,7 @@ PR_CONFIG = "0" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r3.${PR_CONFIG}" +PR = "r4.${PR_CONFIG}" include ixp4xx-kernel.inc @@ -25,6 +25,7 @@ IXP4XX_PATCHES += "file://60-nas100d-i2c.patch;patch=1" # IXP4XX_PATCHES += "file://60-nas100d-ide.patch;patch=1" IXP4XX_PATCHES += "file://60-nas100d-rtc.patch;patch=1" IXP4XX_PATCHES += "file://60-nslu2-beeper.patch;patch=1" +IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1" # IXP4XX_PATCHES += "file://75-nslu2-leds.patch;patch=1" IXP4XX_PATCHES += "file://80-nslu2-io.patch;patch=1" IXP4XX_PATCHES += "file://85-timer.patch;patch=1" diff --git a/packages/madwifi/madwifi-modules_cvs-bsd.bb b/packages/madwifi/madwifi-modules_cvs-bsd.bb index 1092180037..6da2c34baf 100644 --- a/packages/madwifi/madwifi-modules_cvs-bsd.bb +++ b/packages/madwifi/madwifi-modules_cvs-bsd.bb @@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PV = "cvs-bsd+${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}-bsd" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi;tag=BSD;date=${SRCDATE}" diff --git a/packages/madwifi/madwifi-modules_cvs.bb b/packages/madwifi/madwifi-modules_cvs.bb index 4e00bf609c..0bef3d506e 100644 --- a/packages/madwifi/madwifi-modules_cvs.bb +++ b/packages/madwifi/madwifi-modules_cvs.bb @@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/madwifi;module=madwifi" diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb index c01ab6c487..1fa67bb9d3 100644 --- a/packages/meta/slugos-image.bb +++ b/packages/meta/slugos-image.bb @@ -5,7 +5,6 @@ # LICENSE = "MIT" PR = "r19" -PROVIDES += "${SLUGOS_IMAGENAME}-image" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! diff --git a/packages/meta/slugos-imagename.bb b/packages/meta/slugos-imagename.bb new file mode 100644 index 0000000000..35578442c2 --- /dev/null +++ b/packages/meta/slugos-imagename.bb @@ -0,0 +1,35 @@ +# This is an inglorious hack to provide a package to match +# ${SLUGOS_IMAGENAME}-image +MAINTAINER = "John Bowler <jbowler@acm.org> +PN = "${SLUGOS_IMAGENAME}-image" +PV = "0" +PR = "r0" +DEPENDS = "slugos-image" +PACKAGES = "" +INHIBIT_DEFAULT_DEPS = "1" + +SLUGOS_IMAGENAME ?= "slugos" + +do_fetch() { +} +do_unpack() { +} +do_patch() { +} +do_configure() { +} +do_compile() { +} +do_install() { +} +do_stage() { +} +do_build() { +} + +python () { + # Don't build slugos images unless the configuration is set up + # for an image build! + if bb.data.getVar("SLUGOS_IMAGENAME", d, 1) == '': + raise bb.parse.SkipPackage("absent SlugOS configuration") +} diff --git a/packages/mileage/mileage_cvs.bb b/packages/mileage/mileage_cvs.bb index 88658eb0d1..355db4d3ea 100644 --- a/packages/mileage/mileage_cvs.bb +++ b/packages/mileage/mileage_cvs.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://mileage.sourceforge.net" SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" -PV = "4.2.0+cvs${SRCDATE}" +#Change to form x.y.z+cvs${SRCDATE} when 4.2.0 changes in PV +PV = "4.2.0-cvs-${SRCDATE}" PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/mileage;module=mileage" diff --git a/packages/mystun-server/mystun-server_cvs.bb b/packages/mystun-server/mystun-server_cvs.bb index 7a4d8b015a..cfdf72f475 100644 --- a/packages/mystun-server/mystun-server_cvs.bb +++ b/packages/mystun-server/mystun-server_cvs.bb @@ -4,7 +4,7 @@ MAINTAINER = "Sven-Ola Tuecke <sven-ola@gmx.de>" SECTION = "console/telephony" PRIORITY = "optional" LICENSE = "GPL" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" SRC_URI="cvs://anonymous@cvs.mystun.berlios.de/cvsroot/mystun;module=mystun \ file://init \ diff --git a/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb b/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb index 7290f4d56c..95a41a5317 100644 --- a/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb +++ b/packages/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "opie-mediaplayer1" RDEPENDS = "opie-mediaplayer1" -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" APPNAME = "mpeg3plugin" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer" diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb index 4098f17d2e..0f98108623 100644 --- a/packages/nylon/nylon-scripts_cvs.bb +++ b/packages/nylon/nylon-scripts_cvs.bb @@ -5,7 +5,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPLv2" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" PR = "r2" SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb index 0212df309d..9216568b0d 100644 --- a/packages/nylon/nylon-statistics.bb +++ b/packages/nylon/nylon-statistics.bb @@ -4,7 +4,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPLv2" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" PR = "r1" SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" diff --git a/packages/nylon/yamonenv.bb b/packages/nylon/yamonenv.bb index a11b1cd65e..bf4c94200e 100644 --- a/packages/nylon/yamonenv.bb +++ b/packages/nylon/yamonenv.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Michael Stickel <michael.stickel@4g-systems.biz>" LICENSE = "GPL" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" S = "${WORKDIR}/${PN}" diff --git a/packages/olsrd/olsrd_cvs.bb b/packages/olsrd/olsrd_cvs.bb index 27c433d4e9..6aca392434 100644 --- a/packages/olsrd/olsrd_cvs.bb +++ b/packages/olsrd/olsrd_cvs.bb @@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" SECTION = "console/network" PRIORITY = "optional" LICENSE = "BSD" -PV = "0.0+cvs${SRCDATE}" +PV = "1:0.0+cvs${SRCDATE}" SRC_URI="cvs://anonymous@cvs.sourceforge.net/cvsroot/olsrd;module=olsrd-current \ file://init \ diff --git a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb index f242613c50..fb4bf05e8a 100644 --- a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb +++ b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/aboutapplet" diff --git a/packages/opie-addressbook/opie-addressbook_cvs.bb b/packages/opie-addressbook/opie-addressbook_cvs.bb index 309aedc55d..fe99e83d5e 100644 --- a/packages/opie-addressbook/opie-addressbook_cvs.bb +++ b/packages/opie-addressbook/opie-addressbook_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/addressbook \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-advancedfm/opie-advancedfm_cvs.bb b/packages/opie-advancedfm/opie-advancedfm_cvs.bb index c93125bf51..b552bf6152 100644 --- a/packages/opie-advancedfm/opie-advancedfm_cvs.bb +++ b/packages/opie-advancedfm/opie-advancedfm_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb index eb50f5ab4d..e44a4c7049 100644 --- a/packages/opie-alarm/opie-alarm_cvs.bb +++ b/packages/opie-alarm/opie-alarm_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \ file://01opiealarm " diff --git a/packages/opie-appearance/opie-appearance_cvs.bb b/packages/opie-appearance/opie-appearance_cvs.bb index a31f2ab3eb..de78ccb83a 100644 --- a/packages/opie-appearance/opie-appearance_cvs.bb +++ b/packages/opie-appearance/opie-appearance_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/appearance2 \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-aqpkg/opie-aqpkg_cvs.bb b/packages/opie-aqpkg/opie-aqpkg_cvs.bb index dd4b17fbad..0316ba2aeb 100644 --- a/packages/opie-aqpkg/opie-aqpkg_cvs.bb +++ b/packages/opie-aqpkg/opie-aqpkg_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/aqpkg \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb index 55b28db27f..52a63b4135 100644 --- a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb +++ b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/autorotateapplet \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-backgammon/opie-backgammon_cvs.bb b/packages/opie-backgammon/opie-backgammon_cvs.bb index 6ba16adde6..8cc6e52bfd 100644 --- a/packages/opie-backgammon/opie-backgammon_cvs.bb +++ b/packages/opie-backgammon/opie-backgammon_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/backgammon \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-backup/opie-backup_cvs.bb b/packages/opie-backup/opie-backup_cvs.bb index aaf2af8950..b609b09b07 100644 --- a/packages/opie-backup/opie-backup_cvs.bb +++ b/packages/opie-backup/opie-backup_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/backup \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-bartender/opie-bartender_cvs.bb b/packages/opie-bartender/opie-bartender_cvs.bb index 01f1daf94c..79cc45e64c 100644 --- a/packages/opie-bartender/opie-bartender_cvs.bb +++ b/packages/opie-bartender/opie-bartender_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-bartender \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb index 97b2056a74..f7148388a2 100644 --- a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb +++ b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/batteryapplet \ diff --git a/packages/opie-bluepin/opie-bluepin_cvs.bb b/packages/opie-bluepin/opie-bluepin_cvs.bb index 765dc35d93..d29e0a0db3 100644 --- a/packages/opie-bluepin/opie-bluepin_cvs.bb +++ b/packages/opie-bluepin/opie-bluepin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/blue-pin" diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb index 513968608f..aab0257453 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \ ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet" diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb index 42ea7f54eb..f6040cfdd1 100644 --- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb +++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/manager \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-bounce/opie-bounce_cvs.bb b/packages/opie-bounce/opie-bounce_cvs.bb index 01f6c96cb2..500931029f 100644 --- a/packages/opie-bounce/opie-bounce_cvs.bb +++ b/packages/opie-bounce/opie-bounce_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/bounce \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb index 7102e405bf..2a34e2534a 100644 --- a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb +++ b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/brightnessapplet \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-button-settings/opie-button-settings_cvs.bb b/packages/opie-button-settings/opie-button-settings_cvs.bb index c25796d83d..31afa66235 100644 --- a/packages/opie-button-settings/opie-button-settings_cvs.bb +++ b/packages/opie-button-settings/opie-button-settings_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/button \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-buzzword/opie-buzzword_cvs.bb b/packages/opie-buzzword/opie-buzzword_cvs.bb index e33a0da77b..751643df29 100644 --- a/packages/opie-buzzword/opie-buzzword_cvs.bb +++ b/packages/opie-buzzword/opie-buzzword_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/buzzword \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-calculator/opie-calculator_cvs.bb b/packages/opie-calculator/opie-calculator_cvs.bb index 8b78452789..5c86dd0e65 100644 --- a/packages/opie-calculator/opie-calculator_cvs.bb +++ b/packages/opie-calculator/opie-calculator_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/calculator \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-calibrate/opie-calibrate_cvs.bb b/packages/opie-calibrate/opie-calibrate_cvs.bb index 42e28331a5..b4d39b9a15 100644 --- a/packages/opie-calibrate/opie-calibrate_cvs.bb +++ b/packages/opie-calibrate/opie-calibrate_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate" diff --git a/packages/opie-camera/opie-camera_cvs.bb b/packages/opie-camera/opie-camera_cvs.bb index afae32fb8e..b6cc271caa 100644 --- a/packages/opie-camera/opie-camera_cvs.bb +++ b/packages/opie-camera/opie-camera_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-cardmon/opie-cardmon_cvs.bb b/packages/opie-cardmon/opie-cardmon_cvs.bb index d9255760cc..25cbf6cce1 100644 --- a/packages/opie-cardmon/opie-cardmon_cvs.bb +++ b/packages/opie-cardmon/opie-cardmon_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/cardmon \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-checkbook/opie-checkbook_cvs.bb b/packages/opie-checkbook/opie-checkbook_cvs.bb index c93125bf51..b552bf6152 100644 --- a/packages/opie-checkbook/opie-checkbook_cvs.bb +++ b/packages/opie-checkbook/opie-checkbook_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-citytime/opie-citytime_cvs.bb b/packages/opie-citytime/opie-citytime_cvs.bb index 7e77ab149a..de2ab19bf4 100644 --- a/packages/opie-citytime/opie-citytime_cvs.bb +++ b/packages/opie-citytime/opie-citytime_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/citytime \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb index 06b5814bc2..b0ba1ba507 100644 --- a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb +++ b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clipboardapplet \ diff --git a/packages/opie-clock/opie-clock_cvs.bb b/packages/opie-clock/opie-clock_cvs.bb index 19567838c2..6bff77d83f 100644 --- a/packages/opie-clock/opie-clock_cvs.bb +++ b/packages/opie-clock/opie-clock_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/clock \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb index 609b2a7f7c..52276b64c3 100644 --- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb +++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \ diff --git a/packages/opie-confeditor/opie-confeditor_cvs.bb b/packages/opie-confeditor/opie-confeditor_cvs.bb index 773d64833a..7b1e721310 100644 --- a/packages/opie-confeditor/opie-confeditor_cvs.bb +++ b/packages/opie-confeditor/opie-confeditor_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/confedit \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb index 606915dff7..1103e1f285 100644 --- a/packages/opie-console/opie-console_cvs.bb +++ b/packages/opie-console/opie-console_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-dagger/opie-dagger_cvs.bb b/packages/opie-dagger/opie-dagger_cvs.bb index f7d353cd81..7d3730cb10 100644 --- a/packages/opie-dagger/opie-dagger_cvs.bb +++ b/packages/opie-dagger/opie-dagger_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/dagger \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-dasher/opie-dasher_cvs.bb b/packages/opie-dasher/opie-dasher_cvs.bb index b22d4b6664..cd9c7488c4 100644 --- a/packages/opie-dasher/opie-dasher_cvs.bb +++ b/packages/opie-dasher/opie-dasher_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dasher \ ${HANDHELDS_CVS};module=opie/share " diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb index afb8cfad87..6277c5651a 100644 --- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb +++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/birthday " diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb index 36bfd6e5e1..98e5ae4c0f 100644 --- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb +++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/christian " diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb index e69f6128fd..84178aae18 100644 --- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb +++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/national \ ${HANDHELDS_CVS};module=opie/etc/nationaldays " diff --git a/packages/opie-datebook/opie-datebook_cvs.bb b/packages/opie-datebook/opie-datebook_cvs.bb index 9b7fca26b7..d4f8a6717a 100644 --- a/packages/opie-datebook/opie-datebook_cvs.bb +++ b/packages/opie-datebook/opie-datebook_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-deco-flat/opie-deco-flat_cvs.bb b/packages/opie-deco-flat/opie-deco-flat_cvs.bb index 824f49eb23..6920cac224 100644 --- a/packages/opie-deco-flat/opie-deco-flat_cvs.bb +++ b/packages/opie-deco-flat/opie-deco-flat_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/flat " diff --git a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb index 6652b7da1e..c957dd3a94 100644 --- a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb +++ b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/liquid " diff --git a/packages/opie-deco-polished/opie-deco-polished_cvs.bb b/packages/opie-deco-polished/opie-deco-polished_cvs.bb index d13b22cbaa..cbc595a76d 100644 --- a/packages/opie-deco-polished/opie-deco-polished_cvs.bb +++ b/packages/opie-deco-polished/opie-deco-polished_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/polished " diff --git a/packages/opie-doctab/opie-doctab_cvs.bb b/packages/opie-doctab/opie-doctab_cvs.bb index b0ba81aea5..b318842596 100644 --- a/packages/opie-doctab/opie-doctab_cvs.bb +++ b/packages/opie-doctab/opie-doctab_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/doctab \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-drawpad/opie-drawpad_cvs.bb b/packages/opie-drawpad/opie-drawpad_cvs.bb index dd0fc890d5..c2c8e6c8a5 100644 --- a/packages/opie-drawpad/opie-drawpad_cvs.bb +++ b/packages/opie-drawpad/opie-drawpad_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/drawpad \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-dvorak/opie-dvorak_cvs.bb b/packages/opie-dvorak/opie-dvorak_cvs.bb index 9416c5721c..aabac9b928 100644 --- a/packages/opie-dvorak/opie-dvorak_cvs.bb +++ b/packages/opie-dvorak/opie-dvorak_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \ ${HANDHELDS_CVS};module=opie/inputmethods/pickboard" diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb index 6b87647a00..98b0ecd0ef 100644 --- a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb +++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-euroconv/opie-euroconv_cvs.bb b/packages/opie-euroconv/opie-euroconv_cvs.bb index c9fc45a974..bb59d3028b 100644 --- a/packages/opie-euroconv/opie-euroconv_cvs.bb +++ b/packages/opie-euroconv/opie-euroconv_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/euroconv \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-examples-python/opie-examples-python_cvs.bb b/packages/opie-examples-python/opie-examples-python_cvs.bb index e561bf0be0..75a52cb7a7 100644 --- a/packages/opie-examples-python/opie-examples-python_cvs.bb +++ b/packages/opie-examples-python/opie-examples-python_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/examples/python \ diff --git a/packages/opie-examples/opie-examples_cvs.bb b/packages/opie-examples/opie-examples_cvs.bb index 2af54daeef..795b813608 100644 --- a/packages/opie-examples/opie-examples_cvs.bb +++ b/packages/opie-examples/opie-examples_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/examples \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-eye/opie-eye_cvs.bb b/packages/opie-eye/opie-eye_cvs.bb index 0a02210f82..ffe7e770ff 100644 --- a/packages/opie-eye/opie-eye_cvs.bb +++ b/packages/opie-eye/opie-eye_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/opie-eye \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-fifteen/opie-fifteen_cvs.bb b/packages/opie-fifteen/opie-fifteen_cvs.bb index f533d68c82..e342fa69c3 100644 --- a/packages/opie-fifteen/opie-fifteen_cvs.bb +++ b/packages/opie-fifteen/opie-fifteen_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/fifteen \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-formatter/opie-formatter_cvs.bb b/packages/opie-formatter/opie-formatter_cvs.bb index caca62089f..99af13112a 100644 --- a/packages/opie-formatter/opie-formatter_cvs.bb +++ b/packages/opie-formatter/opie-formatter_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/formatter \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-freetype/opie-freetype_cvs.bb b/packages/opie-freetype/opie-freetype_cvs.bb index 0384318f22..4788f044e9 100644 --- a/packages/opie-freetype/opie-freetype_cvs.bb +++ b/packages/opie-freetype/opie-freetype_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/freetype" diff --git a/packages/opie-ftp/opie-ftp_cvs.bb b/packages/opie-ftp/opie-ftp_cvs.bb index d9380ad7f8..d8ce8c7334 100644 --- a/packages/opie-ftp/opie-ftp_cvs.bb +++ b/packages/opie-ftp/opie-ftp_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieftp \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-ftplib/opie-ftplib_cvs.bb b/packages/opie-ftplib/opie-ftplib_cvs.bb index fe4033e8ac..2025ea084c 100644 --- a/packages/opie-ftplib/opie-ftplib_cvs.bb +++ b/packages/opie-ftplib/opie-ftplib_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/ftplib" diff --git a/packages/opie-go/opie-go_cvs.bb b/packages/opie-go/opie-go_cvs.bb index 05187dc365..3985f619cf 100644 --- a/packages/opie-go/opie-go_cvs.bb +++ b/packages/opie-go/opie-go_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/go \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb index c476a66243..3cb2c37810 100644 --- a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb +++ b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-gutenbrowser \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-handwriting/opie-handwriting_cvs.bb b/packages/opie-handwriting/opie-handwriting_cvs.bb index b1488be209..ada35ece86 100644 --- a/packages/opie-handwriting/opie-handwriting_cvs.bb +++ b/packages/opie-handwriting/opie-handwriting_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/handwriting \ ${HANDHELDS_CVS};module=opie/etc/qimpen" diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb index 3a9f76e508..c54c006709 100644 --- a/packages/opie-help-en/opie-help-en_cvs.bb +++ b/packages/opie-help-en/opie-help-en_cvs.bb @@ -1,5 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html " diff --git a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb index ad29b882fc..5e4bdd9eb0 100644 --- a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb +++ b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-homeapplet/opie-homeapplet_cvs.bb b/packages/opie-homeapplet/opie-homeapplet_cvs.bb index 785cb0b329..120f4bbab8 100644 --- a/packages/opie-homeapplet/opie-homeapplet_cvs.bb +++ b/packages/opie-homeapplet/opie-homeapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/homeapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb index e1cce42445..1a1ef7c35b 100644 --- a/packages/opie-i18n/opie-i18n_cvs.bb +++ b/packages/opie-i18n/opie-i18n_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \ ${HANDHELDS_CVS};module=opie/etc/dict" diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb index 67a69dda20..6f52c45d74 100644 --- a/packages/opie-i18n/opie-lrelease-native_cvs.bb +++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb @@ -1,5 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \ ${HANDHELDS_CVS};module=opie/development/translation/shared" diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb index 717d8a3769..f7f9a79c25 100644 --- a/packages/opie-i18n/opie-lupdate-native_cvs.bb +++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb @@ -1,5 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \ ${HANDHELDS_CVS};module=opie/development/translation/shared" diff --git a/packages/opie-icon-reload/opie-icon-reload/reload.png b/packages/opie-icon-reload/opie-icon-reload/reload.png Binary files differindex 9cec49322c..d520167614 100644 --- a/packages/opie-icon-reload/opie-icon-reload/reload.png +++ b/packages/opie-icon-reload/opie-icon-reload/reload.png diff --git a/packages/opie-icon-reload/opie-icon-reload_cvs.bb b/packages/opie-icon-reload/opie-icon-reload_cvs.bb index f8c47a5c4f..0ce2a6b704 100644 --- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb +++ b/packages/opie-icon-reload/opie-icon-reload_cvs.bb @@ -1,4 +1,5 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +#Remove the dash below when 1.2.1 changes +PV = "1.2.1+cvs-${SRCDATE}" diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb index 63d0243d54..feabe89d68 100644 --- a/packages/opie-irc/opie-irc_cvs.bb +++ b/packages/opie-irc/opie-irc_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \ ${HANDHELDS_CVS};module=opie/help \ diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb index db6c62e7e9..836c6dfeef 100644 --- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb +++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \ diff --git a/packages/opie-jumpx/opie-jumpx_cvs.bb b/packages/opie-jumpx/opie-jumpx_cvs.bb index ed12b6f80d..cd5a25c39a 100644 --- a/packages/opie-jumpx/opie-jumpx_cvs.bb +++ b/packages/opie-jumpx/opie-jumpx_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/jumpx \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-kbill/opie-kbill_cvs.bb b/packages/opie-kbill/opie-kbill_cvs.bb index cd8074bfff..20522f3968 100644 --- a/packages/opie-kbill/opie-kbill_cvs.bb +++ b/packages/opie-kbill/opie-kbill_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kbill \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-kcheckers/opie-kcheckers_cvs.bb b/packages/opie-kcheckers/opie-kcheckers_cvs.bb index 13a1c4a493..445ad42970 100644 --- a/packages/opie-kcheckers/opie-kcheckers_cvs.bb +++ b/packages/opie-kcheckers/opie-kcheckers_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kcheckers \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-keyboard/opie-keyboard_cvs.bb b/packages/opie-keyboard/opie-keyboard_cvs.bb index 400c29670a..2ec7441ce2 100644 --- a/packages/opie-keyboard/opie-keyboard_cvs.bb +++ b/packages/opie-keyboard/opie-keyboard_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard " diff --git a/packages/opie-keypebble/opie-keypebble_cvs.bb b/packages/opie-keypebble/opie-keypebble_cvs.bb index fd141e1b9c..37e32da01c 100644 --- a/packages/opie-keypebble/opie-keypebble_cvs.bb +++ b/packages/opie-keypebble/opie-keypebble_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/comm/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb index 4d9c11c529..51c58328ca 100644 --- a/packages/opie-keytabs/opie-keytabs_cvs.bb +++ b/packages/opie-keytabs/opie-keytabs_cvs.bb @@ -1,5 +1,6 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/etc" diff --git a/packages/opie-keyview/opie-keyview_cvs.bb b/packages/opie-keyview/opie-keyview_cvs.bb index 17249dde4c..d819cd45da 100644 --- a/packages/opie-keyview/opie-keyview_cvs.bb +++ b/packages/opie-keyview/opie-keyview_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/keyview " diff --git a/packages/opie-kjumpx/opie-kjumpx_cvs.bb b/packages/opie-kjumpx/opie-kjumpx_cvs.bb index c3b8ad585f..1ac78ad3fd 100644 --- a/packages/opie-kjumpx/opie-kjumpx_cvs.bb +++ b/packages/opie-kjumpx/opie-kjumpx_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/kjumpx \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-kpacman/opie-kpacman_cvs.bb b/packages/opie-kpacman/opie-kpacman_cvs.bb index 976a7e0d3c..f48122d5ea 100644 --- a/packages/opie-kpacman/opie-kpacman_cvs.bb +++ b/packages/opie-kpacman/opie-kpacman_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kpacman \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-language/opie-language_cvs.bb b/packages/opie-language/opie-language_cvs.bb index 9cec4e7915..77af7c1b68 100644 --- a/packages/opie-language/opie-language_cvs.bb +++ b/packages/opie-language/opie-language_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/language \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb b/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb index 0ebac4c2aa..8b8f30b77d 100644 --- a/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb +++ b/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/launcher \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-libqrsync/opie-libqrsync_cvs.bb b/packages/opie-libqrsync/opie-libqrsync_cvs.bb index 525301ee57..cd5c0573c5 100644 --- a/packages/opie-libqrsync/opie-libqrsync_cvs.bb +++ b/packages/opie-libqrsync/opie-libqrsync_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/rsync" diff --git a/packages/opie-light-and-power/opie-light-and-power_cvs.bb b/packages/opie-light-and-power/opie-light-and-power_cvs.bb index f5eb7bed33..5d0222401a 100644 --- a/packages/opie-light-and-power/opie-light-and-power_cvs.bb +++ b/packages/opie-light-and-power/opie-light-and-power_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/light-and-power \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-lockapplet/opie-lockapplet_cvs.bb b/packages/opie-lockapplet/opie-lockapplet_cvs.bb index 7f539b4f0b..4a67fc8558 100644 --- a/packages/opie-lockapplet/opie-lockapplet_cvs.bb +++ b/packages/opie-lockapplet/opie-lockapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/lockapplet \ diff --git a/packages/opie-login/opie-login_cvs.bb b/packages/opie-login/opie-login_cvs.bb index e9911a76ee..a5141716e7 100644 --- a/packages/opie-login/opie-login_cvs.bb +++ b/packages/opie-login/opie-login_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/${APPNAME} \ ${HANDHELDS_CVS};module=opie/core/apps/calibrate \ diff --git a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb index 8ef5777cbd..5e12de96fa 100644 --- a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb +++ b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/logoutapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-mail/opie-mail_cvs.bb b/packages/opie-mail/opie-mail_cvs.bb index e0fa33633b..026970805a 100644 --- a/packages/opie-mail/opie-mail_cvs.bb +++ b/packages/opie-mail/opie-mail_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-mailapplet/opie-mailapplet_cvs.bb b/packages/opie-mailapplet/opie-mailapplet_cvs.bb index 74120f4cd9..e906bf2058 100644 --- a/packages/opie-mailapplet/opie-mailapplet_cvs.bb +++ b/packages/opie-mailapplet/opie-mailapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/taskbarapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb index 2b51e65298..0ca2b3fd39 100644 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ file://libmadplugin.pro" diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb index 2f84c397cb..618d3b6a59 100644 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb index 75a87a2dbf..01141f2eac 100644 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ file://vorbis.pro " diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb index 2f84c397cb..618d3b6a59 100644 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb index ea0bb39217..d182973f87 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb index caa4eb7992..387af9c0e8 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb @@ -3,7 +3,8 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb index 7e349f9e7b..2e189417dc 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb @@ -3,7 +3,8 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb index 3d5072a8a4..279eb2caff 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb @@ -3,7 +3,8 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb index 8b648dd79e..17c3a030c5 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb @@ -3,7 +3,8 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org>" -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb index 093aa74c1d..5d887b073f 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \ diff --git a/packages/opie-mediummount/opie-mediummount_cvs.bb b/packages/opie-mediummount/opie-mediummount_cvs.bb index 1456365045..51d7a1fc77 100644 --- a/packages/opie-mediummount/opie-mediummount_cvs.bb +++ b/packages/opie-mediummount/opie-mediummount_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb index 1b1eadb6ac..e219cf59bb 100644 --- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb +++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/memoryapplet \ diff --git a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb index 22d538aaaa..0ccb32b59e 100644 --- a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb +++ b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/mindbreaker \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-minesweep/opie-minesweep_cvs.bb b/packages/opie-minesweep/opie-minesweep_cvs.bb index 961f3f536b..e7315a5a60 100644 --- a/packages/opie-minesweep/opie-minesweep_cvs.bb +++ b/packages/opie-minesweep/opie-minesweep_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/minesweep \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb index da8c6ce221..9bd8b3ca36 100644 --- a/packages/opie-multikey/opie-multikey_cvs.bb +++ b/packages/opie-multikey/opie-multikey_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \ ${HANDHELDS_CVS};module=opie/share" diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb index 76497ef7e9..be6a1ed2d6 100644 --- a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb +++ b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \ diff --git a/packages/opie-networkapplet/opie-networkapplet_cvs.bb b/packages/opie-networkapplet/opie-networkapplet_cvs.bb index 45d1c75c19..f1bc9b2ceb 100644 --- a/packages/opie-networkapplet/opie-networkapplet_cvs.bb +++ b/packages/opie-networkapplet/opie-networkapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/networkapplet \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb index 41fe8fead7..c14f18881b 100644 --- a/packages/opie-networksettings/opie-networksettings_cvs.bb +++ b/packages/opie-networksettings/opie-networksettings_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-notesapplet/opie-notesapplet_cvs.bb b/packages/opie-notesapplet/opie-notesapplet_cvs.bb index 8b67613ccd..73f5b6e9d4 100644 --- a/packages/opie-notesapplet/opie-notesapplet_cvs.bb +++ b/packages/opie-notesapplet/opie-notesapplet_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/notesapplet" diff --git a/packages/opie-odict/opie-odict_cvs.bb b/packages/opie-odict/opie-odict_cvs.bb index d2b2fd25d9..d21ab62be3 100644 --- a/packages/opie-odict/opie-odict_cvs.bb +++ b/packages/opie-odict/opie-odict_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/odict \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-oxygen/opie-oxygen_cvs.bb b/packages/opie-oxygen/opie-oxygen_cvs.bb index 198df08f1f..147aff9c73 100644 --- a/packages/opie-oxygen/opie-oxygen_cvs.bb +++ b/packages/opie-oxygen/opie-oxygen_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-oyatzee/opie-oyatzee_cvs.bb b/packages/opie-oyatzee/opie-oyatzee_cvs.bb index 87e65aa9ca..ef624083ba 100644 --- a/packages/opie-oyatzee/opie-oyatzee_cvs.bb +++ b/packages/opie-oyatzee/opie-oyatzee_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/oyatzee \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-packagemanager/opie-packagemanager_cvs.bb b/packages/opie-packagemanager/opie-packagemanager_cvs.bb index cacdb5541d..f376326bf2 100644 --- a/packages/opie-packagemanager/opie-packagemanager_cvs.bb +++ b/packages/opie-packagemanager/opie-packagemanager_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ ${HANDHELDS_CVS};module=opie/pics;cvsdate=${SRCDATE} \ diff --git a/packages/opie-parashoot/opie-parashoot_cvs.bb b/packages/opie-parashoot/opie-parashoot_cvs.bb index b7439af955..ad2164a50b 100644 --- a/packages/opie-parashoot/opie-parashoot_cvs.bb +++ b/packages/opie-parashoot/opie-parashoot_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/parashoot \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb index e329b2411a..95c80f47e5 100644 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb +++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pcmcia \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-pickboard/opie-pickboard_cvs.bb b/packages/opie-pickboard/opie-pickboard_cvs.bb index c3ee83e592..4b940922d2 100644 --- a/packages/opie-pickboard/opie-pickboard_cvs.bb +++ b/packages/opie-pickboard/opie-pickboard_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard" diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb index 5252da4c92..55b3caf94d 100644 --- a/packages/opie-pics/opie-pics_cvs.bb +++ b/packages/opie-pics/opie-pics_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/pics-hires" diff --git a/packages/opie-pimconverter/opie-pimconverter_cvs.bb b/packages/opie-pimconverter/opie-pimconverter_cvs.bb index 692420bbfc..736ecca4aa 100644 --- a/packages/opie-pimconverter/opie-pimconverter_cvs.bb +++ b/packages/opie-pimconverter/opie-pimconverter_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/pimconverter \ diff --git a/packages/opie-powerchord/opie-powerchord_cvs.bb b/packages/opie-powerchord/opie-powerchord_cvs.bb index a4b7f2122d..bb20df9975 100644 --- a/packages/opie-powerchord/opie-powerchord_cvs.bb +++ b/packages/opie-powerchord/opie-powerchord_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/powerchord \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb index a209c4864f..c0e9c777e5 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pyquicklaunch \ diff --git a/packages/opie-qasteroids/opie-qasteroids_cvs.bb b/packages/opie-qasteroids/opie-qasteroids_cvs.bb index 82730437d1..d2d783e432 100644 --- a/packages/opie-qasteroids/opie-qasteroids_cvs.bb +++ b/packages/opie-qasteroids/opie-qasteroids_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/qasteroids \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb index be1ec45a67..b240e74d0f 100644 --- a/packages/opie-qcop/opie-qcop_cvs.bb +++ b/packages/opie-qcop/opie-qcop_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop" diff --git a/packages/opie-qss/opie-qss_cvs.bb b/packages/opie-qss/opie-qss_cvs.bb index ac9cfc697f..014f5fb451 100644 --- a/packages/opie-qss/opie-qss_cvs.bb +++ b/packages/opie-qss/opie-qss_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qss" diff --git a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb index 7ffd7a8ef2..3500fab721 100644 --- a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb +++ b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/quicklauncher" diff --git a/packages/opie-rdesktop/opie-rdesktop_cvs.bb b/packages/opie-rdesktop/opie-rdesktop_cvs.bb index 2112bede6b..ea29f97790 100644 --- a/packages/opie-rdesktop/opie-rdesktop_cvs.bb +++ b/packages/opie-rdesktop/opie-rdesktop_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opierdesktop \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb index bcac865f95..c4edc7043e 100644 --- a/packages/opie-reader/opie-reader_cvs.bb +++ b/packages/opie-reader/opie-reader_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-recorder/opie-recorder_cvs.bb b/packages/opie-recorder/opie-recorder_cvs.bb index 3a6ec5ab44..04b4d44618 100644 --- a/packages/opie-recorder/opie-recorder_cvs.bb +++ b/packages/opie-recorder/opie-recorder_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opierec \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-remote/opie-remote_cvs.bb b/packages/opie-remote/opie-remote_cvs.bb index 6ef478950b..9276829349 100644 --- a/packages/opie-remote/opie-remote_cvs.bb +++ b/packages/opie-remote/opie-remote_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/remote \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-restartapplet/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet/opie-restartapplet2_cvs.bb index ea233607f9..62461b6a22 100644 --- a/packages/opie-restartapplet/opie-restartapplet2_cvs.bb +++ b/packages/opie-restartapplet/opie-restartapplet2_cvs.bb @@ -3,7 +3,7 @@ SECTION = "opie/applets" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" APPNAME = "restartapplet" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \ diff --git a/packages/opie-restartapplet/opie-restartapplet_cvs.bb b/packages/opie-restartapplet/opie-restartapplet_cvs.bb index ab7c5f676a..255ab53a36 100644 --- a/packages/opie-restartapplet/opie-restartapplet_cvs.bb +++ b/packages/opie-restartapplet/opie-restartapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb index 7ebe4b0338..912cea6cbb 100644 --- a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb +++ b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb index 35598cf81a..f74599cd43 100644 --- a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb +++ b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/rotateapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb index 84cdbc6c32..d03726301c 100644 --- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb +++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \ diff --git a/packages/opie-search/opie-search_cvs.bb b/packages/opie-search/opie-search_cvs.bb index 6acae68910..020d315a7a 100644 --- a/packages/opie-search/opie-search_cvs.bb +++ b/packages/opie-search/opie-search_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/osearch \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-security/opie-security_cvs.bb b/packages/opie-security/opie-security_cvs.bb index 4aa9a1f255..980b03b7c1 100644 --- a/packages/opie-security/opie-security_cvs.bb +++ b/packages/opie-security/opie-security_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/security \ diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping.inc b/packages/opie-securityplugins/opie-securityplugin-blueping.inc new file mode 100644 index 0000000000..35f972ef9a --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-blueping.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "Blueping plugin for opie-security authentication. \ +This is a bluetooth-based authentication plugin (you need \ +to have another Bluetooth device around to use it)." +RDEPENDS += "bluez-utils" +APPNAME = "multiauthbluepingplugin" + +include opie-securityplugin.inc + +S = "${WORKDIR}/blueping" + +do_install() { + install -d ${D}${palmtopdir}/pics/security/ + install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/ +} + diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb index 85127240ab..65de7b78ec 100644 --- a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb +++ b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb @@ -1,26 +1,5 @@ -DESCRIPTION = "Blueping plugin for opie-security authentication. \ -This is a bluetooth-based authentication plugin (you need \ -to have another Bluetooth device around to use it)." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthbluepingplugin.ts" -RDEPENDS = "opie-security bluez-utils" - -APPNAME = "multiauthbluepingplugin" - +include opie-securityplugin-blueping.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " -S = "${WORKDIR}/blueping" - -inherit opie - -# FILES plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb index 3d78f3757d..52bcbe6d16 100644 --- a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb @@ -1,25 +1,7 @@ -DESCRIPTION = "Blueping plugin for opie-security authentication. \ -This is a bluetooth-based authentication plugin (you need \ -to have another Bluetooth device around to use it)." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthbluepingplugin.ts" -RDEPENDS = "opie-security bluez-utils" -PV = "1.2.1+cvs${SRCDATE}" -APPNAME = "multiauthbluepingplugin" +include opie-securityplugin-blueping.inc + +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/blueping \ ${HANDHELDS_CVS};module=opie/pics " -S = "${WORKDIR}/blueping" - -inherit opie - -# FILES plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy.inc b/packages/opie-securityplugins/opie-securityplugin-dummy.inc new file mode 100644 index 0000000000..bb0a9b962b --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-dummy.inc @@ -0,0 +1,14 @@ +DESCRIPTION = "Dummy plugin for opie-security authentication. \ +This is a very simple authentication plugin (you just have \ +to press a button basically), for demonstration purpose." +APPNAME = "multiauthdummyplugin" + +include opie-securityplugin.inc + +S = "${WORKDIR}/dummy" + +do_install() { + install -d ${D}${palmtopdir}/pics/security + install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/ +} + diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb index 825c14ea53..4a5bc3c2e0 100644 --- a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb +++ b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb @@ -1,26 +1,5 @@ -DESCRIPTION = "Dummy plugin for opie-security authentication. \ -This is a very simple authentication plugin (you just have \ -to press a button basically), for demonstration purpose." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthdummyplugin.ts" -RDEPENDS = "opie-security" - -APPNAME = "multiauthdummyplugin" - +include opie-securityplugin-dummy.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/dummy \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " -S = "${WORKDIR}/dummy" - -inherit opie - -# FILES plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png -do_install() { - install -d ${D}${palmtopdir}/pics/security - install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb index 93cf6ac712..b0d1e8d49e 100644 --- a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb @@ -1,25 +1,7 @@ -DESCRIPTION = "Dummy plugin for opie-security authentication. \ -This is a very simple authentication plugin (you just have \ -to press a button basically), for demonstration purpose." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthdummyplugin.ts" -RDEPENDS = "opie-security" -PV = "1.2.1+cvs${SRCDATE}" -APPNAME = "multiauthdummyplugin" +include opie-securityplugin-dummy.inc + +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/dummy \ ${HANDHELDS_CVS};module=opie/pics " -S = "${WORKDIR}/dummy" - -inherit opie - -# FILES plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png -do_install() { - install -d ${D}${palmtopdir}/pics/security - install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-notice.inc b/packages/opie-securityplugins/opie-securityplugin-notice.inc new file mode 100644 index 0000000000..09a4025760 --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-notice.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Notice plugin for opie-security authentication. \ +It allows you to display, for example, a notice from your legal departement." +APPNAME = "multiauthnoticeplugin" + +include opie-securityplugin.inc + +S = "${WORKDIR}/notice" + +do_install() { + install -d ${D}${palmtopdir}/pics/security/ + install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/ +} + diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb index b1f11bcf6a..08bd1b13c0 100644 --- a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb +++ b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb @@ -1,25 +1,5 @@ -DESCRIPTION = "Notice plugin for opie-security authentication. \ -It allows you to display, for example, a notice from your legal departement." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthnoticeplugin.ts" -RDEPENDS = "opie-security" - -APPNAME = "multiauthnoticeplugin" - +include opie-securityplugin-notice.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " -S = "${WORKDIR}/notice" - -inherit opie - -# FILES plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb index 34e79d78b5..5223edbaf8 100644 --- a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb @@ -1,24 +1,7 @@ -DESCRIPTION = "Notice plugin for opie-security authentication. \ -It allows you to display, for example, a notice from your legal departement." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthnoticeplugin.ts" -RDEPENDS = "opie-security" -PV = "1.2.1+cvs${SRCDATE}" -APPNAME = "multiauthnoticeplugin" +include opie-securityplugin-notice.inc + +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/notice \ ${HANDHELDS_CVS};module=opie/pics " -S = "${WORKDIR}/notice" - -inherit opie - -# FILES plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin-pin.inc b/packages/opie-securityplugins/opie-securityplugin-pin.inc new file mode 100644 index 0000000000..6286d8abcf --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-pin.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "PIN plugin for opie-security authentication. \ +It implements the same kind of widgets as opie-security package, \ +but this implementation can be used along with other authentication \ +methods in the Opie Multi-Authentication Framework." +APPNAME = "multiauthpinplugin" + +include opie-securityplugin.inc + +S = "${WORKDIR}/pin" + +do_install() { + install -d ${D}${palmtopdir}/pics/security/ + install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/ +} + diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb index 5a2d03f6d5..c5ccde6b5c 100644 --- a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb +++ b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb @@ -1,27 +1,5 @@ -DESCRIPTION = "PIN plugin for opie-security authentication. \ -It implements the same kind of widgets as opie-security package, \ -but this implementation can be used along with other authentication \ -methods in the Opie Multi-Authentication Framework." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthpinplugin.ts" -RDEPENDS = "opie-security" - -APPNAME = "multiauthpinplugin" - +include opie-securityplugin-pin.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/pin \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " - -S = "${WORKDIR}/pin" - -inherit opie - -# FILES plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/ -} + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb index b85132b5e2..bf2a607650 100644 --- a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb +++ b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb @@ -1,26 +1,7 @@ -DESCRIPTION = "PIN plugin for opie-security authentication. \ -It implements the same kind of widgets as opie-security package, \ -but this implementation can be used along with other authentication \ -methods in the Opie Multi-Authentication Framework." -SECTION = "opie/security" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -I18N_FILES = "libmultiauthpinplugin.ts" -RDEPENDS = "opie-security" -PV = "1.2.1+cvs${SRCDATE}" -APPNAME = "multiauthpinplugin" +include opie-securityplugin-pin.inc + +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/pin \ ${HANDHELDS_CVS};module=opie/pics " -S = "${WORKDIR}/pin" - -inherit opie - -# FILES plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png -do_install() { - install -d ${D}${palmtopdir}/pics/security/ - install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/ -} - diff --git a/packages/opie-securityplugins/opie-securityplugin.inc b/packages/opie-securityplugins/opie-securityplugin.inc new file mode 100644 index 0000000000..855a610f6d --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin.inc @@ -0,0 +1,8 @@ +SECTION = "opie/security" +PRIORITY = "optional" +MAINTAINER = "Team Opie <opie@handhelds.org>" +LICENSE = "GPL" +RDEPENDS = "opie-security" +I18N_FILES = "lib${APPNAME}.ts" + +inherit opie diff --git a/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb deleted file mode 100644 index c541bc78ed..0000000000 --- a/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -include ${PN}.inc - - - diff --git a/packages/opie-securityplugins/opie-securityplugins_cvs.bb b/packages/opie-securityplugins/opie-securityplugins_cvs.bb deleted file mode 100644 index f8c47a5c4f..0000000000 --- a/packages/opie-securityplugins/opie-securityplugins_cvs.bb +++ /dev/null @@ -1,4 +0,0 @@ -include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" - diff --git a/packages/opie-sfcave/opie-sfcave_cvs.bb b/packages/opie-sfcave/opie-sfcave_cvs.bb index 8b087d4f0b..b383491746 100644 --- a/packages/opie-sfcave/opie-sfcave_cvs.bb +++ b/packages/opie-sfcave/opie-sfcave_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/sfcave \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-sh-snes/files/snes.png b/packages/opie-sh-snes/files/snes.png Binary files differindex 2bb69e733f..2c0abfe7e6 100644 --- a/packages/opie-sh-snes/files/snes.png +++ b/packages/opie-sh-snes/files/snes.png diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb index f8c47a5c4f..0ce2a6b704 100644 --- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb +++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb @@ -1,4 +1,5 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +#Remove the dash below when 1.2.1 changes +PV = "1.2.1+cvs-${SRCDATE}" diff --git a/packages/opie-sh/opie-sh_cvs.bb b/packages/opie-sh/opie-sh_cvs.bb index 782f06e4ba..efa04a2178 100644 --- a/packages/opie-sh/opie-sh_cvs.bb +++ b/packages/opie-sh/opie-sh_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/opie-sh \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-sheet/opie-sheet_cvs.bb b/packages/opie-sheet/opie-sheet_cvs.bb index dbf3aa0825..629457892a 100644 --- a/packages/opie-sheet/opie-sheet_cvs.bb +++ b/packages/opie-sheet/opie-sheet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-sheet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-snake/opie-snake_cvs.bb b/packages/opie-snake/opie-snake_cvs.bb index 1c6b515278..c2a9e9b47d 100644 --- a/packages/opie-snake/opie-snake_cvs.bb +++ b/packages/opie-snake/opie-snake_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/snake \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-solitaire/opie-solitaire_cvs.bb b/packages/opie-solitaire/opie-solitaire_cvs.bb index b5aae11de6..184bec3f73 100644 --- a/packages/opie-solitaire/opie-solitaire_cvs.bb +++ b/packages/opie-solitaire/opie-solitaire_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/solitaire \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb index 9d58620165..63854616fa 100644 --- a/packages/opie-sounds/opie-sounds_cvs.bb +++ b/packages/opie-sounds/opie-sounds_cvs.bb @@ -1,5 +1,6 @@ include ${PN}.inc - -PV = "1.2.1+cvs${SRCDATE}" + +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.1+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/sounds" diff --git a/packages/opie-sshkeys/opie-sshkeys_cvs.bb b/packages/opie-sshkeys/opie-sshkeys_cvs.bb index a6e7536f36..bb1c458f9f 100644 --- a/packages/opie-sshkeys/opie-sshkeys_cvs.bb +++ b/packages/opie-sshkeys/opie-sshkeys_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sshkeys \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-stumbler/files/opiestumbler.png b/packages/opie-stumbler/files/opiestumbler.png Binary files differindex 6d491ed7e8..8ca7b4b604 100644 --- a/packages/opie-stumbler/files/opiestumbler.png +++ b/packages/opie-stumbler/files/opiestumbler.png diff --git a/packages/opie-stumbler/opie-stumbler_cvs.bb b/packages/opie-stumbler/opie-stumbler_cvs.bb index 3bc3f32fca..0c772b23af 100644 --- a/packages/opie-stumbler/opie-stumbler_cvs.bb +++ b/packages/opie-stumbler/opie-stumbler_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opiestumbler \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-style-flat/opie-style-flat_cvs.bb b/packages/opie-style-flat/opie-style-flat_cvs.bb index 23f048b193..02e203f24b 100644 --- a/packages/opie-style-flat/opie-style-flat_cvs.bb +++ b/packages/opie-style-flat/opie-style-flat_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/flat " diff --git a/packages/opie-style-fresh/opie-style-fresh_cvs.bb b/packages/opie-style-fresh/opie-style-fresh_cvs.bb index 53e7d08d6f..8e82eb2010 100644 --- a/packages/opie-style-fresh/opie-style-fresh_cvs.bb +++ b/packages/opie-style-fresh/opie-style-fresh_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/fresh " diff --git a/packages/opie-style-liquid/opie-style-liquid_cvs.bb b/packages/opie-style-liquid/opie-style-liquid_cvs.bb index 0f62f0ce89..d3110b062b 100644 --- a/packages/opie-style-liquid/opie-style-liquid_cvs.bb +++ b/packages/opie-style-liquid/opie-style-liquid_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/liquid " diff --git a/packages/opie-style-metal/opie-style-metal_cvs.bb b/packages/opie-style-metal/opie-style-metal_cvs.bb index 46dd132960..70e8511995 100644 --- a/packages/opie-style-metal/opie-style-metal_cvs.bb +++ b/packages/opie-style-metal/opie-style-metal_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/metal " diff --git a/packages/opie-style-phase/opie-style-phase_cvs.bb b/packages/opie-style-phase/opie-style-phase_cvs.bb index 158e6ee471..1a4370c959 100644 --- a/packages/opie-style-phase/opie-style-phase_cvs.bb +++ b/packages/opie-style-phase/opie-style-phase_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/phase" diff --git a/packages/opie-style-web/opie-style-web_cvs.bb b/packages/opie-style-web/opie-style-web_cvs.bb index 3e16a97f49..7a62ed8340 100644 --- a/packages/opie-style-web/opie-style-web_cvs.bb +++ b/packages/opie-style-web/opie-style-web_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/web" diff --git a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb index 09cf46c96e..62b2920441 100644 --- a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb +++ b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/suspendapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-symlinker/opie-symlinker_cvs.bb b/packages/opie-symlinker/opie-symlinker_cvs.bb index be4d1d6fe5..8a525c069b 100644 --- a/packages/opie-symlinker/opie-symlinker_cvs.bb +++ b/packages/opie-symlinker/opie-symlinker_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/symlinker " diff --git a/packages/opie-sysinfo/opie-sysinfo_cvs.bb b/packages/opie-sysinfo/opie-sysinfo_cvs.bb index 3454154dc2..800fdb998f 100644 --- a/packages/opie-sysinfo/opie-sysinfo_cvs.bb +++ b/packages/opie-sysinfo/opie-sysinfo_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-systemtime/opie-systemtime_cvs.bb b/packages/opie-systemtime/opie-systemtime_cvs.bb index 30606d7926..4b9d2ea7ac 100644 --- a/packages/opie-systemtime/opie-systemtime_cvs.bb +++ b/packages/opie-systemtime/opie-systemtime_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/netsystemtime \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-tableviewer/opie-tableviewer_cvs.bb b/packages/opie-tableviewer/opie-tableviewer_cvs.bb index d391539791..7e5995836e 100644 --- a/packages/opie-tableviewer/opie-tableviewer_cvs.bb +++ b/packages/opie-tableviewer/opie-tableviewer_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tableviewer \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index f662b2f4aa..b9e6ff9720 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-tetrix/opie-tetrix_cvs.bb b/packages/opie-tetrix/opie-tetrix_cvs.bb index 0dc932668d..32ecabb861 100644 --- a/packages/opie-tetrix/opie-tetrix_cvs.bb +++ b/packages/opie-tetrix/opie-tetrix_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tetrix \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-textedit/opie-textedit_cvs.bb b/packages/opie-textedit/opie-textedit_cvs.bb index ad29b882fc..5e4bdd9eb0 100644 --- a/packages/opie-textedit/opie-textedit_cvs.bb +++ b/packages/opie-textedit/opie-textedit_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-theme/opie-theme_cvs.bb b/packages/opie-theme/opie-theme_cvs.bb index 2e237fa95b..dd00a68b1a 100644 --- a/packages/opie-theme/opie-theme_cvs.bb +++ b/packages/opie-theme/opie-theme_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/theme \ ${HANDHELDS_CVS};module=opie/plugins/styles " diff --git a/packages/opie-tictac/opie-tictac_cvs.bb b/packages/opie-tictac/opie-tictac_cvs.bb index a5e62a0566..5e0147450a 100644 --- a/packages/opie-tictac/opie-tictac_cvs.bb +++ b/packages/opie-tictac/opie-tictac_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tictac \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-tinykate/opie-tinykate_cvs.bb b/packages/opie-tinykate/opie-tinykate_cvs.bb index e166b9ad7f..237bbe4623 100644 --- a/packages/opie-tinykate/opie-tinykate_cvs.bb +++ b/packages/opie-tinykate/opie-tinykate_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tinykate \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb index 3ffbf54318..4bb9617da5 100644 --- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb +++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/addressbook " diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb index a13eb97a21..91cb7e428b 100644 --- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb +++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/datebook " diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb index f9e3822561..3a756a7a35 100644 --- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb +++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/fortune " diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb index 3153a1a3fe..462a1f77fa 100644 --- a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb +++ b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/mail " diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb index 07aacd9f09..42896a07ed 100644 --- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb +++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/stockticker \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb index f1e301cdb9..c1c27599a8 100644 --- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb +++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/todolist " diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb index 04d5635422..5cc9e2bc1e 100644 --- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb +++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/weather \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-today/opie-today_cvs.bb b/packages/opie-today/opie-today_cvs.bb index de4af163f9..5135a334cb 100644 --- a/packages/opie-today/opie-today_cvs.bb +++ b/packages/opie-today/opie-today_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-todo/opie-todo_cvs.bb b/packages/opie-todo/opie-todo_cvs.bb index f7a9db7bb5..6ae1079847 100644 --- a/packages/opie-todo/opie-todo_cvs.bb +++ b/packages/opie-todo/opie-todo_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/todo \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-tonleiter/opie-tonleiter_cvs.bb b/packages/opie-tonleiter/opie-tonleiter_cvs.bb index f02528c4b6..77dcd1c8db 100644 --- a/packages/opie-tonleiter/opie-tonleiter_cvs.bb +++ b/packages/opie-tonleiter/opie-tonleiter_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/tonleiter \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb index f9da0438ff..e31427c256 100644 --- a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb +++ b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/unikeyboard " diff --git a/packages/opie-usermanager/opie-usermanager_cvs.bb b/packages/opie-usermanager/opie-usermanager_cvs.bb index b987644d1d..648caeb97c 100644 --- a/packages/opie-usermanager/opie-usermanager_cvs.bb +++ b/packages/opie-usermanager/opie-usermanager_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/usermanager \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb index cc4118500e..5ea8b91fba 100644 --- a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb +++ b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sound \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-vmemo/opie-vmemo_cvs.bb b/packages/opie-vmemo/opie-vmemo_cvs.bb index 297433a108..9f66e5864e 100644 --- a/packages/opie-vmemo/opie-vmemo_cvs.bb +++ b/packages/opie-vmemo/opie-vmemo_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vmemo \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb index e2a03712d5..50e180dd8f 100644 --- a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb +++ b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/volumeapplet \ diff --git a/packages/opie-vtapplet/opie-vtapplet_cvs.bb b/packages/opie-vtapplet/opie-vtapplet_cvs.bb index 13c2d80b9c..4b73250b50 100644 --- a/packages/opie-vtapplet/opie-vtapplet_cvs.bb +++ b/packages/opie-vtapplet/opie-vtapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vtapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb index 16ac12c510..e223d11a73 100644 --- a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb +++ b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/wellenreiter \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb index efb8c65d78..fd5f3f584c 100644 --- a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb +++ b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/wirelessapplet" diff --git a/packages/opie-wordgame/opie-wordgame_cvs.bb b/packages/opie-wordgame/opie-wordgame_cvs.bb index adc05e192e..3f143e1dc4 100644 --- a/packages/opie-wordgame/opie-wordgame_cvs.bb +++ b/packages/opie-wordgame/opie-wordgame_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/wordgame \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-write/opie-write_cvs.bb b/packages/opie-write/opie-write_cvs.bb index c93125bf51..b552bf6152 100644 --- a/packages/opie-write/opie-write_cvs.bb +++ b/packages/opie-write/opie-write_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb index 92ba1f3bd3..91167ca860 100644 --- a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb +++ b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/zkbapplet \ ${HANDHELDS_CVS};module=opie/share \ diff --git a/packages/opie-zlines/opie-zlines_cvs.bb b/packages/opie-zlines/opie-zlines_cvs.bb index c3ffa80d43..4e99318420 100644 --- a/packages/opie-zlines/opie-zlines_cvs.bb +++ b/packages/opie-zlines/opie-zlines_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zlines \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-zsafe/opie-zsafe_cvs.bb b/packages/opie-zsafe/opie-zsafe_cvs.bb index 88b3519bfc..5e58e8e544 100644 --- a/packages/opie-zsafe/opie-zsafe_cvs.bb +++ b/packages/opie-zsafe/opie-zsafe_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/zsafe \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-zsame/opie-zsame_cvs.bb b/packages/opie-zsame/opie-zsame_cvs.bb index 2b0e7adfae..8e9011b806 100644 --- a/packages/opie-zsame/opie-zsame_cvs.bb +++ b/packages/opie-zsame/opie-zsame_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PV = "1.2.1+cvs${SRCDATE}" +PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zsame \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/pkgconfig/pkgconfig-0.15.0/pkg.m4 b/packages/pkgconfig/pkgconfig-0.15.0/pkg.m4 new file mode 100644 index 0000000000..cbb46dbf83 --- /dev/null +++ b/packages/pkgconfig/pkgconfig-0.15.0/pkg.m4 @@ -0,0 +1,156 @@ +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [$4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES diff --git a/packages/pkgconfig/pkgconfig_0.15.0.bb b/packages/pkgconfig/pkgconfig_0.15.0.bb index e38e20438d..31fc7820fe 100644 --- a/packages/pkgconfig/pkgconfig_0.15.0.bb +++ b/packages/pkgconfig/pkgconfig_0.15.0.bb @@ -5,10 +5,11 @@ It replaces the ubiquitous *-config scripts you may have \ seen with a single tool." HOMEPAGE = "http://www.freedesktop.org/software/pkgconfig/" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-${PV}.tar.gz \ file://configure.patch;patch=1 \ + file://pkg.m4 \ file://glibconfig-sysdefs.h" inherit autotools @@ -16,6 +17,7 @@ inherit autotools acpaths = "-I ." do_configure_prepend () { install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/ + install -m 0644 ${WORKDIR}/pkg.m4 ${S}/ } do_stage_append() { diff --git a/packages/portaudio/portaudio_0.0.19.bb b/packages/portaudio/portaudio_0.0.19.bb index 68809e7c41..efb3cc31db 100644 --- a/packages/portaudio/portaudio_0.0.19.bb +++ b/packages/portaudio/portaudio_0.0.19.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PV = "0.0.19+cvs${SRCDATE}" +PV = "1:0.0.19+cvs${SRCDATE}" PR = "r1" SRC_URI = "http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz" diff --git a/packages/prism54/prism54-module_cvs.bb b/packages/prism54/prism54-module_cvs.bb index e0d5b76a8b..7953eb46b3 100644 --- a/packages/prism54/prism54-module_cvs.bb +++ b/packages/prism54/prism54-module_cvs.bb @@ -1,5 +1,5 @@ SECTION = "base" -PV = "0.0+cvs${SRCDATE}" +PV = "1.2+cvs${SRCDATE}" include prism54-module_1.2.bb diff --git a/packages/putty/putty_svn.bb b/packages/putty/putty_svn.bb index b14d957a4d..55f827b467 100644 --- a/packages/putty/putty_svn.bb +++ b/packages/putty/putty_svn.bb @@ -1,7 +1,8 @@ DESCRIPTION = "PuTTY is a free implementation of Telnet and SSH for Win32 and Unix platforms" SECTION = "console/network" LICENSE = "MIT" -PV = "0.58+cvs${SRCDATE}" +#Remove the dash below when 0.58 changes in PV +PV = "0.58+cvs-${SRCDATE}" SRC_URI = "svn://ixion.tartarus.org/main;module=putty \ file://lib.pro \ diff --git a/packages/qplot/qplot_2.0.1+cvs20020420.bb b/packages/qplot/qplot_2.0.1+cvs20020420.bb index af257baa79..b78afd9a76 100644 --- a/packages/qplot/qplot_2.0.1+cvs20020420.bb +++ b/packages/qplot/qplot_2.0.1+cvs20020420.bb @@ -5,7 +5,8 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" HOMEPAGE = "http://qplot.sourceforge.net/" SRCDATE = 20020420 -PV = "2.0.1+cvs${SRCDATE}" +#Change to form x.y.z+cvs${SRCDATE} when 2.0.1 changes in PV +PV = "2.0.1-cvs-${SRCDATE}" PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/qplot;module=qplot \ diff --git a/packages/slugimage/slugimage-native.bb b/packages/slugimage/slugimage-native.bb index 6b21d208e6..14a1ab5d64 100644 --- a/packages/slugimage/slugimage-native.bb +++ b/packages/slugimage/slugimage-native.bb @@ -7,7 +7,6 @@ RDEPENDS = "" inherit native FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugimage-${PV}', '${FILE_DIRNAME}/slugimage', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -PACKAGES = "" do_stage () { install -m 0755 slugimage/slugimage ${STAGING_BINDIR}/ diff --git a/packages/tremor/tremor_svn.bb b/packages/tremor/tremor_svn.bb index 8b9d538f92..fd3dead30a 100644 --- a/packages/tremor/tremor_svn.bb +++ b/packages/tremor/tremor_svn.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" DEPENDS = "libogg" DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec." -PV = "0.0+svn${SRCDATE}" +PV = "1:0.0+svn${SRCDATE}" LICENSE = "BSD" DEFAULT_PREFERENCE = "-1" diff --git a/packages/usbutils/usbutils_cvs.bb b/packages/usbutils/usbutils_cvs.bb index 0c9d303256..85c4b51b21 100644 --- a/packages/usbutils/usbutils_cvs.bb +++ b/packages/usbutils/usbutils_cvs.bb @@ -3,7 +3,7 @@ SECTION = "base" DEPENDS += "libusb" LICENSE = "GPL" PRIORITY = "optional" -PV = "0.70+cvs${SRCDATE}" +PV = "0.71+cvs${SRCDATE}" PR = "r3" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/linux-usb;module=usbutils" |
