From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/lm_sensors/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/lm_sensors') diff --git a/package/lm_sensors/Makefile b/package/lm_sensors/Makefile index f32cdea25..59261005e 100644 --- a/package/lm_sensors/Makefile +++ b/package/lm_sensors/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= lm_sensors PKG_VERSION:= 3.3.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 8c0eebda8524fc87da1393b4564d279b -PKG_DESCR:= linux hw sensor toolset -PKG_SECTION:= misc +PKG_DESCR:= hardware sensor toolset +PKG_SECTION:= sys/misc PKG_DEPENDS:= sysfsutils PKG_URL:= http://www.lm-sensors.org PKG_SITES:= http://dl.lm-sensors.org/lm-sensors/releases/ @@ -19,7 +19,7 @@ PKG_ARCH_DEPENDS:= x86 x86_64 PKG_SUBPKGS:= LM_SENSORS LM_SENSORS_DETECT PKGSD_LM_SENSORS_DETECT:= lm_sensors perl scripts (e.g. sensors-detect) -PKGSC_LM_SENSORS_DETECT:= misc +PKGSC_LM_SENSORS_DETECT:= sys/misc PKGSS_LM_SENSORS_DETECT:= perl PKGSB_LM_SENSORS_DETECT:= perl -- cgit v1.2.3