diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-12 17:12:05 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-12 17:12:05 +0000 |
| commit | d0e9d51dbd5fc3bf911861a3349a13b84aa7b97a (patch) | |
| tree | f4b7c6d53bcd0cf97ac275ac59102d201949e8f4 /conf/distro/include | |
| parent | 70211bf9611becd78daefde81ce10aa226aecc45 (diff) | |
| parent | 4f2ab4a21f451bace3a029be94419489b17cf15d (diff) | |
merge of '362f3d6a8fb4eb2bc44fac0cae3ce447a01f8a51'
and '75595250bb078a7e100758af5cacaf37e3c03572'
Diffstat (limited to 'conf/distro/include')
| -rw-r--r-- | conf/distro/include/preferred-opie-cvs-versions.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/preferred-opie-versions.inc | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc index 93b068ee65..d27f56fb04 100644 --- a/conf/distro/include/preferred-opie-cvs-versions.inc +++ b/conf/distro/include/preferred-opie-cvs-versions.inc @@ -106,7 +106,8 @@ SRCDATE_opie-mediaplayer1-libmadplugin ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer1-libmodplugin ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer1-libtremorplugin ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer1-libwavplugin ?= "${OPIE_VERSION}" -SRCDATE_opie-mediaplayer1 ?= "${OPIE_VERSION}" +SRCDATE_opie-mediaplayer1-libwavplugin ?= "${OPIE_VERSION}" +SRCDATE_opie-mediaplayer1-core ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer2 ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer2-skin-default ?= "${OPIE_VERSION}" SRCDATE_opie-mediaplayer2-skin-default-landscape ?= "${OPIE_VERSION}" diff --git a/conf/distro/include/preferred-opie-versions.inc b/conf/distro/include/preferred-opie-versions.inc index d7c5b94f7a..84c0b212ed 100644 --- a/conf/distro/include/preferred-opie-versions.inc +++ b/conf/distro/include/preferred-opie-versions.inc @@ -32,9 +32,9 @@ 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-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}" @@ -106,6 +106,7 @@ 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}" |