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/rtorrent | |
| 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/rtorrent')
| -rw-r--r-- | package/rtorrent/Makefile | 10 | ||||
| -rw-r--r-- | package/rtorrent/ipkg/rtorrent.control | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index a3798ce97..2186c597e 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= rtorrent PKG_VERSION:= 0.8.2 PKG_RELEASE:= 1 PKG_MD5SUM:= a2456182e1767e5aed7341dbbd058f60 -MASTER_SITES:= http://libtorrent.rakshasa.no/downloads/ +PKG_DESCR:= console torrent application +PKG_SECTION:= net +PKG_DEPENDS:= libncurses libtorrent libcurl +PKG_URL:= http://libtorrent.rakshasa.no +PKG_SITES:= http://libtorrent.rakshasa.no/downloads/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RTORRENT,rtorrent,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,RTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= autotool gnu CONFIGURE_ARGS+= --enable-aligned @@ -22,6 +26,6 @@ INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_RTORRENT}/usr/bin - ${CP} ${WRKINST}/usr/bin/* ${IDIR_RTORRENT}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/rtorrent ${IDIR_RTORRENT}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rtorrent/ipkg/rtorrent.control b/package/rtorrent/ipkg/rtorrent.control deleted file mode 100644 index c5da288ec..000000000 --- a/package/rtorrent/ipkg/rtorrent.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: rtorrent -Priority: optional -Section: net -Depends: libncurses, libtorrent, libcurl -Description: console torrent application |