Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=14ff03c9eee56caa7926b49bb5c9e87672120988
commit 14ff03c9eee56caa7926b49bb5c9e87672120988 Author: DeX77 <[email protected]> Date: Thu Aug 27 22:13:49 2015 +0200 * merge fix diff --git a/source/apps-extra/root/FrugalBuild b/source/apps-extra/root/FrugalBuild index 3b41044..024dce2 100644 --- a/source/apps-extra/root/FrugalBuild +++ b/source/apps-extra/root/FrugalBuild @@ -4,13 +4,8 @@ options+=('asneeded') pkgname=root -<<<<<<< HEAD -pkgver=6.04.00 -pkgrel=2 -======= pkgver=6.04.02 pkgrel=1 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgdesc="C++ data analysis framework and interpreter from CERN" url="http://root.cern.ch"; depends=('libxpm' 'libxft' 'avahi-compat' 'libjpeg' 'libtiff' 'libpng' 'xmlrpc-c>=1.16.41' 'gsl' 'libpq' 'ftgl' 'glew>=1.13' 'libldap' 'libmysqlclient' 'pcre>=8.30' 'sqlite3' 'fftw') @@ -23,11 +18,7 @@ _F_archive_grepv="99" up2date="Flastarchive 'ftp://root.cern.ch/root/' '\.source\.tar\.gz'" source=(ftp://root.cern.ch/$pkgname/${pkgname}_v${pkgver}.source.tar.gz \ $pkgname.desktop $pkgname.sh) -<<<<<<< HEAD -sha1sums=('530dd3a3d33294b7aad3f0bc9817675bf8c33968' \ -======= sha1sums=('edbc3848d156b5d146464856719fd3d459fdced3' \ ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee '022e0a9278fb1037177c10b77a312c4555954e80' \ 'fd9ab57da53418c91e6b7c47dd7f6076e82701a5') diff --git a/source/base/man-db/FrugalBuild b/source/base/man-db/FrugalBuild index bec50fa..45b05f0 100644 --- a/source/base/man-db/FrugalBuild +++ b/source/base/man-db/FrugalBuild @@ -5,11 +5,7 @@ options+=('asneeded') pkgname=man-db -<<<<<<< HEAD -pkgver=2.7.1 -======= pkgver=2.7.2 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgrel=1 pkgdesc="A utility for reading man pages" url="http://www.nongnu.org/man-db/"; @@ -22,11 +18,7 @@ up2date="Flasttar http://download.savannah.gnu.org/releases/man-db/"; source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz \ man.sh man-colors.sh README.Frugalware \ convert-mans man-db.cron.daily) -<<<<<<< HEAD -sha1sums=('6a4b08ccacb555120a2bce852329d93c9c78247e' \ -======= sha1sums=('26b9044ddfbc711a27cb0539d057f089a3bd8c34' \ ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee '33ed8d61d09f8711176fd18b7ae4e3a2d3354cf6' \ 'b51fd2d450c7a0982e605e74010256a40a3fa05e' \ '3a1e22acd8931537d5c2694a536913c02e0d448e' \ diff --git a/source/base/modemmanager/FrugalBuild b/source/base/modemmanager/FrugalBuild index 042a548..f9e2769 100644 --- a/source/base/modemmanager/FrugalBuild +++ b/source/base/modemmanager/FrugalBuild @@ -9,20 +9,12 @@ options+=('asneeded') pkgname=modemmanager _F_archive_name="ModemManager" #_F_gnome_name=ModemManager -<<<<<<< HEAD pkgver=1.4.10 -======= -pkgver=1.4.8 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgrel=1 pppVer=2.4.5 pkgdesc="Mobile broadband modem management service" url="http://www.freedesktop.org/wiki/Software/ModemManager/"; -<<<<<<< HEAD depends=("ppp=$pppVer" 'libgudev' 'elfutils') -======= -depends=("ppp=$pppVer" 'systemd>=188') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('intltool') groups=('base') archs=('i686' 'x86_64' 'arm') @@ -36,11 +28,7 @@ options+=('scriptlet') Fconfopts+=" --enable-more-warnings=error --with-polkit=no \ --with-udev-base-dir=/lib/udev/ --without-qmi --without-mbim" # --with-pppd-plugin-dir=/usr/lib/pppd/$pppVer -<<<<<<< HEAD sha1sums=('614f97f91737020aa7820e041f255f9392eedede') -======= -sha1sums=('9c2813b7f4359c34773c1c6ceb13f3a2e3adc6cb') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee if Fuse $USE_DOC; then makedepends=("${makedepends[@]}" 'gtk-doc>=1.11') Fconfopts+=" --enable-gtk-doc" diff --git a/source/base/networkmanager/FrugalBuild b/source/base/networkmanager/FrugalBuild index d3f86d8..ddf9748 100644 --- a/source/base/networkmanager/FrugalBuild +++ b/source/base/networkmanager/FrugalBuild @@ -9,20 +9,11 @@ _F_gnome_name=NetworkManager _F_gnome_ext=.tar.xz _F_gnome_devel="y" pkgver=1.0.2 -<<<<<<< HEAD pkgrel=2 pkgdesc="Network Management daemon" depends=('wireless_tools' 'iproute2' 'dhcpcd>=5.1.3' 'nss' 'libgcrypt' \ 'libnl>=3.2.9' 'ppp' 'wpa_supplicant' 'iptables' 'polkit' 'ca-certificates' \ 'modemmanager>=1.4.10' 'libarchive>=3.0.3' 'dbus-glib' 'libndp' 'newt') -======= -pkgrel=1 -pkgdesc="Network Management daemon" -depends=('wireless_tools' 'iproute2' 'dhcpcd>=5.1.3' 'nss' 'libgcrypt' \ - 'libnl>=3.2.9' 'ppp' 'wpa_supplicant' 'iptables' 'polkit' 'ca-certificates' \ - 'modemmanager>=1.4.6' 'libarchive>=3.0.3' 'systemd>=188' 'dbus-glib' 'libndp' \ - 'newt') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('perl-xml-parser' 'intltool' 'gobject-introspection') groups=('base') archs=('i686' 'x86_64' 'arm') diff --git a/source/devel-extra/sphinx-httpdomain/FrugalBuild b/source/devel-extra/sphinx-httpdomain/FrugalBuild index 16570f1..d65e8f7 100644 --- a/source/devel-extra/sphinx-httpdomain/FrugalBuild +++ b/source/devel-extra/sphinx-httpdomain/FrugalBuild @@ -2,11 +2,7 @@ # Maintainer: DeX77 <[email protected]> pkgname=sphinx-httpdomain -<<<<<<< HEAD -pkgver=1.3.0 -======= pkgver=1.4.0 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgrel=1 pkgdesc="Sphinx domain for describing RESTful HTTP APIs" depends=('python-sphinx') @@ -17,11 +13,7 @@ _F_archive_name="sphinxcontrib-httpdomain" _F_pypi_name="sphinxcontrib-httpdomain" Finclude pypi _F_cd_path="$_F_pypi_name-$pkgver" -<<<<<<< HEAD -sha1sums=('555caa913f79757d890bbafe066326151a166a55') -======= sha1sums=('62cbd9c816bd73a377f320614a60118161a26335') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee build() { Fcd diff --git a/source/devel/patch/FrugalBuild b/source/devel/patch/FrugalBuild index f5d8253..ae8e494 100644 --- a/source/devel/patch/FrugalBuild +++ b/source/devel/patch/FrugalBuild @@ -2,11 +2,7 @@ # Maintainer: Miklos Vajna <[email protected]> pkgname=patch -<<<<<<< HEAD -pkgver=2.7.1 -======= pkgver=2.7.5 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgrel=1 pkgdesc="A utility to apply patch files to original sources" url="http://www.gnu.org/software/patch/patch.html"; diff --git a/source/games-extra/openclonk/FrugalBuild b/source/games-extra/openclonk/FrugalBuild index 566cb73..ab8551e 100644 --- a/source/games-extra/openclonk/FrugalBuild +++ b/source/games-extra/openclonk/FrugalBuild @@ -2,13 +2,8 @@ # Maintainer: Melko <[email protected]> pkgname=openclonk -<<<<<<< HEAD -pkgver=6.0 -pkgrel=4 -======= pkgver=6.1 pkgrel=1 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgdesc="Free multiplayer action game where you control clonks, small but witty and nimble humanoid beings." url="http://www.openclonk.org/"; depends=('sdl_mixer' 'glew>=1.13' 'gtk+2-libs' 'gdk-pixbuf2' 'libupnp') @@ -20,23 +15,13 @@ _F_gnome_iconcache='y' Finclude cmake up2date="Flastverdir http://www.openclonk.org/builds/release/"; source=(http://www.openclonk.org/builds/release/$pkgver/$pkgname-$pkgver-src.tar.bz2 \ -<<<<<<< HEAD - sdlfix.patch directories.patch clonk.png) -sha1sums=('db943c451a06c1597fcd49c45204232b9700b7e2' \ - '5b196428c9a3447653a4bda363e83d2f2cb57c3a' \ -======= directories.patch clonk.png) sha1sums=('fb467b5496c089cb85a0e83096a5fc3f0f43fbd5' \ ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee '4decde7dac620ceaf0a938d412fb98d42b9e1e7a' \ '36bc26a08fecbe6dd75bcc541c879a69ff31fd95') build() { -<<<<<<< HEAD - Fcd $pkgname-release-$pkgver-src -======= Fcd $pkgname-$pkgver-src ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee cp $Fsrcdir/clonk.png src/res/oc.ico || Fdie CMake_build } diff --git a/source/gnome-extra/cinnamon-desktop/FrugalBuild b/source/gnome-extra/cinnamon-desktop/FrugalBuild index 117ee7d..a1f91fe 100644 --- a/source/gnome-extra/cinnamon-desktop/FrugalBuild +++ b/source/gnome-extra/cinnamon-desktop/FrugalBuild @@ -5,13 +5,8 @@ options+=('asneeded') pkgname=cinnamon-desktop -<<<<<<< HEAD -pkgver=2.0.4 -pkgrel=2 -======= pkgver=2.6.5 pkgrel=1 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgdesc="Library with common API for various Cinnamon module" depends=('gdk-pixbuf2' 'gtk+3' 'xrandr' 'xkeyboard-config' 'libxkbfile' ) makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection>=1.36.0' 'gnome-common') @@ -19,19 +14,12 @@ groups=('gnome-extra' 'cinnamon') archs=('i686' 'x86_64') _F_gnome_glib="y" Finclude cinnamon gnome-scriptlet -<<<<<<< HEAD -sha1sums=('76108c4eed1d1ebbb3184cbe15fdc36dc8cd7c4c') - -build() -{ -======= sha1sums=('f0f34a45f24b7ed6e34dd8ef4eff7e84b34fd1f8') build() { Fcd Fexec sed -i 's|subdir-objects||g' configure.ac ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee Fbuild Fbuild_gnome_scriptlet } diff --git a/source/gnome-extra/libsocialweb/FrugalBuild b/source/gnome-extra/libsocialweb/FrugalBuild index 204f86d..0824304 100644 --- a/source/gnome-extra/libsocialweb/FrugalBuild +++ b/source/gnome-extra/libsocialweb/FrugalBuild @@ -6,15 +6,9 @@ options+=('asneeded') pkgname=libsocialweb pkgver=0.25.21 -<<<<<<< HEAD pkgrel=5 pkgdesc="socialweb library to fetch data from social service" depends=('libxml2>=2.7.8' 'librest' 'json-glib' 'networkmanager>=1.0.2-2' 'gconf' 'libgnome-keyring>=3.10.1-2') -======= -pkgrel=4 -pkgdesc="socialweb library to fetch data from social service" -depends=('libxml2>=2.7.8' 'librest' 'json-glib' 'networkmanager>=0.9.6.0' 'gconf' 'libgnome-keyring>=3.10.1-2') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('gobject-introspection' 'intltool' 'vala') groups=('gnome-extra') archs=('i686' 'x86_64') diff --git a/source/gnome-extra/muffin/FrugalBuild b/source/gnome-extra/muffin/FrugalBuild index 26a5b89..30705b8 100644 --- a/source/gnome-extra/muffin/FrugalBuild +++ b/source/gnome-extra/muffin/FrugalBuild @@ -5,21 +5,12 @@ options+=('asneeded') pkgname=muffin -<<<<<<< HEAD -pkgver=2.0.5 -pkgrel=3 -pkgdesc="Cinnamon window manager based on Mutter" -url="http://cinnamon.linuxmint.com/"; -depends=('gtk+3' 'cinnamon-desktop' 'clutter' 'cogl' 'zenity' 'startup-notification') -makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection>=1.36.0' 'gnome-common') -======= pkgver=2.6.1 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" url="http://cinnamon.linuxmint.com/"; depends=('gtk+3' 'cinnamon-desktop>=2.6.5' 'clutter' 'cogl>=1.20' 'zenity' 'startup-notification') makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection>=1.36.0' 'gnome-common' 'gtk-doc') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee groups=('gnome-extra' 'cinnamon') archs=('i686' 'x86_64') _F_github_author=linuxmint @@ -28,11 +19,7 @@ _F_github_tag=y _F_gnome_glib="y" options=('scriptlet') Finclude github gnome-scriptlet -<<<<<<< HEAD -sha1sums=('4c4ebf5d2702fadfcc1191689015ac8d4041c7b0') -======= sha1sums=('41f96cc15315b91bc4ac37e8e419d556d65bd850') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee build() { diff --git a/source/gnome-extra/nm-applet/FrugalBuild b/source/gnome-extra/nm-applet/FrugalBuild index d3e866a..7928307 100644 --- a/source/gnome-extra/nm-applet/FrugalBuild +++ b/source/gnome-extra/nm-applet/FrugalBuild @@ -7,15 +7,9 @@ options+=('asneeded') pkgname=nm-applet _F_gnome_name=network-manager-applet pkgver=1.0.2 -<<<<<<< HEAD pkgrel=2 pkgdesc="Network Management applet" depends=('iso-codes' "networkmanager>=$pkgver-2" 'libsecret' \ -======= -pkgrel=1 -pkgdesc="Network Management applet" -depends=('iso-codes' 'networkmanager>=0.9.8.4' 'libsecret' \ ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee 'libnotify' 'gconf') makedepends=('intltool' 'gtk+3' 'mobile-broadband-provider-info' \ 'gobject-introspection') diff --git a/source/gnome-extra/nm-openvpn/FrugalBuild b/source/gnome-extra/nm-openvpn/FrugalBuild index e2011d6..b52d90c 100644 --- a/source/gnome-extra/nm-openvpn/FrugalBuild +++ b/source/gnome-extra/nm-openvpn/FrugalBuild @@ -4,17 +4,10 @@ pkgname=nm-openvpn _F_gnome_name=NetworkManager-openvpn pkgver=1.0.2 -<<<<<<< HEAD pkgrel=2 pkgdesc="network management framework (OPENVPN plugin)" depends=('gconf' 'gtk+3' 'libgnome-keyring>=3.10.1-2' \ "networkmanager>=${pkgver}-2" 'nm-applet') -======= -pkgrel=1 -pkgdesc="network management framework (OPENVPN plugin)" -depends=('gconf' 'gtk+3' 'libgnome-keyring>=3.10.1-2' \ - 'networkmanager>=$pkgver' 'nm-applet') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('perl-xml-parser' 'intltool') rodepends=('openvpn') groups=('gnome-extra') diff --git a/source/gnome-extra/nm-pptp/FrugalBuild b/source/gnome-extra/nm-pptp/FrugalBuild index d7cb1ab..2ff4489 100644 --- a/source/gnome-extra/nm-pptp/FrugalBuild +++ b/source/gnome-extra/nm-pptp/FrugalBuild @@ -4,17 +4,10 @@ pkgname=nm-pptp _F_gnome_name=NetworkManager-pptp pkgver=1.0.2 -<<<<<<< HEAD pkgrel=2 pkgdesc="network management framework (PPTP plugin)" depends=('gconf' 'gtk+3' 'libglade' 'libgnome-keyring>=3.10.1-2' \ "networkmanager>=$pkgver-2" 'nm-applet') -======= -pkgrel=1 -pkgdesc="network management framework (PPTP plugin)" -depends=('gconf' 'gtk+3' 'libglade' 'libgnome-keyring>=3.10.1-2' \ - 'networkmanager>=0.9.10.0' 'nm-applet') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('perl-xml-parser' 'intltool') groups=('gnome-extra') archs=('i686' 'x86_64') diff --git a/source/gnome-extra/nm-vpnc/FrugalBuild b/source/gnome-extra/nm-vpnc/FrugalBuild index ccb7c59..0678b18 100644 --- a/source/gnome-extra/nm-vpnc/FrugalBuild +++ b/source/gnome-extra/nm-vpnc/FrugalBuild @@ -4,17 +4,10 @@ pkgname=nm-vpnc _F_gnome_name=NetworkManager-vpnc pkgver=1.0.2 -<<<<<<< HEAD pkgrel=2 pkgdesc="network management framework (VPNC plugin)" depends=('gconf' 'gtk+3' 'libgnome-keyring>=3.10.1-2' \ "networkmanager>=$pkgver-2" 'polkit-gnome' 'nm-applet') -======= -pkgrel=1 -pkgdesc="network management framework (VPNC plugin)" -depends=('gconf' 'gtk+3' 'libgnome-keyring>=3.10.1-2' \ - 'networkmanager>=0.9.10.0' 'polkit-gnome' 'nm-applet') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('perl-xml-parser' 'intltool') groups=('gnome-extra') archs=('i686' 'x86_64') diff --git a/source/kde-extra/calligra/FrugalBuild b/source/kde-extra/calligra/FrugalBuild index 5cbd776..fe9adce 100644 --- a/source/kde-extra/calligra/FrugalBuild +++ b/source/kde-extra/calligra/FrugalBuild @@ -4,13 +4,8 @@ options+=('asneeded') pkgname=calligra -<<<<<<< HEAD -pkgver=2.9.5 -pkgrel=3 -======= pkgver=2.9.6 pkgrel=1 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgdesc="An integrated Office suite for KDE" url="http://www.calligra-suite.org"; _F_kde_dirname="stable/$pkgname-$pkgver" @@ -26,11 +21,7 @@ provides=("${replaces[@]}") conflicts=("${replaces[@]}") archs=('i686' 'x86_64') up2date="Flasttar $_F_kde_mirror/stable/$pkgname-latest" -<<<<<<< HEAD -sha1sums=('e82c9f4814b9d979fe5eb0620ff48d07c7b657d7') -======= sha1sums=('7aaae89daae01b49cc054945e5ec94dd4215fb03') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee subpkgs=("${subpkgs[@]}" "braindump") diff --git a/source/lib-extra/libraw/FrugalBuild b/source/lib-extra/libraw/FrugalBuild index 221c592..3615973 100644 --- a/source/lib-extra/libraw/FrugalBuild +++ b/source/lib-extra/libraw/FrugalBuild @@ -4,11 +4,7 @@ options+=('asneeded') pkgname=libraw -<<<<<<< HEAD -pkgver=0.16.0 -======= pkgver=0.16.2 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras." url="http://www.libraw.org/"; @@ -19,11 +15,7 @@ _F_archive_name="LibRaw" _F_archive_grepv="Beta" up2date="Flasttar $url/download" source=(http://www.libraw.org/data/$_F_archive_name-${pkgver}.tar.gz) -<<<<<<< HEAD -sha1sums=('492239aa209b1ddd1f030da4fc2978498c32a29b') -======= sha1sums=('fd74432c9167a5621d24cb5ba0d1fc082a8963b4') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee unset MAKEFLAGS options+=('force') diff --git a/source/lib-extra/synce-core/FrugalBuild b/source/lib-extra/synce-core/FrugalBuild index 4a2a1cd..18dc9a8 100644 --- a/source/lib-extra/synce-core/FrugalBuild +++ b/source/lib-extra/synce-core/FrugalBuild @@ -4,19 +4,11 @@ pkgname=synce-core pkgver=0.17 -<<<<<<< HEAD pkgrel=2 pkgdesc="SynCE - common library" groups=('lib-extra') archs=('i686' 'x86_64') depends=('dbus-glib' 'e2fsprogs' 'dhclient' 'libgudev') -======= -pkgrel=1 -pkgdesc="SynCE - common library" -groups=('lib-extra') -archs=('i686' 'x86_64') -depends=('dbus-glib' 'e2fsprogs' 'dhclient') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee replaces=('libsynce' 'odccm' 'synce-hal' 'librapi2-python' 'librapi2') _F_sourceforge_dirname="synce" _F_sourceforge_realname="SynCE" diff --git a/source/lib/nghttp2/FrugalBuild b/source/lib/nghttp2/FrugalBuild index db22e2f..1c3da59 100644 --- a/source/lib/nghttp2/FrugalBuild +++ b/source/lib/nghttp2/FrugalBuild @@ -2,11 +2,7 @@ # Maintainer: DeX77 <[email protected]> pkgname=nghttp2 -<<<<<<< HEAD -pkgver=1.2.0 -======= pkgver=1.2.1 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgrel=1 pkgdesc="nghttp2 is an implementation of HTTP/2 in C" url="http://$pkgname.org"; @@ -17,11 +13,7 @@ makedepends=('ca-certificates') _F_github_author="tatsuhiro-t" _F_github_tag_v="y" Finclude github -<<<<<<< HEAD sha1sums=('bc66342b43b23e39890208a60878624617cb86c2') -======= -sha1sums=('13f8abf9a80a8723408137e000ea0d9a0d0a6008') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee build() { Fcd diff --git a/source/locale-extra/calligra-l10n/FrugalBuild b/source/locale-extra/calligra-l10n/FrugalBuild index 77d8f8f..cd36eb9 100644 --- a/source/locale-extra/calligra-l10n/FrugalBuild +++ b/source/locale-extra/calligra-l10n/FrugalBuild @@ -2,11 +2,7 @@ # Maintainer: Melko <[email protected]> pkgname=calligra-l10n -<<<<<<< HEAD -pkgver=2.9.5 -======= pkgver=2.9.6 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgrel=1 pkgdesc="Dummy package." url="http://www.calligra-suite.org"; @@ -18,36 +14,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump $_F_kde_mirror/stable/calligra-latest | grep 'tar' | sed -n 's/.*calligra-\(.*\).tar.xz.*/\1/;1p'" source=() subpkgs=() -<<<<<<< HEAD -sha1sums=('39a7111f616994579f115876b4257758e739b76a' \ - '86fc926dbb85ef556811b3c2bddf50fc387cc114' \ - 'cc04d4183615ce827d61091b66da33e50aac6939' \ - '7798f3f804112e8d027215cabacf1aba2a8f924e' \ - '222b1a8a4ef41da5c172727f9f945cc80419af37' \ - '4b8e6d631815175e30701d299d62a849a67960e2' \ - '61b09dffce7bceb63b516be1398851bf6e1335e9' \ - 'e706cde46e8e2430c9083e14dde3ab86687d5e04' \ - '42e14571eefe5f7b940d8f80de5d4ca44fc02e9f' \ - '1d051d772098c680115bbe2e31ea4cf389f41b45' \ - 'aacdfeab78fc60045de268a338230b4d7f8ca37e' \ - 'd28675c61e3c7ce97e922d35174d441995cb8e50' \ - 'b84c5733a8ad3bfdf05849475c8ebed8417ddcff' \ - '000ead670f3d867885c835eba4e74f4532a2892f' \ - 'deb8c09afc5899c87efbab54ba94d086112eb0f4' \ - '07edf21498a2417bbcc616c0566ad4ab11295d6b' \ - '91f9f53668b89dd3ab8a2d990cf60de0d9c4b922' \ - '1a306ac84e6e9cf88e93f6a8cbaed4ae49677b7d' \ - '974ca2ccaa5cfd2440d4dccd87cce30ddffa82d2' \ - '2187096f1fcc5917d5f4357d29faf1222a1db224' \ - '1174d85d39a7b639e834a58e28f86f2f7418d6c5' \ - 'cea6649d6735f8ea790927f6b5d6be70fe4d631b' \ - 'ee3dd1d560a30cd06eeaa752b65e08fe03331d4d' \ - '45acd0d7b0450cd54770813fa5ef8fd31b61d59e' \ - '713f94e578ae050d0a9295531ae89897dc32f622' \ - '7c84e4e492904eff80ed3bfaf2cfe81801158eba' \ - '1842311d3b441f40535bbcb2a8c6f036573202c2' \ - 'ff1aa826c2ab0fa73bafdf56fa38302d15ab6340') -======= sha1sums=('17d06367d892832d2816dbb2fe26d80f70be3224' \ 'af7fd6f0480d547598c9173cb1a7097cfa9eb403' \ '3cabe6bdfe7aaa9a6f369ec0bf5e4fe007641433' \ @@ -76,7 +42,6 @@ sha1sums=('17d06367d892832d2816dbb2fe26d80f70be3224' \ '264e25c6b9df80e541859cc0c568cf4804bbf676' \ '8d839bc31a45eba19d4c658e3278415893f749df' \ '1e67a8070ccc5a04a9bf7754c5a41208025bc809') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee ## this part is almost the same of kde-l10n kde_l10n_language_from_tag() { diff --git a/source/x11/libwacom/FrugalBuild b/source/x11/libwacom/FrugalBuild index a1eb793..cc0614b 100644 --- a/source/x11/libwacom/FrugalBuild +++ b/source/x11/libwacom/FrugalBuild @@ -5,22 +5,14 @@ options+=('asneeded') pkgname=libwacom pkgver=0.12 -<<<<<<< HEAD pkgrel=2 -======= -pkgrel=1 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgdesc="Tablet Information Client Library" url="http://linuxwacom.sourceforge.net/"; _F_sourceforge_subdir=$pkgname/ _F_sourceforge_dirname="linuxwacom" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -<<<<<<< HEAD depends=('glib2' 'libgudev' 'elfutils') -======= -depends=('glib2' 'systemd>=188') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee groups=('x11') archs=('i686' 'x86_64') sha1sums=('f5c02a9d94b76153bfb3b0f01def7964c8d59783') diff --git a/source/xapps-extra/fotoxx/FrugalBuild b/source/xapps-extra/fotoxx/FrugalBuild index b5400df..a03c5d6 100644 --- a/source/xapps-extra/fotoxx/FrugalBuild +++ b/source/xapps-extra/fotoxx/FrugalBuild @@ -5,11 +5,7 @@ options+=('asneeded') pkgname=fotoxx -<<<<<<< HEAD -pkgver=15.07 -======= pkgver=15.08 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgrel=1 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.com/$pkgname.html"; @@ -21,11 +17,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="Flasttar http://www.kornelix.com/tarballs.html"; source="http://www.kornelix.com/uploads/1/3/0/3/13035936/$pkgname-$pkgver.tar.gz"; -<<<<<<< HEAD -sha1sums=('f76077687fc43517106b91f02fb1bec28e9ed001') -======= sha1sums=('c2987f75ea52eec7f903902f71287311a80970c4') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee replaces=('fotox') build() { diff --git a/source/xapps-extra/geany-plugins/FrugalBuild b/source/xapps-extra/geany-plugins/FrugalBuild index 6bf3142..06fbf5a 100644 --- a/source/xapps-extra/geany-plugins/FrugalBuild +++ b/source/xapps-extra/geany-plugins/FrugalBuild @@ -5,30 +5,18 @@ options+=('asneeded') pkgname=geany-plugins -<<<<<<< HEAD -pkgver=1.24 -pkgrel=1 -pkgdesc="The combined plugins release for Geany." -url="http://plugins.geany.org"; -depends=('geany>=1.24' 'gtkspell' 'lua' 'webkit-gtk3>=2.2.3') -======= pkgver=1.25 pkgrel=1 pkgdesc="The combined plugins release for Geany." url="http://plugins.geany.org"; depends=('geany>=1.25' 'gtkspell' 'lua' 'webkit-gtk3>=2.2.3') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('intltool') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') up2date="Flasttar $url/downloads.html" source=($url/$pkgname/$pkgname-$pkgver.tar.bz2) -<<<<<<< HEAD -sha1sums=('3976ff92c84a19dc3f04da23ff41f604ce41fc04') -======= sha1sums=('e74e06ef7062a238fd8681650140f0c711ed6661') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee Faddsubpkg 'geany-plugin-webhelper' 'Webhelper plugin for geany.' 'webkit-gtk2' "$pkgname=$pkgver" diff --git a/source/xapps-extra/r/FrugalBuild b/source/xapps-extra/r/FrugalBuild index 18ee29c..2a88ff3 100644 --- a/source/xapps-extra/r/FrugalBuild +++ b/source/xapps-extra/r/FrugalBuild @@ -4,11 +4,7 @@ options+=('asneeded') pkgname=r -<<<<<<< HEAD -pkgver=3.2.1 -======= pkgver=3.2.2 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgrel=1 pkgdesc="R is a language and environment for statistical computing and graphics." url="http://www.r-project.org"; @@ -19,11 +15,7 @@ archs=('i686' 'x86_64') _F_archive_name="R" source=("http://cran.r-project.org/src/base/R-3/$_F_archive_name-$pkgver.tar.gz";) up2date="Flasttar http://cran.r-project.org/src/base/R-3/"; -<<<<<<< HEAD -sha1sums=('74476c4d356f227bf0f17c8c21e63459861fbc93') -======= sha1sums=('68c74db1c5a2f2040280a03b8396e4d28a5a7617') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee Fconfopts="--libdir=/usr/lib --enable-R-shlib --enable-R-static-lib --with-lapack --with-blas" unset MAKEFLAGS diff --git a/source/xapps-extra/remmina/FrugalBuild b/source/xapps-extra/remmina/FrugalBuild index fe5ed40..9ea8d56 100644 --- a/source/xapps-extra/remmina/FrugalBuild +++ b/source/xapps-extra/remmina/FrugalBuild @@ -3,28 +3,16 @@ # Contributor: bouleetbil <[email protected]> pkgname=remmina -<<<<<<< HEAD -pkgver=0.9.3 -pkgrel=2 -pkgdesc="A GTK+ RDP, VNC, XDMCP and SSH client" -depends=('libssh>=0.6.3' 'unique1' 'gtk+2' 'vte' 'libegl') -======= pkgver=1.1.2 pkgrel=2 pkgdesc="A GTK+ RDP, VNC, XDMCP and SSH client" depends=('libssh>=0.6.3' 'unique1' 'gtk+2' 'vte3' 'libegl' 'libxkbfile' \ 'libpulse' 'libgnome-keyring') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('intltool') groups=('xapps-extra') archs=('i686' 'x86_64') _F_gnome_desktop="y" _F_gnome_iconcache="y" -<<<<<<< HEAD -Finclude sourceforge gnome-scriptlet -Fconfopts+=" --disable-avahi" -sha1sums=('51585eb24d297f23bb51a23e3a4a767f9dd00083') -======= _F_github_author="FreeRDP" _F_github_dirname="Remmina" _F_github_tag_v="y" @@ -79,6 +67,5 @@ build() Fsplit remmina-xdmcp usr/lib/remmina/plugins/remmina-plugin-xdmcp.* } ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee # optimization OK diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index 45b7f82..e0c485d 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -75,10 +75,7 @@ build() { Finstallrel 644 "*.r0" "usr/lib/virtualbox/" Finstallrel 644 "VBoxEFI*.fd" "usr/lib/virtualbox/" -<<<<<<< HEAD [ "$CARCH" != "x86_64" ] &&Finstallrel 644 "*.gc" "usr/lib/virtualbox" -======= ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee Finstallrel 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl "usr/lib/virtualbox" diff --git a/source/xapps/gvfs/FrugalBuild b/source/xapps/gvfs/FrugalBuild index e53f58a..771935b 100644 --- a/source/xapps/gvfs/FrugalBuild +++ b/source/xapps/gvfs/FrugalBuild @@ -8,17 +8,10 @@ options+=('asneeded') pkgname=gvfs pkgver=1.24.1 -<<<<<<< HEAD pkgrel=2 pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o abstractions of gio." url="http://www.gnome.org/"; depends=('glib2>=2.44.0' 'dbus' 'avahi-glib' 'udisks2>=2.1.5-2' 'libxml2>=2.7.8' \ -======= -pkgrel=1 -pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o abstractions of gio." -url="http://www.gnome.org/"; -depends=('glib2>=2.44.0' 'dbus' 'avahi-glib' 'udisks2' 'systemd>=188' 'libxml2>=2.7.8' \ ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee 'libarchive>=3.0.3' 'libcdio' 'libsoup-gnome>=2.50.0' 'libsecret' 'gtk+3>=3.16.0') makedepends=('intltool' 'docbook-xsl' 'gtk-doc' 'ifuse' 'gphoto2>=2.5.0' \ 'fuse' 'samba>=3.6.1' 'openssh>=5.6p1' \ diff --git a/source/xapps/udisks/FrugalBuild b/source/xapps/udisks/FrugalBuild index 9f8eb75..f3c6d9d 100644 --- a/source/xapps/udisks/FrugalBuild +++ b/source/xapps/udisks/FrugalBuild @@ -5,20 +5,12 @@ options+=('asneeded') pkgname=udisks pkgver=1.0.4 -<<<<<<< HEAD pkgrel=9 -======= -pkgrel=8 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgdesc="Storage Management Service" url="http://www.freedesktop.org/wiki/Software/udisks"; depends=('dbus-glib' 'polkit' 'parted>=3.1-2' 'lvm2>=2.02.96' \ 'libatasmart>=0.19' 'sg3-utils' 'e2fsprogs' 'dosfstools' 'mtools' \ -<<<<<<< HEAD 'libgudev' 'elfutils') -======= - 'systemd>=188') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('intltool') Fconfopts+=" --disable-man-pages --enable-lvm2" groups=('xapps') @@ -26,19 +18,12 @@ archs=('i686' 'x86_64') up2date="Flasttar http://hal.freedesktop.org/releases/"; source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ udisks-1.0.4-neuter-stdout-and-stderr.patch \ -<<<<<<< HEAD udisks-1.0.4-drop-pci-db.patch \ udisks_fix_build_with_glibc220.patch) sha1sums=('10d2acfd6e6ff4c8d9d962af1fb1856a885e3219' \ 'd97bccf46a78f2e2c493fa6f90195ffa9985db90' \ '85121f859c0a13e744f34948826a26f6527f5388' \ 'ac8acfc97aadb0142d19481b072e921ea85e763b') -======= - udisks-1.0.4-drop-pci-db.patch) -sha1sums=('10d2acfd6e6ff4c8d9d962af1fb1856a885e3219' \ - 'd97bccf46a78f2e2c493fa6f90195ffa9985db90' \ - '85121f859c0a13e744f34948826a26f6527f5388') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee replaces=('devicekit-disks') diff --git a/source/xapps/udisks2/FrugalBuild b/source/xapps/udisks2/FrugalBuild index b8ed008..44c3db4 100644 --- a/source/xapps/udisks2/FrugalBuild +++ b/source/xapps/udisks2/FrugalBuild @@ -7,20 +7,12 @@ options+=('asneeded') pkgname=udisks2 _F_archive_name=udisks pkgver=2.1.5 -<<<<<<< HEAD pkgrel=2 -======= -pkgrel=1 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgdesc="Storage Management Service" url="http://www.freedesktop.org/wiki/Software/udisks"; depends=('dbus-glib' 'polkit' 'parted>=3.1-2' 'lvm2>=2.02.96' \ 'libatasmart>=0.19' 'sg3-utils' 'e2fsprogs' 'dosfstools' 'mtools'\ -<<<<<<< HEAD 'libgudev') -======= - 'systemd>=188') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('intltool' 'gobject-introspection' 'gtk-doc') Fconfopts+=" --enable-gtk-doc --enable-lvm2" groups=('xapps') diff --git a/source/xapps/upower/FrugalBuild b/source/xapps/upower/FrugalBuild index 78c4394..04cdf30 100644 --- a/source/xapps/upower/FrugalBuild +++ b/source/xapps/upower/FrugalBuild @@ -6,17 +6,10 @@ options+=('asneeded') pkgname=upower pkgver=0.99.3 -<<<<<<< HEAD pkgrel=2 pkgdesc="upower provides a daemon, API and command line tools for managing power devices attached to the system." url="http://upower.freedesktop.org"; depends=('libxml2>=2.7.8' 'dbus-glib' 'polkit' 'libusb' 'libimobiledevice>=1.2.0' 'libusb1' 'libgudev') -======= -pkgrel=1 -pkgdesc="upower provides a daemon, API and command line tools for managing power devices attached to the system." -url="http://upower.freedesktop.org"; -depends=('libxml2>=2.7.8' 'dbus-glib' 'polkit' 'libusb' 'libimobiledevice>=1.2.0' 'libusb1' 'systemd>=188') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('intltool' 'gobject-introspection') groups=('xapps') archs=('i686' 'x86_64') diff --git a/source/xfce4/thunar-volman/FrugalBuild b/source/xfce4/thunar-volman/FrugalBuild index d557ad4..a112dec 100644 --- a/source/xfce4/thunar-volman/FrugalBuild +++ b/source/xfce4/thunar-volman/FrugalBuild @@ -5,7 +5,6 @@ pkgname=thunar-volman pkgver=0.8.0 -<<<<<<< HEAD pkgrel=4 pkgdesc="Automatic volume management of removable drives and media for Thunar." _F_gnome_iconcache="y" @@ -14,15 +13,6 @@ makedepends=('pkgconfig' 'perl-xml-parser' 'intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') _F_xfce_ver=0.8 -======= -pkgrel=3 -pkgdesc="Automatic volume management of removable drives and media for Thunar." -_F_gnome_iconcache="y" -depends=('thunar>=1.6.3' 'libxfce4ui>=4.10.0' 'libnotify>=0.7' 'systemd>=188') -makedepends=('pkgconfig' 'perl-xml-parser' 'intltool') -groups=('xfce4' 'xfce4-core') -archs=('i686' 'x86_64') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee Finclude xfce4 gnome-scriptlet sha1sums=('2e62c9b0bec5c164e9c632671c81966c4220823c') diff --git a/source/xlib/clutter-gst3/FrugalBuild b/source/xlib/clutter-gst3/FrugalBuild index 56eba85..cf83745 100644 --- a/source/xlib/clutter-gst3/FrugalBuild +++ b/source/xlib/clutter-gst3/FrugalBuild @@ -11,17 +11,10 @@ options+=('asneeded') pkgname=clutter-gst3 _F_gnome_name=clutter-gst pkgver=3.0.6 -<<<<<<< HEAD pkgrel=2 pkgdesc="Gstreamer bindings for the clutter framework." depends=('clutter>=1.22.0' 'pango>=1.36.8-3' 'zlib' 'gst1-plugins-base>=1.0.1' 'libxfixes' \ 'libxi' 'libxxf86vm' 'libdrm' 'gdk-pixbuf2' 'gtk+3>=3.16.1' 'libgudev') -======= -pkgrel=1 -pkgdesc="Gstreamer bindings for the clutter framework." -depends=('clutter>=1.22.0' 'pango>=1.36.8-3' 'zlib' 'gst1-plugins-base>=1.0.1' 'libxfixes' \ - 'libxi' 'libxxf86vm' 'libdrm' 'gdk-pixbuf2' 'gtk+3>=3.16.1') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('gobject-introspection') archs=('i686' 'x86_64') _F_gnome_devel="n" diff --git a/source/xlib/colord/FrugalBuild b/source/xlib/colord/FrugalBuild index c45be8c..0e6995a 100644 --- a/source/xlib/colord/FrugalBuild +++ b/source/xlib/colord/FrugalBuild @@ -6,17 +6,10 @@ options+=('asneeded') pkgname=colord pkgver=1.2.11 -<<<<<<< HEAD pkgrel=2 pkgdesc="color daemon" #depends=('glib2' 'polkit' 'lcms2' 'libgusb' 'systemd>=188' 'sane-backends' ) depends=('glib2>=2.44.0' 'polkit' 'lcms2' 'libgusb' 'argyllcms' 'libgudev') -======= -pkgrel=1 -pkgdesc="color daemon" -#depends=('glib2' 'polkit' 'lcms2' 'libgusb' 'systemd>=188' 'sane-backends' ) -depends=('glib2>=2.44.0' 'polkit' 'lcms2' 'libgusb' 'systemd>=188' 'argyllcms') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('intltool' 'vala' 'gobject-introspection' 'docbook-utils' 'bash-completion') groups=('xlib') archs=('i686' 'x86_64' 'arm') diff --git a/source/xmultimedia/gst1-plugins-bad/FrugalBuild b/source/xmultimedia/gst1-plugins-bad/FrugalBuild index 65f5a35..50b9e08 100644 --- a/source/xmultimedia/gst1-plugins-bad/FrugalBuild +++ b/source/xmultimedia/gst1-plugins-bad/FrugalBuild @@ -7,18 +7,11 @@ options+=('asneeded') pkgname=gst1-plugins-bad _F_archive_name="gst-plugins-bad" pkgver=1.4.5 -<<<<<<< HEAD pkgrel=3 pkgdesc="Plugins for GStreamer (Bad)" url="http://gstreamer.freedesktop.org"; depends=('gst1-plugins-base>=1.4.3' 'libstdc++' 'zlib' 'gstreamer1>=1.4.3' 'openssl>=1.0.0-2' 'mjpegtools' \ 'orc' 'libgudev' 'libldap') -======= -pkgrel=2 -pkgdesc="Plugins for GStreamer (Bad)" -url="http://gstreamer.freedesktop.org"; -depends=('gst1-plugins-base>=1.4.3' 'libstdc++' 'zlib' 'gstreamer1>=1.4.3' 'openssl>=1.0.0-2' 'mjpegtools' 'orc') ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee makedepends=('krb5') groups=('xmultimedia') options+=('scriptlet') @@ -55,10 +48,6 @@ build() Fmake \ --disable-debug \ --disable-ivorbis \ -<<<<<<< HEAD -======= - --disable-dependency-tracking \ ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee --with-package-name='Frugalware gstreamer-plugins-bad package' \ --with-package-origin='http://frugalware.org/' Fmakeinstall diff --git a/source/xmultimedia/gst1-plugins-good/FrugalBuild b/source/xmultimedia/gst1-plugins-good/FrugalBuild index 3ff55cf..a21f3d8 100644 --- a/source/xmultimedia/gst1-plugins-good/FrugalBuild +++ b/source/xmultimedia/gst1-plugins-good/FrugalBuild @@ -8,11 +8,7 @@ options+=('asneeded') pkgname=gst1-plugins-good _F_archive_name="gst-plugins-good" pkgver=1.4.5 -<<<<<<< HEAD pkgrel=4 -======= -pkgrel=3 ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee pkgdesc="Plugins for GStreamer (Good)" url="http://gstreamer.freedesktop.org/"; depends=('gst1-plugins-base>=1.4.3' 'gstreamer1>=1.4.3' 'zlib' 'orc') @@ -40,11 +36,7 @@ subdescs=('GStreamer speex plugin (Good).' 'GStreamer aalib plugin (Good).' 'GSt subdepends=("speex>=1.2beta3.2" "aalib>=1.4rc5-3" "libshout" "libjpeg>=8a" \ "flac" "libavc1394 libiec61883" "libpng" "libdv" \ "liboil>=0.3.14" "taglib" "libcaca" "" \ -<<<<<<< HEAD "v4l-utils libgudev" "wavpack" "libsm libice libxext libxdamage libxfixes libx11 libxdmcp libxau libxcb" "pulseaudio-x11>=5.0" \ -======= - "v4l-utils" "wavpack" "libsm libice libxext libxdamage libxfixes libx11 libxdmcp libxau libxcb" "pulseaudio-x11>=5.0" \ ->>>>>>> 68d7056c6ab418d00c843cd8732c9927192230ee "libsoup" "jack>=0.118.O" "gtk+2>=2.20.0-2" "libvpx") subrodepends=("$pkgname=$pkgver" \ "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
