x2go-commits December 2013

x2go-commits@lists.x2go.org

2 participants
2076 discussions

x2goclient.git - master (branch) updated: 4.0.1.1-51-g84b2ded
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via 84b2ded49fc781a684fb394a96ea95c73eff8b08 (commit) from 088dd58c8c3fc46a2b4bda8959138b512ffb724a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 84b2ded49fc781a684fb394a96ea95c73eff8b08 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 15:24:53 2013 +0100 x2goclient.spec: rather build EPEL-6 package against qt4-devel ----------------------------------------------------------------------- Summary of changes: x2goclient.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goclient.spec b/x2goclient.spec index 1c07360..8a64a4d 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -18,7 +18,7 @@ BuildRequires: man2html-core BuildRequires: man %endif BuildRequires: openldap-devel -%if 0%{?el5} +%if 0%{?el5} || 0%{?el6} BuildRequires: qt4-devel %else BuildRequires: qt-devel hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-284-g9faed78
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via 9faed78b1887eb2bab9402d8eb026f9b222d5f85 (commit) from eafa39924b7a78bd74fd0393cdd39c80d44df15b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9faed78b1887eb2bab9402d8eb026f9b222d5f85 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 15:04:39 2013 +0100 x2goserver.spec: make sure x2gofeature.d directory is created ----------------------------------------------------------------------- Summary of changes: x2goserver.spec | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/x2goserver.spec b/x2goserver.spec index e8d3377..7471012 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -361,6 +361,7 @@ exit 0 %exclude %{_mandir}/man8/x2goserver-run-extensions.8.gz %exclude %{_mandir}/man8/x2gofm.8.gz %exclude %{_mandir}/man8/x2goprint.8.gz +%dir %{_datadir}/x2go/x2gofeature.d/ %{_datadir}/x2go/x2gofeature.d/ %exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features %exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-283-geafa399
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via eafa39924b7a78bd74fd0393cdd39c80d44df15b (commit) from 35b7045949fd8d129571707f9ce11760694f8edc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit eafa39924b7a78bd74fd0393cdd39c80d44df15b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 14:40:42 2013 +0100 x2goserver.spec: fix installation of x2goserver init script ----------------------------------------------------------------------- Summary of changes: x2goserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver.spec b/x2goserver.spec index ddc25a7..e8d3377 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -284,7 +284,7 @@ install -pm0644 %SOURCE1 %{buildroot}%{_unitdir} %else # SysV session cleanup script mkdir -p %{buildroot}%{_initddir} -install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2gocleansessions +install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2goserver %endif %pre common hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.6-13-g44d22a9
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via 44d22a994e8ae76d2a14b995eed5013ff5a1b32d (commit) from 9a69afce5654e77c8d5e69d04d52b899e33393ac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 44d22a994e8ae76d2a14b995eed5013ff5a1b32d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 14:38:34 2013 +0100 pinentry-x2go.spec: use virtual package qt4-devel for el6, too ----------------------------------------------------------------------- Summary of changes: pinentry-x2go.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec index 1fca287..e54126f 100644 --- a/pinentry-x2go.spec +++ b/pinentry-x2go.spec @@ -14,7 +14,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: autoconf >= 2.57, automake >= 1.7.6 BuildRequires: gcc-c++ BuildRequires: libcap-devel, ncurses-devel -%if 0%{?el5} +%if 0%{?el5} || 0%{?el6} BuildRequires: qt4-devel %else BuildRequires: qt-devel hooks/post-receive -- pinentry-x2go.git (PinEntry Dialog (Qt) for X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pinentry-x2go.git" (PinEntry Dialog (Qt) for X2Go Client).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-282-g35b7045
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via 35b7045949fd8d129571707f9ce11760694f8edc (commit) from 19b52865258ae0c2ad62ba461784019d1be1d05e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 35b7045949fd8d129571707f9ce11760694f8edc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 14:13:18 2013 +0100 fix .packlist file removal ----------------------------------------------------------------------- Summary of changes: x2goserver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2goserver.spec b/x2goserver.spec index 5986473..ddc25a7 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -259,8 +259,8 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=% %install make install DESTDIR=%{buildroot} PREFIX=%{_prefix} XSESSIONDIR=/etc/X11/xinit/Xclients.d -# Make sure the packlist file is remove... -rm -f %{buildroot}%{perl_vendorlib}/auto/x2goserver/.packlist +# Make sure the .packlist file is removed from %{perl_vendorarch}... +rm -f %{buildroot}%{perl_vendorarch}/auto/x2goserver/.packlist # Make symbolic link relative rm %{buildroot}%{_sysconfdir}/x2go/Xresources hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.6-12-g9a69afc
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via 9a69afce5654e77c8d5e69d04d52b899e33393ac (commit) from 0f28242de5b479e4be8a4062c44ead6cb27a4f18 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9a69afce5654e77c8d5e69d04d52b899e33393ac Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 14:04:44 2013 +0100 pinentry-x2go.spec: typo fix ----------------------------------------------------------------------- Summary of changes: config.h.in | 3 --- pinentry-x2go.spec | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) The diff of changes is: diff --git a/config.h.in b/config.h.in index 0f7fc0f..55d0743 100644 --- a/config.h.in +++ b/config.h.in @@ -94,9 +94,6 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME -/* Define to the home page for this package. */ -#undef PACKAGE_URL - /* Define to the version of this package. */ #undef PACKAGE_VERSION diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec index c294b19..1fca287 100644 --- a/pinentry-x2go.spec +++ b/pinentry-x2go.spec @@ -12,7 +12,7 @@ Source0: http://code.x2go.org/releases/source/%name/%name-%version.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %endif BuildRequires: autoconf >= 2.57, automake >= 1.7.6 -BuildRequires: gcc-g++ +BuildRequires: gcc-c++ BuildRequires: libcap-devel, ncurses-devel %if 0%{?el5} BuildRequires: qt4-devel hooks/post-receive -- pinentry-x2go.git (PinEntry Dialog (Qt) for X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pinentry-x2go.git" (PinEntry Dialog (Qt) for X2Go Client).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-281-g19b5286
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via 19b52865258ae0c2ad62ba461784019d1be1d05e (commit) from d3e737b3005cc4f46b16a00ce4671f292c288e13 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 19b52865258ae0c2ad62ba461784019d1be1d05e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 14:00:10 2013 +0100 get rid of x2goserver .packlist file in %{perl_vendorlib} ----------------------------------------------------------------------- Summary of changes: x2goserver.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2goserver.spec b/x2goserver.spec index ffd4d98..5986473 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -249,8 +249,6 @@ find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath # Don't try to be root sed -i -e 's/-o root -g root//' */Makefile -# Perl pure_install -sed -i -e 's/perl install/perl pure_install/' Makefile %build @@ -261,6 +259,9 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=% %install make install DESTDIR=%{buildroot} PREFIX=%{_prefix} XSESSIONDIR=/etc/X11/xinit/Xclients.d +# Make sure the packlist file is remove... +rm -f %{buildroot}%{perl_vendorlib}/auto/x2goserver/.packlist + # Make symbolic link relative rm %{buildroot}%{_sysconfdir}/x2go/Xresources ln -s ../X11/Xresources %{buildroot}%{_sysconfdir}/x2go/ hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.6-11-g0f28242
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via 0f28242de5b479e4be8a4062c44ead6cb27a4f18 (commit) from 57d7e0d1faba0426adfefaf774ecf347b8eafe8c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0f28242de5b479e4be8a4062c44ead6cb27a4f18 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 13:57:12 2013 +0100 gcc-g++ is a build requirement ----------------------------------------------------------------------- Summary of changes: pinentry-x2go.spec | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec index bd00211..c294b19 100644 --- a/pinentry-x2go.spec +++ b/pinentry-x2go.spec @@ -12,6 +12,7 @@ Source0: http://code.x2go.org/releases/source/%name/%name-%version.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %endif BuildRequires: autoconf >= 2.57, automake >= 1.7.6 +BuildRequires: gcc-g++ BuildRequires: libcap-devel, ncurses-devel %if 0%{?el5} BuildRequires: qt4-devel hooks/post-receive -- pinentry-x2go.git (PinEntry Dialog (Qt) for X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pinentry-x2go.git" (PinEntry Dialog (Qt) for X2Go Client).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-279-gdfcd9b7
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via dfcd9b71037ceb7d77b7fe5684d7484e68496129 (commit) from 927a9cde4f79b0a98eed60a753bd15f5ccbf62a1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dfcd9b71037ceb7d77b7fe5684d7484e68496129 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 13:39:28 2013 +0100 Makefile: pre-set the PERL_INSTALLDIRS var with ,,vendor''. Use pure_install rather than install. ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- debian/changelog | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 6f71a66..03b0484 100755 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ build-indep: $(MAKE) -C x2goserver-fmbindings $@ install: - $(MAKE) -f Makefile.perl install + $(MAKE) -f Makefile.perl pure_install $(MAKE) -C x2goserver-common $@ $(MAKE) -C x2goserver $@ $(MAKE) -C libx2go-server-db-perl $@ diff --git a/debian/changelog b/debian/changelog index 197a8a0..272a424 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,7 +32,8 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low who shares his/her desktop. - Do not superenice desktop sharing / shadow sessions. - Drop obsolete components x2goserver-compat, x2goserver-pyhoca. - - Makefile: pre-set the PERL_INSTALLDIRS var with ,,vendor''. + - Makefile: pre-set the PERL_INSTALLDIRS var with ,,vendor''. Use + pure_install rather than install. * debian/control: + Package X2Go::Log in separate package: libx2go-log-perl. + Package X2Go::Server::DB in separate package: libx2go-server-db-perl. hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-280-gd3e737b
by git-admin＠x2go.org 09 Dec '13

09 Dec '13

The branch, master has been updated via d3e737b3005cc4f46b16a00ce4671f292c288e13 (commit) from dfcd9b71037ceb7d77b7fe5684d7484e68496129 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d3e737b3005cc4f46b16a00ce4671f292c288e13 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 9 13:41:15 2013 +0100 x2goclient.spec: fix installation of several files ----------------------------------------------------------------------- Summary of changes: x2goserver.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2goserver.spec b/x2goserver.spec index ab0a680..ffd4d98 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -341,12 +341,14 @@ exit 0 %dir %{_libdir}/x2go %{_libdir}/x2go/x2gochangestatus %{_libdir}/x2go/x2gocreatesession +%{_libdir}/x2go/x2gocreateshadowsession %{_libdir}/x2go/x2gogetagent %{_libdir}/x2go/x2gogetdisplays %{_libdir}/x2go/x2gogetports %{_libdir}/x2go/x2gogetstatus %{_libdir}/x2go/x2goinsertport %{_libdir}/x2go/x2goinsertsession +%{_libdir}/x2go/x2goinsertshadowsession %{_libdir}/x2go/x2golistsessions_sql %{_libdir}/x2go/x2gologlevel %{_libdir}/x2go/x2goresume @@ -390,7 +392,7 @@ exit 0 %files -n perl-X2Go-Server-DB %dir %{_libdir}/x2go -%{perl_vendorlib}/X2Go/Server/DB/* +%{perl_vendorlib}/X2Go/Server/DB* %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper.pl %{_mandir}/man3/X2Go::Server::DB.* @@ -416,7 +418,7 @@ exit 0 %files fmbindings -%{_datadir}/x2go/versions/VERSION.x2goserver-extensions +%{_datadir}/x2go/versions/VERSION.x2goserver-fmbindings %{_bindir}/x2gofm %{_datadir}/applications/ %{_datadir}/mime/ hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits December 2013