This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2golxdebindings. from 5374f33 x2golxdebindings.spec: remove faulty "or" dependency. new 0c0d3b1 x2golxdebindings.spec: resolve conflict between primus and Mesa-libGL1 by ignoring primus. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + x2golxdebindings.spec | 3 +++ 2 files changed, 4 insertions(+) -- Alioth's /srv/git/code.x2go.org/x2golxdebindings.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2golxdebindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2golxdebindings. commit 0c0d3b1c9d79ef9e2b69456754a40df465349de3 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 3 21:44:29 2015 +0200 x2golxdebindings.spec: resolve conflict between primus and Mesa-libGL1 by ignoring primus. --- debian/changelog | 1 + x2golxdebindings.spec | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 91daff2..52b351e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2golxdebindings (1.0.2.4-0x2go1) UNRELEASED; urgency=low - Remove faulty "or" dependency, replace with libfm-*-based dependencies, which should automatically pull in GTK2 or GTK3. (Most likely GTK3 anyway.) + - Resolve conflict between primus and Mesa-libGL1 by ignoring primus. -- X2Go Release Manager <git-admin@x2go.org> Wed, 11 Feb 2015 00:14:45 +0100 diff --git a/x2golxdebindings.spec b/x2golxdebindings.spec index eb795d3..9986986 100644 --- a/x2golxdebindings.spec +++ b/x2golxdebindings.spec @@ -39,6 +39,9 @@ Requires: libfm-gtk BuildRequires: libfm-gtk-devel %endif +# OpenSUSE 13.2+ has a choice between primus and Mesa-libGL1. Take MESA. +#!BuildIgnore: primus + %if 0%{?el5} # For compatibility with EPEL5 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -- Alioth's /srv/git/code.x2go.org/x2golxdebindings.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2golxdebindings.git
-
git-admin＠x2go.org