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/gmediaserver | |
| 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/gmediaserver')
| -rw-r--r-- | package/gmediaserver/Makefile | 11 | ||||
| -rw-r--r-- | package/gmediaserver/files/gmediaserver.init | 3 | ||||
| -rw-r--r-- | package/gmediaserver/files/gmediaserver.postinst (renamed from package/gmediaserver/ipkg/gmediaserver.postinst) | 0 | ||||
| -rw-r--r-- | package/gmediaserver/ipkg/gmediaserver.control | 5 |
4 files changed, 8 insertions, 11 deletions
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index 5ca8b48ce..1da2723f0 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= gmediaserver PKG_VERSION:= 0.13.0 PKG_RELEASE:= 1 PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3 -MASTER_SITES:= http://savannah.nongnu.org/download/gmediaserver/ +PKG_DESCR:= An UPnP music media server +PKG_SECTION:= net +PKG_DEPENDS:= id3lib libupnp +PKG_URL:= http://www.gnu.org/software/gmediaserver +PKG_SITES:= http://savannah.nongnu.org/download/gmediaserver/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -lz" \ @@ -28,9 +32,6 @@ CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -luClibc++ -lz" endif post-install: - ${INSTALL_DIR} ${IDIR_GMEDIASERVER}/etc/init.d - ${INSTALL_BIN} ./files/gmediaserver.init \ - ${IDIR_GMEDIASERVER}/etc/init.d/gmediaserver ${INSTALL_DIR} ${IDIR_GMEDIASERVER}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/bin/gmediaserver ${IDIR_GMEDIASERVER}/usr/sbin/ diff --git a/package/gmediaserver/files/gmediaserver.init b/package/gmediaserver/files/gmediaserver.init index 3ce0ac09d..81deeb899 100644 --- a/package/gmediaserver/files/gmediaserver.init +++ b/package/gmediaserver/files/gmediaserver.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 60 +#PKG gmediaserver +#INIT 60 . /etc/rc.conf case $1 in diff --git a/package/gmediaserver/ipkg/gmediaserver.postinst b/package/gmediaserver/files/gmediaserver.postinst index 1d2338cb0..1d2338cb0 100644 --- a/package/gmediaserver/ipkg/gmediaserver.postinst +++ b/package/gmediaserver/files/gmediaserver.postinst diff --git a/package/gmediaserver/ipkg/gmediaserver.control b/package/gmediaserver/ipkg/gmediaserver.control deleted file mode 100644 index 6ba003f5a..000000000 --- a/package/gmediaserver/ipkg/gmediaserver.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: gmediaserver -Priority: optional -Section: net -Depends: id3lib, libupnp -Description: An UPnP music media server. |