diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/procps | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/procps')
| -rw-r--r-- | package/procps/Makefile | 8 | ||||
| -rw-r--r-- | package/procps/ipkg/procps.control | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/procps/Makefile b/package/procps/Makefile index 8b44d3eca..a57e034fe 100644 --- a/package/procps/Makefile +++ b/package/procps/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= procps PKG_VERSION:= 3.2.7 PKG_RELEASE:= 4 PKG_MD5SUM:= f490bca772b16472962c7b9f23b1e97d -MASTER_SITES:= http://procps.sourceforge.net/ +PKG_DESCR:= The /proc file system utilities +PKG_SECTION:= utils +PKG_DEPENDS:= libncurses +PKG_URL:= http://procps.sourceforge.net +PKG_SITES:= http://procps.sourceforge.net/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PROCPS,procps,${PKG_VERSION}-${PKG_RELEASE},libncurses)) +$(eval $(call PKG_template,PROCPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/procps/ipkg/procps.control b/package/procps/ipkg/procps.control deleted file mode 100644 index bc18dd7d8..000000000 --- a/package/procps/ipkg/procps.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: procps -Priority: optional -Section: utilities -Description: The /proc file system utilities |