summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/own-mirrors.bbclass4
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.3-pre.inc412
-rw-r--r--conf/documentation.conf1
-rw-r--r--packages/ltp/.mtn2git_empty0
-rw-r--r--packages/ltp/ltp-20070228/.mtn2git_empty0
-rw-r--r--packages/ltp/ltp-20070228/cross-compile.patch51
-rw-r--r--packages/ltp/ltp-20070228/ltp-run4
-rw-r--r--packages/ltp/ltp-20070228/runltp-path.patch13
-rw-r--r--packages/ltp/ltp_20070228.bb42
-rw-r--r--packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb7
-rw-r--r--packages/opie-help-en/opie-help-en_cvs.bb3
-rw-r--r--packages/opie-i18n/opie-i18n_cvs.bb3
-rw-r--r--packages/opie-i18n/opie-lrelease-native_cvs.bb4
-rw-r--r--packages/opie-i18n/opie-lupdate-native_cvs.bb4
-rw-r--r--packages/opie-keytabs/opie-keytabs_cvs.bb3
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb3
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb3
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb3
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb3
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb3
-rw-r--r--packages/opie-multikey/opie-multikey_cvs.bb7
-rw-r--r--packages/opie-pics/opie-pics_cvs.bb3
-rw-r--r--packages/opie-sh-snes/opie-sh-snes_cvs.bb3
-rw-r--r--packages/opie-sounds/opie-sounds_cvs.bb3
-rw-r--r--packages/ttf-fonts/ttf-dejavu_2.15.bb (renamed from packages/ttf-fonts/ttf-dejavu_2.13.bb)0
25 files changed, 550 insertions, 32 deletions
diff --git a/classes/own-mirrors.bbclass b/classes/own-mirrors.bbclass
new file mode 100644
index 0000000000..32763ed24f
--- /dev/null
+++ b/classes/own-mirrors.bbclass
@@ -0,0 +1,4 @@
+PREMIRRORS() {
+http://.*/.* ${SOURCE_MIRROR_URL}
+ftp://.*/.* ${SOURCE_MIRROR_URL}
+}
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
new file mode 100644
index 0000000000..fa1edcc64c
--- /dev/null
+++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
@@ -0,0 +1,412 @@
+#
+# Default versions
+QTE_VERSION ?= "2.3.10"
+PALMTOP_USE_MULTITHREADED_QT ?= "yes"
+
+OPIE_SRCDATE ?= "20070308"
+OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
+OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
+
+#
+#
+# Opie libraries
+#
+PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
+PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
+PREFERRED_VERSION_qte-mt = "${QTE_VERSION}"
+PREFERRED_VERSION_qte = "${QTE_VERSION}"
+
+PREFERRED_VERSION_libopie2 ?= "${OPIE_VERSION}"
+PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}"
+
+SRCDATE_libopie2 ?= "${OPIE_SRCDATE}"
+SRCDATE_libopieobex0 = "${OPIE_SRCDATE}"
+SRCDATE_libopietooth1 = "${OPIE_SRCDATE}"
+SRCDATE_libqpe-opie = "${OPIE_SRCDATE}"
+SRCDATE_libqtaux2 = "${OPIE_SRCDATE}"
+SRCDATE_libmailwrapper = "${OPIE_SRCDATE}"
+
+#
+# Opie applications
+#
+PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluepin ?= "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothapplet ?= "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothmanager ?= "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-chrisholidayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-nationalholidayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-birthdayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-icon-reload = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lockapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-core = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-default = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-default-landscape = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-pod = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-techno = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qcop = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qss = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-blueping = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-dummy = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-notice = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-pin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wellenreiter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
+
+PREFERRED_VERSION_konqueror-embedded = "20060404"
+
+
+SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-addressbook = "${OPIE_SRCDATE}"
+SRCDATE_opie-advancedfm = "${OPIE_SRCDATE}"
+SRCDATE_opie-alarm = "${OPIE_SRCDATE}"
+SRCDATE_opie-appearance = "${OPIE_SRCDATE}"
+SRCDATE_opie-aqpkg = "${OPIE_SRCDATE}"
+SRCDATE_opie-autorotateapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-backgammon = "${OPIE_SRCDATE}"
+SRCDATE_opie-backup = "${OPIE_SRCDATE}"
+SRCDATE_opie-bartender = "${OPIE_SRCDATE}"
+SRCDATE_opie-batteryapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-bluepin ?= "${OPIE_SRCDATE}"
+SRCDATE_opie-bluetoothapplet ?= "${OPIE_SRCDATE}"
+SRCDATE_opie-bluetoothmanager ?= "${OPIE_SRCDATE}"
+SRCDATE_opie-bounce = "${OPIE_SRCDATE}"
+SRCDATE_opie-brightnessapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-button-settings = "${OPIE_SRCDATE}"
+SRCDATE_opie-buzzword = "${OPIE_SRCDATE}"
+SRCDATE_opie-calculator = "${OPIE_SRCDATE}"
+SRCDATE_opie-calibrate = "${OPIE_SRCDATE}"
+SRCDATE_opie-camera = "${OPIE_SRCDATE}"
+SRCDATE_opie-cardmon = "${OPIE_SRCDATE}"
+SRCDATE_opie-checkbook = "${OPIE_SRCDATE}"
+SRCDATE_opie-citytime = "${OPIE_SRCDATE}"
+SRCDATE_opie-clipboardapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-clockapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-clock = "${OPIE_SRCDATE}"
+SRCDATE_opie-confeditor = "${OPIE_SRCDATE}"
+SRCDATE_opie-console = "${OPIE_SRCDATE}"
+SRCDATE_opie-dagger = "${OPIE_SRCDATE}"
+SRCDATE_opie-dasher = "${OPIE_SRCDATE}"
+SRCDATE_opie-datebook = "${OPIE_SRCDATE}"
+SRCDATE_opie-datebook-chrisholidayplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-datebook-nationalholidayplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-datebook-birthdayplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-deco-flat = "${OPIE_SRCDATE}"
+SRCDATE_opie-deco-liquid = "${OPIE_SRCDATE}"
+SRCDATE_opie-deco-polished = "${OPIE_SRCDATE}"
+SRCDATE_opie-doctab = "${OPIE_SRCDATE}"
+SRCDATE_opie-drawpad = "${OPIE_SRCDATE}"
+SRCDATE_opie-dvorak = "${OPIE_SRCDATE}"
+SRCDATE_opie-embeddedkonsole = "${OPIE_SRCDATE}"
+SRCDATE_opie-euroconv = "${OPIE_SRCDATE}"
+SRCDATE_opie-examples-python = "${OPIE_SRCDATE}"
+SRCDATE_opie-examples = "${OPIE_SRCDATE}"
+SRCDATE_opie-eye = "${OPIE_SRCDATE}"
+SRCDATE_opie-fifteen = "${OPIE_SRCDATE}"
+SRCDATE_opie-formatter = "${OPIE_SRCDATE}"
+SRCDATE_opie-freetype = "${OPIE_SRCDATE}"
+SRCDATE_opie-ftplib = "${OPIE_SRCDATE}"
+SRCDATE_opie-ftp = "${OPIE_SRCDATE}"
+SRCDATE_opie-go = "${OPIE_SRCDATE}"
+SRCDATE_opie-gutenbrowser = "${OPIE_SRCDATE}"
+SRCDATE_opie-handwriting = "${OPIE_SRCDATE}"
+SRCDATE_opie-helpbrowser = "${OPIE_SRCDATE}"
+SRCDATE_opie-help-en = "${OPIE_SRCDATE}"
+SRCDATE_opie-homeapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-i18n = "${OPIE_SRCDATE}"
+SRCDATE_opie-lrelease-native = "${OPIE_SRCDATE}"
+SRCDATE_opie-lupdate-native = "${OPIE_SRCDATE}"
+SRCDATE_opie-icon-reload = "${OPIE_SRCDATE}"
+SRCDATE_opie-irc = "${OPIE_SRCDATE}"
+SRCDATE_opie-irdaapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-jumpx = "${OPIE_SRCDATE}"
+SRCDATE_opie-kbill = "${OPIE_SRCDATE}"
+SRCDATE_opie-kcheckers = "${OPIE_SRCDATE}"
+SRCDATE_opie-keyboard = "${OPIE_SRCDATE}"
+SRCDATE_opie-keypebble = "${OPIE_SRCDATE}"
+SRCDATE_opie-keytabs = "${OPIE_SRCDATE}"
+SRCDATE_opie-keyview = "${OPIE_SRCDATE}"
+SRCDATE_opie-kjumpx = "${OPIE_SRCDATE}"
+SRCDATE_opie-kpacman = "${OPIE_SRCDATE}"
+SRCDATE_opie-language = "${OPIE_SRCDATE}"
+SRCDATE_opie-launcher-settings = "${OPIE_SRCDATE}"
+SRCDATE_opie-libqrsync = "${OPIE_SRCDATE}"
+SRCDATE_opie-light-and-power = "${OPIE_SRCDATE}"
+SRCDATE_opie-lockapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-login = "${OPIE_SRCDATE}"
+SRCDATE_opie-logoutapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-mailapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-mail = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1-libmadplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1-libmodplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1-libtremorplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1-libwavplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1-core = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1 = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer2 = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer2-skin-default = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer2-skin-default-landscape = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer2-skin-pod = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer2-skin-techno = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediummount = "${OPIE_SRCDATE}"
+SRCDATE_opie-memoryapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-mindbreaker = "${OPIE_SRCDATE}"
+SRCDATE_opie-minesweep = "${OPIE_SRCDATE}"
+SRCDATE_opie-mobilemsg = "${OPIE_SRCDATE}"
+SRCDATE_opie-multikeyapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-multikey = "${OPIE_SRCDATE}"
+SRCDATE_opie-networkapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-networksettings = "${OPIE_SRCDATE}"
+SRCDATE_opie-notesapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-odict = "${OPIE_SRCDATE}"
+SRCDATE_opie-osearch = "${OPIE_SRCDATE}"
+SRCDATE_opie-oxygen = "${OPIE_SRCDATE}"
+SRCDATE_opie-oyatzee = "${OPIE_SRCDATE}"
+SRCDATE_opie-packagemanager = "${OPIE_SRCDATE}"
+SRCDATE_opie-parashoot = "${OPIE_SRCDATE}"
+SRCDATE_opie-pcmciaapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-performance = "${OPIE_SRCDATE}"
+SRCDATE_opie-pickboard = "${OPIE_SRCDATE}"
+SRCDATE_opie-pics = "${OPIE_SRCDATE}"
+SRCDATE_opie-pimconverter = "${OPIE_SRCDATE}"
+SRCDATE_opie-powerchord = "${OPIE_SRCDATE}"
+SRCDATE_opie-pyquicklaunchapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-qasteroids = "${OPIE_SRCDATE}"
+SRCDATE_opie-qcop = "${OPIE_SRCDATE}"
+SRCDATE_opie-quicklauncher = "${OPIE_SRCDATE}"
+SRCDATE_opie-qss = "${OPIE_SRCDATE}"
+SRCDATE_opie-rdesktop = "${OPIE_SRCDATE}"
+SRCDATE_opie-reader = "${OPIE_SRCDATE}"
+SRCDATE_opie-recorder = "${OPIE_SRCDATE}"
+SRCDATE_opie-remote = "${OPIE_SRCDATE}"
+SRCDATE_opie-restartapplet2 = "${OPIE_SRCDATE}"
+SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-rotateapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-screenshotapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-search = "${OPIE_SRCDATE}"
+SRCDATE_opie-security = "${OPIE_SRCDATE}"
+SRCDATE_opie-securityplugin-blueping = "${OPIE_SRCDATE}"
+SRCDATE_opie-securityplugin-dummy = "${OPIE_SRCDATE}"
+SRCDATE_opie-securityplugin-notice = "${OPIE_SRCDATE}"
+SRCDATE_opie-securityplugin-pin = "${OPIE_SRCDATE}"
+SRCDATE_opie-sfcave = "${OPIE_SRCDATE}"
+SRCDATE_opie-sheet = "${OPIE_SRCDATE}"
+SRCDATE_opie-sh = "${OPIE_SRCDATE}"
+SRCDATE_opie-showimg = "${OPIE_SRCDATE}"
+SRCDATE_opie-snake = "${OPIE_SRCDATE}"
+SRCDATE_opie-solitaire = "${OPIE_SRCDATE}"
+SRCDATE_opie-sshkeys = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-flat = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-fresh = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-liquid = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-metal = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-phase = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-web = "${OPIE_SRCDATE}"
+SRCDATE_opie-sounds = "${OPIE_SRCDATE}"
+SRCDATE_opie-suspendapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-symlinker = "${OPIE_SRCDATE}"
+SRCDATE_opie-sysinfo = "${OPIE_SRCDATE}"
+SRCDATE_opie-systemtime = "${OPIE_SRCDATE}"
+SRCDATE_opie-tableviewer = "${OPIE_SRCDATE}"
+SRCDATE_opie-tabmanager = "${OPIE_SRCDATE}"
+SRCDATE_opie-taskbar = "${OPIE_SRCDATE}"
+SRCDATE_opie-tetrix = "${OPIE_SRCDATE}"
+SRCDATE_opie-textedit = "${OPIE_SRCDATE}"
+SRCDATE_opie-theme = "${OPIE_SRCDATE}"
+SRCDATE_opie-tictac = "${OPIE_SRCDATE}"
+SRCDATE_opie-tinykate = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-addressbookplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-datebookplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-fortuneplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-mailplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-stocktickerplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-todolistplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-weatherplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-todo = "${OPIE_SRCDATE}"
+SRCDATE_opie-tonleiter = "${OPIE_SRCDATE}"
+SRCDATE_opie-unikeyboard = "${OPIE_SRCDATE}"
+SRCDATE_opie-usermanager = "${OPIE_SRCDATE}"
+SRCDATE_opie-vmemo = "${OPIE_SRCDATE}"
+SRCDATE_opie-vmemo-settings = "${OPIE_SRCDATE}"
+SRCDATE_opie-volumeapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-vtapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-wellenreiter = "${OPIE_SRCDATE}"
+SRCDATE_opie-wirelessapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-wordgame = "${OPIE_SRCDATE}"
+SRCDATE_opie-write = "${OPIE_SRCDATE}"
+SRCDATE_opie-zkbapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-zlines = "${OPIE_SRCDATE}"
+SRCDATE_opie-zsafe = "${OPIE_SRCDATE}"
+SRCDATE_opie-zsame = "${OPIE_SRCDATE}"
+SRCDATE_opie-sh-snes = "${OPIE_SRCDATE}"
+SRCDATE_opie-stumbler = "${OPIE_SRCDATE}"
+
diff --git a/conf/documentation.conf b/conf/documentation.conf
index 84533e69a1..4782a053ba 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -105,6 +105,7 @@ COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names su
COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser."
SOURCE_MIRROR_FETCH[doc] = "Switch marking build as source fetcher. Used to skip COMPATIBLE_* checking."
+SOURCE_MIRROR_URL[doc] = "URL to source mirror which will be used before fetching from original SRC_URI."
BBINCLUDELOGS[doc] = "Boolean switch to get log printed on failure."
BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
diff --git a/packages/ltp/.mtn2git_empty b/packages/ltp/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ltp/.mtn2git_empty
diff --git a/packages/ltp/ltp-20070228/.mtn2git_empty b/packages/ltp/ltp-20070228/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ltp/ltp-20070228/.mtn2git_empty
diff --git a/packages/ltp/ltp-20070228/cross-compile.patch b/packages/ltp/ltp-20070228/cross-compile.patch
new file mode 100644
index 0000000000..ae956fd8bf
--- /dev/null
+++ b/packages/ltp/ltp-20070228/cross-compile.patch
@@ -0,0 +1,51 @@
+diff -urN ltp-full-20060615.orig/Makefile ltp-full-20060615/Makefile
+--- ltp-full-20060615.orig/Makefile 2006-02-24 10:16:55.000000000 +0800
++++ ltp-full-20060615/Makefile 2006-07-07 17:10:22.000000000 +0800
+@@ -30,11 +30,12 @@
+ endif
+ ifdef CROSS_COMPILER
+ CC=$(CROSS_COMPILER)gcc
++CPP=$(CROSS_COMPILER)g++
+ AR=$(CROSS_COMPILER)ar
+ endif
+
+ export CFLAGS += -Wall $(CROSS_CFLAGS)
+-export CC AR LDFLAGS
++export CC AR LDFLAGS CPP
+
+ -include config.mk
+
+diff -urN ltp-full-20060615.orig/testcases/ballista/ballista/Makefile ltp-full-20060615/testcases/ballista/ballista/Makefile
+--- ltp-full-20060615.orig/testcases/ballista/ballista/Makefile 2006-02-23 08:33:27.000000000 +0800
++++ ltp-full-20060615/testcases/ballista/ballista/Makefile 2006-07-07 17:11:29.000000000 +0800
+@@ -24,7 +24,7 @@
+ ########################
+
+ # compiler info for the host
+-CC = g++ -Wno-deprecated
++CC = $(CPP) -Wno-deprecated
+ CFLAGS = -w -O ${TARGET_DEF}
+ CLIBS = -lpthread -ldl -lnsl -rdynamic
+ TEST_MAN_FILE = selfHost
+diff -urN ltp-full-20060615.orig/testcases/network/nfs/cthon04/tests.init ltp-full-20060615/testcases/network/nfs/cthon04/tests.init
+--- ltp-full-20060615.orig/testcases/network/nfs/cthon04/tests.init 2005-09-01 04:27:17.000000000 +0800
++++ ltp-full-20060615/testcases/network/nfs/cthon04/tests.init 2006-07-07 17:12:28.000000000 +0800
+@@ -73,7 +73,7 @@
+ # Tru64 UNIX
+ # SVR4
+ # Linux
+-PATH=/bin:/usr/bin:/usr/ucb:/usr/ccs/bin:/sbin:/usr/sbin:.
++#PATH=/bin:/usr/bin:/usr/ucb:/usr/ccs/bin:/sbin:/usr/sbin:.
+
+ # Use this path for:
+ # DG/UX
+@@ -104,7 +104,9 @@
+ # Do not remove the following three lines. They may be overridden by
+ # other configuration parameters lower in this file, but these three
+ # variables must be defined.
++ifndef CC
+ CC=cc
++endif
+ CFLAGS=
+ LIBS=
+ LOCKTESTS=tlock
diff --git a/packages/ltp/ltp-20070228/ltp-run b/packages/ltp/ltp-20070228/ltp-run
new file mode 100644
index 0000000000..5d97f00532
--- /dev/null
+++ b/packages/ltp/ltp-20070228/ltp-run
@@ -0,0 +1,4 @@
+#!/bin/sh
+/usr/libexec/ltp/runltp -t 180s > /home/root/testlog.txt
+echo "Benchmark run finished...."
+touch /home/root/testfinished.flag
diff --git a/packages/ltp/ltp-20070228/runltp-path.patch b/packages/ltp/ltp-20070228/runltp-path.patch
new file mode 100644
index 0000000000..dfbbf353ec
--- /dev/null
+++ b/packages/ltp/ltp-20070228/runltp-path.patch
@@ -0,0 +1,13 @@
+Index: runltp
+===================================================================
+--- ltp-full-20060412.orig/runltp 2005-03-12 03:26:14.000000000 +0800
++++ ltp-full-20060412/runltp 2006-04-26 16:42:13.000000000 +0800
+@@ -43,7 +43,7 @@
+ echo "FATAL: unable to change directory to $(dirname $0)"
+ exit 1
+ }
+- export LTPROOT=${PWD}
++ export LTPROOT=/usr/libexec/ltp
+ export TMPBASE="/tmp"
+ export TMP="${TMPBASE}/ltp-$$"
+ export PATH="${PATH}:${LTPROOT}/testcases/bin"
diff --git a/packages/ltp/ltp_20070228.bb b/packages/ltp/ltp_20070228.bb
new file mode 100644
index 0000000000..400d642641
--- /dev/null
+++ b/packages/ltp/ltp_20070228.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "Linux Test Project"
+HOMEPAGE = "http://ltp.sourceforge.net"
+LICENSE = "GPL"
+SECTION = "console/utils"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.tgz \
+ file://cross-compile.patch;patch=1 \
+ file://runltp-path.patch;patch=1 \
+ file://ltp-run"
+
+S = "${WORKDIR}/ltp-full-${PV}"
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${HOST_PREFIX}"
+
+do_compile(){
+ oe_runmake CROSS_COMPILE=${HOST_PREFIX}
+}
+
+do_install(){
+ export CREATE=0
+ export LTPROOT=${D}/usr/libexec/ltp/testcases
+
+ oe_runmake install
+
+ install -d ${D}/usr/libexec/ltp/testcases
+ install -d ${D}/usr/libexec/ltp/pan
+
+ #install testcases
+ #install -m 0755 ${WORKDIR}/testcases ${D}/usr/libexec/ltp/testcases
+ #install -m 0755 ${WORKDIR}/testcases ${D}/usr/libexec/ltp/
+
+ # treecopy testcases pan/pan runtest ver_linux IDcheck.sh \
+ # ${D}/usr/libexec/ltp
+ cp testcases ${D}/usr/libexec/ltp/ -rfp
+ rm ${D}/usr/libexec/ltp/ballista -rf
+ cp pan/pan ${D}/usr/libexec/ltp/pan -p
+ cp runtest ${D}/usr/libexec/ltp/ -rfp
+ cp ver_linux ${D}/usr/libexec/ltp/ -p
+ cp runltp ${D}/usr/libexec/ltp/ -p
+ cp IDcheck.sh ${D}/usr/libexec/ltp/ -p
+}
+
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
index a919c3094b..98ac64a4c1 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
@@ -1,8 +1,9 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
- ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \
- file://sysconfig-bluetooth.patch;patch=1"
+ ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"
+
+# file://sysconfig-bluetooth.patch;patch=1"
diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb
index 787b40833f..ccd75ca89a 100644
--- a/packages/opie-help-en/opie-help-en_cvs.bb
+++ b/packages/opie-help-en/opie-help-en_cvs.bb
@@ -1,6 +1,5 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html "
diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb
index 3e269e73ef..6532cd170c 100644
--- a/packages/opie-i18n/opie-i18n_cvs.bb
+++ b/packages/opie-i18n/opie-i18n_cvs.bb
@@ -1,7 +1,6 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
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 94401fab78..9bce52188f 100644
--- a/packages/opie-i18n/opie-lrelease-native_cvs.bb
+++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
+
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 5f2d834b74..e7c33b6da0 100644
--- a/packages/opie-i18n/opie-lupdate-native_cvs.bb
+++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
+
SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \
${HANDHELDS_CVS};module=opie/development/translation/shared"
diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb
index d18339a046..c81cd23eb9 100644
--- a/packages/opie-keytabs/opie-keytabs_cvs.bb
+++ b/packages/opie-keytabs/opie-keytabs_cvs.bb
@@ -1,6 +1,5 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/etc"
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 3cb7f8551e..23898147b1 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
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 b2e826ae59..bbfbd25e2b 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
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 d091f50903..ac3f961b3c 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
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 ca44bfc3af..10a119a48a 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index 2badc15abd..b080b3ce92 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
@@ -1,7 +1,6 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index 5080a4d984..fa74824d73 100644
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,8 +1,9 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
- ${HANDHELDS_CVS};module=opie/share \
- file://friendly-button-names.patch;patch=1"
+ ${HANDHELDS_CVS};module=opie/share"
+
+# file://friendly-button-names.patch;patch=1"
diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb
index 593ea5bf9c..185ff2f338 100644
--- a/packages/opie-pics/opie-pics_cvs.bb
+++ b/packages/opie-pics/opie-pics_cvs.bb
@@ -1,7 +1,6 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
${HANDHELDS_CVS};module=opie/pics-hires"
diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
index 7c49fdd77b..cf67d0c2e8 100644
--- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
@@ -1,5 +1,4 @@
require ${PN}.inc
-#Remove the dash below when 1.2.1 changes
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb
index 818a1c48f1..bbd3046b64 100644
--- a/packages/opie-sounds/opie-sounds_cvs.bb
+++ b/packages/opie-sounds/opie-sounds_cvs.bb
@@ -1,6 +1,5 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/sounds"
diff --git a/packages/ttf-fonts/ttf-dejavu_2.13.bb b/packages/ttf-fonts/ttf-dejavu_2.15.bb
index c1b743aa1b..c1b743aa1b 100644
--- a/packages/ttf-fonts/ttf-dejavu_2.13.bb
+++ b/packages/ttf-fonts/ttf-dejavu_2.15.bb