Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=63751c3911f21e6fd1fb898c7a6ea22e5b424121
commit 63751c3911f21e6fd1fb898c7a6ea22e5b424121
Merge: 4175b32 24fcc1b
Author: Anthony Jorion <pin...@frugalware.org>
Date: Sat Nov 16 14:48:47 2013 +0100
Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
diff --cc source/xfce4-extra/xfce4-mailwatch-plugin/FrugalBuild
index d5183a0,316fc48..db3057f
--- a/source/xfce4-extra/xfce4-mailwatch-plugin/FrugalBuild
+++ b/source/xfce4-extra/xfce4-mailwatch-plugin/FrugalBuild
@@@ -2,31 -2,32 +2,48 @@@
# Maintainer: Pingax <pin...@frugalware.fr>
# Contributor: Devil505 <devil505li...@gmail.com>
+options+=('asneeded')
+
pkgname=xfce4-mailwatch-plugin
++<<<<<<< HEAD
+pkgver=1.2.0
+pkgrel=1
++=======
+ pkgver=1.1.0
+ pkgrel=4
++>>>>>>> 24fcc1b0981428c8dc5b4cde20704f96d4e2074a
pkgdesc="A mailbox watch/check plugin for the Xfce4 panel"
url="http://spurint.org/projects/xfce4-mailwatch-plugin/";
depends=('xfce4-panel>=4.9.0' 'libxfcegui4>=4.9.0' 'libuuid' 'gnutls>=2.12.12')
makedepends=('xfce4-dev-tools>=4.9.0' 'intltool')
groups=('xfce4-extra' 'xfce4-goodies')
_F_gnome_iconcache="y"
+_F_xfce_category="panel-plugins"
+options=('scriptlet')
Finclude xfce4 gnome-scriptlet
archs=('i686' 'x86_64')
-up2date="Flasttar http://spurint.org/files/mailwatch/";
-source=(http://spuriousinterrupt.org/files/mailwatch/${pkgname}-${pkgver}.tar.bz2
\
- xfce4-mailwatch-plugin-1.1.0-underlink.patch)
-sha1sums=('fdca7a62a694146fc5cbe48dbaf4db4c60da5510' \
- 'dd6e742b9578fc2cca6146a68a7069edf4f27a0e')
+sha1sums=('d0ab5e543211b951e01242efeb4ab3145db5c4c4')
++<<<<<<< HEAD
+#build() {
+# Fcd
+# Fpatchall
+# xdt-autogen || Fdie
+# Fmake
+# Fmakeinstall
+# Fbuild_gnome_scriptlet
+#}
++=======
+ build() {
+ Fcd
+ Fpatchall
+ Fsed 'AM_CONFIG_HEADER' 'AC_CONFIG_HEADERS' configure.ac
+ xdt-autogen || Fdie
+ Fmake
+ Fmakeinstall
+ Fbuild_gnome_scriptlet
+ }
++>>>>>>> 24fcc1b0981428c8dc5b4cde20704f96d4e2074a
# optimization OK
diff --cc source/xfce4/xfdesktop/FrugalBuild
index cc0a275,6853c22..4342b02
--- a/source/xfce4/xfdesktop/FrugalBuild
+++ b/source/xfce4/xfdesktop/FrugalBuild
@@@ -3,11 -3,9 +3,16 @@@
# Contributor: Devil505 <devil505li...@gmail.com>
# Contributor: Priyank Gosalia <priyan...@gmail.com>
+options+=('asneeded')
+
pkgname=xfdesktop
++<<<<<<< HEAD
+pkgver=4.11.1
+pkgrel=1
++=======
+ pkgver=4.10.2
+ pkgrel=3
++>>>>>>> 24fcc1b0981428c8dc5b4cde20704f96d4e2074a
pkgdesc="A desktop manager for Xfce4."
rodepends=('xfce-frugalware')
depends=('libxml2' 'libxfce4ui>=4.10.0' 'xfconf>=4.10.0' \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
