diff options
| author | Holger Freyther <zecke@selfish.org> | 2006-08-05 15:55:25 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2006-08-05 15:55:25 +0000 |
| commit | 042fb6d5f34d3a35d0d0a900ec9e9b0edc3ddd1e (patch) | |
| tree | 0cda43ff46d05cabed8ac23952a504e3c6b517ba | |
| parent | a1a669ff49805375105ac8a778030123160db9a1 (diff) | |
| parent | 652b3d38e56d6b52e923e73a1ed4228072696874 (diff) | |
merge of '61c6cd8658c99e2416e242b79cdff01967f01c94'
and 'f2735ada47cf2da717d1f68b7c88a4d129f0e8b2'
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 2 | ||||
| -rw-r--r-- | packages/e17/entice_20060128.bb | 4 | ||||
| -rw-r--r-- | packages/udev/udev-092/local.rules | 2 | ||||
| -rw-r--r-- | packages/udev/udev_092.bb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 020e3f98a3..058f39214e 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -51,7 +51,7 @@ PREFERRED_VERSION_freetype = "2.2.1" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-drive" +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb index 271bcc0e8f..48c37c72a2 100644 --- a/packages/e17/entice_20060128.bb +++ b/packages/e17/entice_20060128.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Entice is the E17 picture viewer" # can also depend on GIMP for editing DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" -PR = "r2" +PR = "r3" inherit e -RDEPENDS += "esmart-x11" +RDEPENDS += "libesmart-container-plugins libesmart-thumb0 libesmart-trans-x11-0 libesmart-file-dialog0" SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}" S = "${WORKDIR}/entice" diff --git a/packages/udev/udev-092/local.rules b/packages/udev/udev-092/local.rules index 661922dda3..2308b52c4a 100644 --- a/packages/udev/udev-092/local.rules +++ b/packages/udev/udev-092/local.rules @@ -28,4 +28,4 @@ KERNEL=="rtc0", SYMLINK+="rtc" ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" # Create a symlink to any touchscreen input device -SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*k*14A,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
\ No newline at end of file +SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb index 5a84abcc7d..802b1e6246 100644 --- a/packages/udev/udev_092.bb +++ b/packages/udev/udev_092.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES = "hotplug" -PR = "r6" +PR = "r7" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ |