This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 03112e1 Several style and dependency fixes. Use Conflicts: instead of Breaks: for unversioned package conflicts. new 39b3019 Spcial handling of x2gofm.desktop. In EPEL-5 the Encoding key is still required for .desktop files. 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 ++ x2goserver.spec | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 39b3019b0a4aa5f2896857cf34d0c8895ba49e84 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 1 11:49:22 2014 +0200 Spcial handling of x2gofm.desktop. In EPEL-5 the Encoding key is still required for .desktop files. --- debian/changelog | 2 ++ x2goserver.spec | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9378aca..371b4de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -129,6 +129,8 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low x2gomountdirs.8. * x2goserver.spec: - Let builds for EPEL-7 behave like recent Fedora builds. + - Spcial handling of x2gofm.desktop. In EPEL-5 the Encoding key + is still required for .desktop files. * debian/*.doc-base: + Provide *.doc-base files for bin:packages containing HTML man pages or other documentation. diff --git a/x2goserver.spec b/x2goserver.spec index f994b6e..8e406c3 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -263,7 +263,6 @@ sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath # Don't try to be root sed -i -e 's/-o root -g root//' */Makefile - %build export PATH=%{_qt4_bindir}:$PATH make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} @@ -301,6 +300,9 @@ install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2goserver %endif %endif +%if 0%{?el5} +echo "Encoding=UTF-8" >> %{buildroot}%{_datadir}/applications/x2gofm.desktop +%endif desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org