diff options
| author | Vlad Glagolev | 2015-02-11 18:10:31 +0300 |
|---|---|---|
| committer | Vlad Glagolev | 2015-02-11 18:10:31 +0300 |
| commit | 01317669fe327e50ba03ff3ce15352ffa6e37479 (patch) | |
| tree | ae65a02bc7041c237db195167108420d4cbd224c /e-17 | |
| parent | e3c378e5017903b95b8ffff964b691861d467837 (diff) | |
| parent | 6bb0aa644327af60df0779dcd06cb7782d7559ca (diff) | |
Merge branch 'master' into devel-xorg-modular
Conflicts:
libs/sdl2/HISTORY
xorg-driver/xf86-video-intel/DEPENDS
xorg-driver/xf86-video-intel/HISTORY
xorg-xserver/xorg-server/DEPENDS
xorg-xserver/xorg-server/HISTORY
Diffstat (limited to 'e-17')
| -rwxr-xr-x | e-17/e17/DEPENDS | 2 | ||||
| -rw-r--r-- | e-17/e17/HISTORY | 3 | ||||
| -rwxr-xr-x | e-17/eeze/DEPENDS | 2 | ||||
| -rw-r--r-- | e-17/eeze/HISTORY | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/e-17/e17/DEPENDS b/e-17/e17/DEPENDS index 78c8b1eb8c..6349d9b030 100755 --- a/e-17/e17/DEPENDS +++ b/e-17/e17/DEPENDS @@ -41,7 +41,7 @@ optional_depends hal \ "--disable-device-hal --disable-mount-hal" \ "Enable HAL device backend and mounting support?" && -optional_depends UDEV \ +optional_depends DEVICE-MANAGER \ "--enable-device-udev" "--disable-device-udev" \ "Enable UDEV device backend?" && diff --git a/e-17/e17/HISTORY b/e-17/e17/HISTORY index 5c3e08eba6..4ad1c35b8b 100644 --- a/e-17/e17/HISTORY +++ b/e-17/e17/HISTORY @@ -1,3 +1,6 @@ +2015-02-11 Vlad Glagolev <stealth@sourcemage.org> + * DEPENDS: UDEV -> DEVICE-MANAGER + 2014-07-03 Ismael Luceno <ismael@sourcemage.org> * DETAILS: Use get_scm_version diff --git a/e-17/eeze/DEPENDS b/e-17/eeze/DEPENDS index 0c66048353..1f02354526 100755 --- a/e-17/eeze/DEPENDS +++ b/e-17/eeze/DEPENDS @@ -1,7 +1,7 @@ depends util-linux && depends ecore && depends eet && -depends UDEV && +depends DEVICE-MANAGER && optional_depends doxygen \ '--enable-doc' \ diff --git a/e-17/eeze/HISTORY b/e-17/eeze/HISTORY index ef4b63254e..92aef04080 100644 --- a/e-17/eeze/HISTORY +++ b/e-17/eeze/HISTORY @@ -1,3 +1,6 @@ +2015-02-11 Vlad Glagolev <stealth@sourcemage.org> + * DEPENDS: UDEV -> DEVICE-MANAGER + 2013-07-30 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.7.8 |