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/alsa-utils | |
| 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/alsa-utils')
| -rw-r--r-- | package/alsa-utils/Makefile | 12 | ||||
| -rw-r--r-- | package/alsa-utils/files/alsa-utils.postinst (renamed from package/alsa-utils/ipkg/alsa-utils.postinst) | 0 | ||||
| -rw-r--r-- | package/alsa-utils/files/amixer.init | 3 | ||||
| -rw-r--r-- | package/alsa-utils/ipkg/alsa-utils.control | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 94719705f..5434bc399 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= alsa-utils PKG_VERSION:= 1.0.19 PKG_RELEASE:= 2 PKG_MD5SUM:= 5ff0379c707c1a29083233edc9ab4e06 -MASTER_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \ +PKG_DESCR:= ALSA mixer utility +PKG_SECTION:= libs +PKG_URL:= http://www.alsa-project.org +PKG_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \ ftp://ftp.alsa-project.org/pub/utils/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-alsamixer @@ -23,9 +27,7 @@ BUILD_STYLE= auto INSTALL_STYLE= auto post-install: - ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/etc/init.d - ${INSTALL_BIN} ./files/amixer.init ${IDIR_ALSA_UTILS}/etc/init.d/amixer - ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin + ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin ${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/alsa-utils/ipkg/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst index f18dbf62a..f18dbf62a 100644 --- a/package/alsa-utils/ipkg/alsa-utils.postinst +++ b/package/alsa-utils/files/alsa-utils.postinst diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init index 5d5aa6e2b..d7f388892 100644 --- a/package/alsa-utils/files/amixer.init +++ b/package/alsa-utils/files/amixer.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 60 +#PKG alsa-utils +#INIT 60 . /etc/rc.conf case $1 in diff --git a/package/alsa-utils/ipkg/alsa-utils.control b/package/alsa-utils/ipkg/alsa-utils.control deleted file mode 100644 index 88e38c96c..000000000 --- a/package/alsa-utils/ipkg/alsa-utils.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: alsa-utils -Priority: optional -Section: libs -Description: ALSA utilities |