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/palantir | |
| 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/palantir')
| -rw-r--r-- | package/palantir/Makefile | 9 | ||||
| -rw-r--r-- | package/palantir/files/palantir.conffiles (renamed from package/palantir/ipkg/palantir.conffiles) | 0 | ||||
| -rw-r--r-- | package/palantir/ipkg/palantir.control | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/package/palantir/Makefile b/package/palantir/Makefile index 23bcb9e81..986954309 100644 --- a/package/palantir/Makefile +++ b/package/palantir/Makefile @@ -9,12 +9,17 @@ PKG_NAME:= palantir PKG_VERSION:= 2.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 3a5b1fb340857f6d8e357bf39b77583e -MASTER_SITES:= http://www.fastpath.it/products/palantir/pub/ +PKG_DESCR:= A multichannel interactive streaming solution +PKG_SECTION:= net +PKG_DEPENDS:= libjpeg libpthread +PKG_URL:= http://www.fastpath.it/products/palantir +PKG_SITES:= http://www.fastpath.it/products/palantir/pub/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PALANTIR,palantir,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PALANTIR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-build: mkdir -p ${WRKINST}/usr diff --git a/package/palantir/ipkg/palantir.conffiles b/package/palantir/files/palantir.conffiles index a57f0c6fd..a57f0c6fd 100644 --- a/package/palantir/ipkg/palantir.conffiles +++ b/package/palantir/files/palantir.conffiles diff --git a/package/palantir/ipkg/palantir.control b/package/palantir/ipkg/palantir.control deleted file mode 100644 index 404a200c3..000000000 --- a/package/palantir/ipkg/palantir.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: palantir -Priority: optional -Section: net -Depends: libjpeg, libpthread -Description: A multichannel interactive streaming solution |