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/libdaemon | |
| 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/libdaemon')
| -rw-r--r-- | package/libdaemon/Makefile | 6 | ||||
| -rw-r--r-- | package/libdaemon/ipkg/libdaemon.control | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile index 92d26cf10..e16c6d19c 100644 --- a/package/libdaemon/Makefile +++ b/package/libdaemon/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= libdaemon PKG_VERSION:= 0.10 PKG_RELEASE:= 2 PKG_MD5SUM:= 6812a5e4063b5016f25e9a0cebbd3dd9 -MASTER_SITES:= http://0pointer.de/lennart/projects/libdaemon/ +PKG_DESCR:= A lightweight C library that eases the writing of UNIX daemons +PKG_SECTION:= libs +PKG_SITES:= http://0pointer.de/lennart/projects/libdaemon/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes diff --git a/package/libdaemon/ipkg/libdaemon.control b/package/libdaemon/ipkg/libdaemon.control deleted file mode 100644 index 3f5342224..000000000 --- a/package/libdaemon/ipkg/libdaemon.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libdaemon -Priority: optional -Section: libs -Description: A lightweight C library that eases the writing of UNIX daemons. |