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/gpsd | |
| 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/gpsd')
| -rw-r--r-- | package/gpsd/Makefile | 11 | ||||
| -rw-r--r-- | package/gpsd/ipkg/gpsd-clients.control | 5 | ||||
| -rw-r--r-- | package/gpsd/ipkg/gpsd.control | 5 |
3 files changed, 8 insertions, 13 deletions
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 655a0b6c3..22369e103 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -9,12 +9,17 @@ PKG_NAME:= gpsd PKG_VERSION:= 2.37 PKG_RELEASE:= 1 PKG_MD5SUM:= 6c96cc0b2df0279cb7baac1ebc5881d3 -MASTER_SITES:= http://download.berlios.de/gpsd/ +PKG_DESCR:= An interface daemon for GPS receivers +PKG_SECTION:= net +PKG_DEPENDS:= libpthread +PKG_SITES:= http://download.berlios.de/gpsd/ + +PKG_DESCR_1:= GPS client utilities include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GPSD,gpsd,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-x \ diff --git a/package/gpsd/ipkg/gpsd-clients.control b/package/gpsd/ipkg/gpsd-clients.control deleted file mode 100644 index f8a15ada8..000000000 --- a/package/gpsd/ipkg/gpsd-clients.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: gpsd-clients -Priority: optional -Section: net -Depends: gpsd -Description: Command-line clients for the GPS daemon. diff --git a/package/gpsd/ipkg/gpsd.control b/package/gpsd/ipkg/gpsd.control deleted file mode 100644 index 94618b69c..000000000 --- a/package/gpsd/ipkg/gpsd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: gpsd -Priority: optional -Section: net -Depends: libpthread, uclibc++ -Description: An interface daemon for GPS receivers. |