Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...

Conflicts:

	packages/madwifi/madwifi-ng_r3314-20080131.bb
	packages/python/python_2.5.2.bb

diff --cc classes/package.bbclass
Simple merge

diff --cc packages/autofs/autofs_4.1.4.bb
Simple merge

diff --cc packages/base-files/base-files_3.0.14.bb
Simple merge

diff --cc packages/eglibc/eglibc_svn.bb
Simple merge

diff --cc packages/gstreamer/gst-plugins-base_0.10.17.bb
index ad7b0a7,56c9bfa..381cca8
--- 1/packages/gstreamer/gst-plugins-base_0.10.17.bb
--- 2/packages/gstreamer/gst-plugins-base_0.10.17.bb
+++ b/packages/gstreamer/gst-plugins-base_0.10.17.bb
@@@ -6,7 -6,7 +6,7 @@@ PROVIDES += "gst-plugins
  # if alsa has been built and is present.  You will
  # not get an error if this is not present, just 
  # a missing alsa plugin
 -DEPENDS += "alsa-lib libsm"
 +DEPENDS += "alsa-lib"
  
- FILE_PR = "r3"
+ PR = "r3"
  

diff --cc packages/gstreamer/gst-plugins-good_0.10.7.bb
index 02eaf7f,ac3a5e7..1d50b96
--- 1/packages/gstreamer/gst-plugins-good_0.10.7.bb
--- 2/packages/gstreamer/gst-plugins-good_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-good_0.10.7.bb
@@@ -1,10 -1,10 +1,10 @@@
  require gst-plugins.inc
- FILE_PR = "r2"
+ PR = "r2"
  
 -inherit gconf 
 +#inherit gconf 
  
  EXTRA_OECONF += "--with-check=no"
 -DEPENDS += "gst-plugins-base esound"
 +DEPENDS += "gst-plugins-base"
  
 -PACKAGES =+ "gst-plugin-gconfelements"
 -FILES_gst-plugin-gconfelements += "${sysconfdir}/gconf"
 +#PACKAGES =+ "gst-plugin-gconfelements"
 +#FILES_gst-plugin-gconfelements += "${sysconfdir}/gconf"

diff --cc packages/gstreamer/gst-plugins-ugly_0.10.7.bb
index 82d7e55,fd008b0..2100e3e
--- 1/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
--- 2/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
@@@ -1,7 -1,7 +1,7 @@@
  require gst-plugins.inc
- FILE_PR = "r0"
+ PR = "r0"
  
 -DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
 +DEPENDS += "gst-plugins-base libsidplay"
  
  SRC_URI += "\
  #  file://cross-compile.patch;patch=1 \

diff --cc packages/libsidplay/libsidplay_1.36.59.bb
index 30cc3d2,9ca4ee1..8f7859f
--- 1/packages/libsidplay/libsidplay_1.36.59.bb
--- 2/packages/libsidplay/libsidplay_1.36.59.bb
+++ b/packages/libsidplay/libsidplay_1.36.59.bb
@@@ -3,9 -3,9 +3,9 @@@ SECTION = "libs
  PRIORITY = "optional"
  LICENSE = "GPL"
  
- FILE_PR = "r1"
+ PR = "r1"
  
 -SRC_URI = "http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-${PV}.tgz \
 +SRC_URI = "http://critical.ch/distfiles/libsidplay-${PV}.tgz \
             http://ftp.debian.org/debian/pool/main/libs/libsidplay/libsidplay_1.36.59-5.diff.gz;patch=1 \
  "
  

diff --cc packages/libungif/libungif_4.1.3.bb
Simple merge

diff --cc packages/madwifi/madwifi-ng_r.inc
Simple merge

diff --cc packages/madwifi/madwifi-ng_r3837-20080802.bb
Simple merge

diff --cc packages/netkit-base/netkit-base_0.17.bb
Simple merge

diff --cc packages/ppp/ppp_2.4.3.bb
Simple merge

diff --cc packages/samba/samba-essential_3.0.20.bb
index 24f4a1e,ecf591d..5d66b5a
--- 1/packages/samba/samba-essential_3.0.20.bb
--- 2/packages/samba/samba-essential_3.0.20.bb
+++ b/packages/samba/samba-essential_3.0.20.bb
@@@ -1,9 -1,9 +1,9 @@@
  require samba-essential.inc
  inherit update-rc.d
  
- FILE_PR = "r6"
+ PR = "r6"
  
 -SRC_URI = "file://config-lfs.patch;patch=1 \
 +SRC_URI += "file://config-lfs.patch;patch=1 \
           file://init-essential \
             file://quota.patch;patch=1;pnum=0 \
           file://smb-essential.conf \

diff --cc packages/sysvinit/sysvinit_2.86.bb
Simple merge

diff --cc packages/tasks/task-boot.bb
Simple merge

diff --cc packages/vsftpd/vsftpd_2.0.5.bb
Simple merge