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/comgt | |
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/comgt')
-rw-r--r-- | package/comgt/Makefile | 11 | ||||
-rw-r--r-- | package/comgt/ipkg/comgt.control | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/package/comgt/Makefile b/package/comgt/Makefile index d9cd54f7d..06ff87f58 100644 --- a/package/comgt/Makefile +++ b/package/comgt/Makefile @@ -9,20 +9,23 @@ PKG_NAME:= comgt PKG_VERSION:= 0.32 PKG_RELEASE:= 1 PKG_MD5SUM:= db2452680c3d953631299e331daf49ef +PKG_DESCR:= Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool +PKG_SECTION:= console +PKG_URL:= http://sourceforge.net/projects/comgt +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=comgt/} + DISTFILES:= ${PKG_NAME}.${PKG_VERSION}.tgz -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=comgt/} WRKDIST= ${WRKDIR}/${PKG_NAME}.${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto ALL_TARGET= comgt do-install: - ${INSTALL_DIR} ${IDIR_COMGT}/usr/bin - ${INSTALL_DIR} ${IDIR_COMGT}/etc/comgt + ${INSTALL_DIR} ${IDIR_COMGT}/usr/bin ${IDIR_COMGT}/etc/comgt ${INSTALL_BIN} ${WRKBUILD}/comgt ${IDIR_COMGT}/usr/bin/comgt ${INSTALL_DATA} ./files/dial.comgt ${IDIR_COMGT}/etc/comgt/dial.comgt diff --git a/package/comgt/ipkg/comgt.control b/package/comgt/ipkg/comgt.control deleted file mode 100644 index fe2c1cd61..000000000 --- a/package/comgt/ipkg/comgt.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: comgt -Priority: optional -Section: console -Description: Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool |