wvstreams: merge uniconf subpkg.

- it's required by wvdial anyway.
- it was wrongly splitted with some missing parts in wvstreams.
This commit is contained in:
Juan RP 2014-12-11 07:09:40 +01:00
parent fbaac29a87
commit fd3c0c336f
3 changed files with 5 additions and 14 deletions

View file

@ -1856,7 +1856,7 @@ libopencv_stitching.so.2.4 libopencv-2.4.10_1
libopencv_photo.so.2.4 libopencv-2.4.10_1 libopencv_photo.so.2.4 libopencv-2.4.10_1
libopencv_legacy.so.2.4 libopencv-2.4.10_1 libopencv_legacy.so.2.4 libopencv-2.4.10_1
libcgmanager.so.0 libcgmanager-0.33_1 libcgmanager.so.0 libcgmanager-0.33_1
libuniconf.so.4.6 uniconf-4.6.1_1 libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1 libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1 libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1 libwvstreams.so.4.6 wvstreams-4.6.1_1

View file

@ -1 +0,0 @@
wvstreams

View file

@ -1,7 +1,7 @@
# Template file for 'wvstreams' # Template file for 'wvstreams'
pkgname=wvstreams pkgname=wvstreams
version=4.6.1 version=4.6.1
revision=1 revision=2
build_style=gnu-configure build_style=gnu-configure
maintainer="Enno Boland <eb@s01.de>" maintainer="Enno Boland <eb@s01.de>"
license="GPL-2" license="GPL-2"
@ -13,8 +13,10 @@ checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
configure_args="--without-dbus --without-tcl --without-qt" configure_args="--without-dbus --without-tcl --without-qt"
conf_files="/etc/uniconf.conf" conf_files="/etc/uniconf.conf"
replaces="uniconf>=0"
wvstreams-devel_package() { wvstreams-devel_package() {
depends="${sourcepkg}>=${version}_${revision} uniconf>=${version}_${revision} $makedepends" depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
@ -23,13 +25,3 @@ wvstreams-devel_package() {
vmove "usr/lib/*.so" vmove "usr/lib/*.so"
} }
} }
uniconf_package() {
short_desc="UniConf configuration system"
pkg_install() {
vmove usr/bin
vmove usr/sbin
vmove usr/share
vmove "usr/lib/libuniconf.so.*"
}
}