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/ussp-push | |
| 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/ussp-push')
| -rw-r--r-- | package/ussp-push/Makefile | 10 | ||||
| -rw-r--r-- | package/ussp-push/ipkg/ussp-push.control | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile index 32ffb9714..2c656732a 100644 --- a/package/ussp-push/Makefile +++ b/package/ussp-push/Makefile @@ -9,12 +9,14 @@ PKG_NAME:= ussp-push PKG_VERSION:= 0.11 PKG_RELEASE:= 1 PKG_MD5SUM:= 5c44983ee27809867041feff6bb4423a - -MASTER_SITES:= http://xmailserver.org/ +PKG_DESCR:= OBEX push command +PKG_SECTION:= bluetooth +PKG_DEPENDS:= openobex +PKG_SITES:= http://xmailserver.org/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,USSP_PUSH,ussp-push,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,USSP_PUSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto @@ -24,6 +26,6 @@ MAKE_FLAGS+= OBEXINC="${TCPPFLAGS}" \ post-install: ${INSTALL_DIR} ${IDIR_USSP_PUSH}/usr/bin - ${CP} ${WRKINST}/usr/bin/ussp-push ${IDIR_USSP_PUSH}/usr/bin/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/ussp-push ${IDIR_USSP_PUSH}/usr/bin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ussp-push/ipkg/ussp-push.control b/package/ussp-push/ipkg/ussp-push.control deleted file mode 100644 index b204cdd3b..000000000 --- a/package/ussp-push/ipkg/ussp-push.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ussp-push -Priority: optional -Section: bluetooth -Depends: openobex -Description: obex push |