This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 6241082b7878bfc8215b540de48887bfe37dab82 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Feb 1 08:49:39 2015 +0100 Revert "Forceful B-R on SLE 11.2: glib2-branding-SLES." This reverts commit 2cd7b523782b327813d223df3bfde615bda22b33. Conflicts: debian/changelog x2godesktopsharing.spec --- debian/changelog | 1 - x2godesktopsharing.spec | 1 - 2 files changed, 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7def9ca..3f2a3ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,7 +33,6 @@ x2godesktopsharing (3.1.1.2-0x2go1) UNRELEASED; urgency=low + Always set BuildRoot: parameter. + SLE (<= 11.3) builds: Use %suse_update_desktop_file -n <desktop-file> to mark .desktop file non-translatable. - + Forceful B-R on SLE 11.3: glib2-branding-SLED. + Add B-R on SLE 11.3: update-desktop-files. [ Mark Pedersen-Cook ] diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index ddb04c6..64f73cf 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -16,7 +16,6 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. Source1: %{name}-rpmlintrc %if 0%{?suse_version} && 0%{?suse_version} <= 1130 -BuildRequires: glib2-branding-SLED BuildRequires: update-desktop-files %endif -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git