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/ctorrent | |
| 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/ctorrent')
| -rwxr-xr-x | package/ctorrent/Makefile | 8 | ||||
| -rw-r--r-- | package/ctorrent/ipkg/ctorrent.control | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index 7fb1bea5b..5c6221b08 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -9,7 +9,11 @@ PKG_NAME:= ctorrent PKG_VERSION:= 1.3.4-dnh2 PKG_RELEASE:= 2 PKG_MD5SUM:= 6635e2d0d0ee21faeb85d95cd93c137b -MASTER_SITES:= http://www.rahul.net/dholmes/ctorrent/ +PKG_DESCR:= console-based BitTorrent client +PKG_SECTION:= net +PKG_URL:= http://www.rahul.net/dholmes/ctorrent +PKG_SITES:= http://www.rahul.net/dholmes/ctorrent/ + WRKDIST= ${WRKDIR}/${PKG_NAME}-dnh2 ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) @@ -20,7 +24,7 @@ endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS})) +$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y) TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ diff --git a/package/ctorrent/ipkg/ctorrent.control b/package/ctorrent/ipkg/ctorrent.control deleted file mode 100644 index 0b7d1d59e..000000000 --- a/package/ctorrent/ipkg/ctorrent.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ctorrent -Priority: optional -Section: net -Description: console-based BitTorrent client |