This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from f379a18 Windows: correctly reference windows icon. new 5c33be4 x2goclient.spec: fix builds on Fedora and related due to failing removal of browserplugin directory. That's non-critical. 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 | 2 ++ debian/copyright | 2 +- x2goclient.spec | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 5c33be48c8a4c93af05cecac8bb96b117acc2783 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 6 02:15:55 2015 +0100 x2goclient.spec: fix builds on Fedora and related due to failing removal of browserplugin directory. That's non-critical. --- debian/changelog | 2 ++ debian/copyright | 2 +- x2goclient.spec | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4d702a9..1d4fb5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -179,6 +179,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - Windows: convert and delete the other config or build scripts. Delete obsolete ones. - Windows: correctly reference windows icon. + - x2goclient.spec: fix builds on Fedora and related due to failing removal + of browserplugin directory. That's non-critical. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/debian/copyright b/debian/copyright index b299691..0b9c995 100644 --- a/debian/copyright +++ b/debian/copyright @@ -44,7 +44,7 @@ Comment: * version. If you delete this exception statement from all source * files in the program, then also delete it here. -Files: qtbrowserplugin-2.4_1-opensource/src/* +Files: x2gobrowserplugin-2.4_1/src/* Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies). License: BSD-3-clause Contact: Nokia Corporation (qt-info@nokia.com) diff --git a/x2goclient.spec b/x2goclient.spec index 41ae8ea..fbe705e 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -165,7 +165,7 @@ sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_bindir}/lrelease@' Makefile sed -i -e '/CFGPLUGIN/aTEMPLATE=lib' x2goclient.pro sed -i -e '/^LIBS /s/$/ -ldl/' x2goclient.pro sed -i -e 's/include.*qtbrowserplugin.pri)/LIBS += -lqtbrowserplugin/' x2goclient.pro -rm -r qtbrowserplugin* +rm -r x2gobrowserplugin* || : %endif -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org