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/esound | |
| 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/esound')
| -rw-r--r-- | package/esound/Makefile | 19 | ||||
| -rw-r--r-- | package/esound/files/esd.init | 3 | ||||
| -rw-r--r-- | package/esound/files/esound.postinst (renamed from package/esound/ipkg/esound.postinst) | 0 | ||||
| -rw-r--r-- | package/esound/ipkg/esound.control | 6 |
4 files changed, 12 insertions, 16 deletions
diff --git a/package/esound/Makefile b/package/esound/Makefile index 119532e97..6da76d2a6 100644 --- a/package/esound/Makefile +++ b/package/esound/Makefile @@ -6,25 +6,26 @@ include ${TOPDIR}/rules.mk PKG_NAME:= esound -PKG_VERSION:= 0.2.38 -PKG_RELEASE:= 5 -PKG_MD5SUM:= 77c4e9805a017fba06552487df3c6662 -MASTER_SITES:= ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/ +PKG_VERSION:= 0.2.41 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 3d8973ed87053d7acc1f4d44af2c4688 +PKG_DESCR:= Enlightened Sound Daemon +PKG_SECTION:= net +PKG_DEPENDS:= libaudiofile +PKG_URL:= http://www.tux.org/~ricdude/EsounD.html +PKG_SITES:= ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ESOUND,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_ESOUND}/etc/init.d - ${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin - ${INSTALL_DIR} ${IDIR_ESOUND}/usr/lib + ${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin ${IDIR_ESOUND}/usr/lib ${INSTALL_BIN} ${WRKINST}/usr/bin/esd ${IDIR_ESOUND}/usr/bin/ $(CP) $(WRKINST)/usr/lib/libesd.so.* $(IDIR_ESOUND)/usr/lib/ - $(INSTALL_DATA) ./files/esd.init $(IDIR_ESOUND)/etc/init.d/esd include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/esound/files/esd.init b/package/esound/files/esd.init index b6acdb5f3..0f60c59e5 100644 --- a/package/esound/files/esd.init +++ b/package/esound/files/esd.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 75 +#PKG esound +#INIT 75 . /etc/rc.conf case $1 in diff --git a/package/esound/ipkg/esound.postinst b/package/esound/files/esound.postinst index 866b0f83e..866b0f83e 100644 --- a/package/esound/ipkg/esound.postinst +++ b/package/esound/files/esound.postinst diff --git a/package/esound/ipkg/esound.control b/package/esound/ipkg/esound.control deleted file mode 100644 index aa1a8f34d..000000000 --- a/package/esound/ipkg/esound.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: esound -Version: 0.2.8 -Section: net -Priority: optional -Depends: libaudiofile -Description: Enlightened Sound Daemon |