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/sispmctl | |
| 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/sispmctl')
| -rw-r--r-- | package/sispmctl/Makefile | 10 | ||||
| -rw-r--r-- | package/sispmctl/ipkg/sispmctl.control | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile index 868940ddd..7ae648c16 100644 --- a/package/sispmctl/Makefile +++ b/package/sispmctl/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= sispmctl PKG_VERSION:= 2.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 2457f76cd129f880634f3381be0aeb76 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=sispmctl/} +PKG_DESCR:= control application for power sockets +PKG_SECTION:= misc +PKG_DEPENDS:= libusb +PKG_URL:= http://sispmctl.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sispmctl/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SISPMCTL,sispmctl,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SISPMCTL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto @@ -21,6 +25,6 @@ INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_SISPMCTL}/usr/bin - ${CP} ${WRKINST}/usr/bin/sispmctl ${IDIR_SISPMCTL}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/sispmctl ${IDIR_SISPMCTL}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sispmctl/ipkg/sispmctl.control b/package/sispmctl/ipkg/sispmctl.control deleted file mode 100644 index ab192c4c0..000000000 --- a/package/sispmctl/ipkg/sispmctl.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: sispmctl -Priority: optional -Section: misc -Depends: libusb -Description: control application for power sockets |