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/strace | |
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/strace')
-rw-r--r-- | package/strace/Makefile | 7 | ||||
-rw-r--r-- | package/strace/ipkg/strace.control | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/package/strace/Makefile b/package/strace/Makefile index f92795c6d..75c04afe6 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -9,12 +9,15 @@ PKG_NAME:= strace PKG_VERSION:= 4.5.18 PKG_RELEASE:= 1 PKG_MD5SUM:= e9449fcee97e6a8ed73934c883c870e0 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/} +PKG_DESCR:= System call trace program +PKG_SECTION:= misc +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/} + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,STRACE,strace,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,STRACE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/strace/ipkg/strace.control b/package/strace/ipkg/strace.control deleted file mode 100644 index 8561e55b4..000000000 --- a/package/strace/ipkg/strace.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: strace -Priority: optional -Section: net -Description: System call trace program |