diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
| commit | f45580a1527dccdda100eee7f25f9f2c41af4db8 (patch) | |
| tree | 2218d4955f368e1804d86f212cc78317b4327f77 /conf/distro/include/sane-feed-deb.inc | |
| parent | 887b437869709625f5323438808ded9990cf590a (diff) | |
| parent | e3df24d64a48aff19aa9960dd9308a071b243b09 (diff) | |
| download | openembedded-f45580a1527dccdda100eee7f25f9f2c41af4db8.tar.gz | |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/enotes/enotes_svn.bb
recipes/intone-video/intone-video_svn.bb
recipes/intone/intone_svn.bb
recipes/shr/shr-wizard_git.bb
recipes/tasks/task-shr-minimal.bb
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'conf/distro/include/sane-feed-deb.inc')
| -rw-r--r-- | conf/distro/include/sane-feed-deb.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/sane-feed-deb.inc b/conf/distro/include/sane-feed-deb.inc index 4f38b8f936..d953d6ebe0 100644 --- a/conf/distro/include/sane-feed-deb.inc +++ b/conf/distro/include/sane-feed-deb.inc @@ -2,5 +2,5 @@ INHERIT += "package_deb" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" |