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/bwm | |
| 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/bwm')
| -rw-r--r-- | package/bwm/Makefile | 7 | ||||
| -rw-r--r-- | package/bwm/ipkg/bwm.control | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/package/bwm/Makefile b/package/bwm/Makefile index ebd8de30d..3a8972649 100644 --- a/package/bwm/Makefile +++ b/package/bwm/Makefile @@ -9,13 +9,16 @@ PKG_NAME:= bwm PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 51021a036acb92d2bda0c0c0483f9552 +PKG_DESCR:= A very tiny bandwidth monitor +PKG_SECTION:= net +PKG_SITES:= http://ftp.debian.org/debian/pool/main/b/bwm/ + DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz -MASTER_SITES:= http://ftp.debian.org/debian/pool/main/b/bwm/ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.orig include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-build: ${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/bwm.c -o ${WRKBUILD}/bwm diff --git a/package/bwm/ipkg/bwm.control b/package/bwm/ipkg/bwm.control deleted file mode 100644 index 4851a2deb..000000000 --- a/package/bwm/ipkg/bwm.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: bwm -Priority: optional -Section: net -Description: A very tiny bandwidth monitor |