This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/move-x2goagent-into-x2goserver in repository x2goserver. from 9f8168e Move x2goagent wrapper package around nxagent into X2Go Server. new b877da9 x2goserver/bin/x2gofeaturelist: whitespace only. new b3bf688 debian/: remove x2goserver-x2goagent.dirs and hope it's really unneeded, because the Makefile creates these directories correctly. new 4dc71d4 x2goserver-x2goagent/: rename share/x2go/rgb back to etc/rgb. new d09fff2 x2goserver-x2goagent/Makefile: install etc/rgb as in ${SYSCONFDIR}/x2go/rgb again and create a symlink from that to ${DATADIR}/x2go/rgb. new 217ba31 debian/x2goserver-x2goagent.install: re-add etc/rgb file. new a814fc8 x2goserver.spec: re-add etc/rgb as a config file. The 6 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 | 11 +++++++++++ debian/x2goserver-x2goagent.dirs | 3 --- debian/x2goserver-x2goagent.install | 2 +- x2goserver-x2goagent/Makefile | 2 ++ x2goserver-x2goagent/{share/x2go => etc}/rgb | 0 x2goserver.spec | 1 + x2goserver/bin/x2gofeaturelist | 1 - 7 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 debian/x2goserver-x2goagent.dirs rename x2goserver-x2goagent/{share/x2go => etc}/rgb (100%) -- Alioth's /srv/git/code.x2go.org/x2goserver.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 feature/move-x2goagent-into-x2goserver in repository x2goserver. commit b3bf68801ad49ab2e4af782e5d8a30449c622d70 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 30 08:07:33 2016 +0200 debian/: remove x2goserver-x2goagent.dirs and hope it's really unneeded, because the Makefile creates these directories correctly. --- debian/changelog | 3 +++ debian/x2goserver-x2goagent.dirs | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b5d1127..9ec14fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -174,6 +174,9 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low package (where they are actually needed.) * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. + * debian/: + - Remove x2goserver-x2goagent.dirs and hope it's really unneeded, because + the Makefile creates these directories correctly. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 09 May 2014 13:06:24 +0200 diff --git a/debian/x2goserver-x2goagent.dirs b/debian/x2goserver-x2goagent.dirs deleted file mode 100644 index 548ecdf..0000000 --- a/debian/x2goserver-x2goagent.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/pixmaps -usr/share/x2go -- Alioth's /srv/git/code.x2go.org/x2goserver.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 feature/move-x2goagent-into-x2goserver in repository x2goserver. commit b877da9b6648df44a8a6f3e98e9c6dfdc0b24d04 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 30 06:09:30 2016 +0200 x2goserver/bin/x2gofeaturelist: whitespace only. --- debian/changelog | 1 + x2goserver/bin/x2gofeaturelist | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e532503..b5d1127 100644 --- a/debian/changelog +++ b/debian/changelog @@ -156,6 +156,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low - libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl: don't use deprecated defined (@array) construct which never really did what one would expect (defined () can only be used on scalar values.) + - x2goserver/bin/x2gofeaturelist: whitespace only. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver/bin/x2gofeaturelist b/x2goserver/bin/x2gofeaturelist index 1f62e37..083c40b 100755 --- a/x2goserver/bin/x2gofeaturelist +++ b/x2goserver/bin/x2gofeaturelist @@ -30,4 +30,3 @@ test -d "$X2GO_SHARE_PATH/x2gofeature.d" && { cat "$subscript" | egrep ".*\).*ok.*exit 0.*" | cut -d"\"" -f2 | cut -d"\"" -f1 done } - -- Alioth's /srv/git/code.x2go.org/x2goserver.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 feature/move-x2goagent-into-x2goserver in repository x2goserver. commit d09fff27f33e09cb107d20bbf19072349cb8da4f Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 30 08:52:01 2016 +0200 x2goserver-x2goagent/Makefile: install etc/rgb as in ${SYSCONFDIR}/x2go/rgb again and create a symlink from that to ${DATADIR}/x2go/rgb. --- debian/changelog | 3 +++ x2goserver-x2goagent/Makefile | 2 ++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 89d00b6..e20de59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -158,6 +158,9 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low would expect (defined () can only be used on scalar values.) - x2goserver/bin/x2gofeaturelist: whitespace only. - x2goserver-x2goagent/: rename share/x2go/rgb back to etc/rgb. + - x2goserver-x2goagent/Makefile: install etc/rgb as in + ${SYSCONFDIR}/x2go/rgb again and create a symlink from that to + ${DATADIR}/x2go/rgb. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver-x2goagent/Makefile b/x2goserver-x2goagent/Makefile index fa179ce..2cd30ee 100755 --- a/x2goserver-x2goagent/Makefile +++ b/x2goserver-x2goagent/Makefile @@ -64,9 +64,11 @@ install_data: $(INSTALL_FILE) share/x2go/rgb $(DESTDIR)$(SHAREDIR)/ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/../pixmaps/ $(INSTALL_FILE) share/pixmaps/x2go.xpm $(DESTDIR)$(SHAREDIR)/../pixmaps/ + $(INSTALL_SYMLINK) $(ETCDIR)/rgb $(DESTDIR)$(SHAREDIR)/ install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/ + $(INSTALL_FILE) etc/rgb $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/x2goagent.options $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/x2goagent.keyboard $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)$(ETCDIR)/ -- Alioth's /srv/git/code.x2go.org/x2goserver.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 feature/move-x2goagent-into-x2goserver in repository x2goserver. commit 217ba316739288258051da41b1d06ba6c4d58021 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 30 08:53:11 2016 +0200 debian/x2goserver-x2goagent.install: re-add etc/rgb file. --- debian/changelog | 2 ++ debian/x2goserver-x2goagent.install | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e20de59..a5124ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -181,6 +181,8 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low * debian/: - Remove x2goserver-x2goagent.dirs and hope it's really unneeded, because the Makefile creates these directories correctly. + * debian/x2goserver-x2goagent.install: + - Re-add etc/rgb file. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 09 May 2014 13:06:24 +0200 diff --git a/debian/x2goserver-x2goagent.install b/debian/x2goserver-x2goagent.install index 9155627..11a2369 100644 --- a/debian/x2goserver-x2goagent.install +++ b/debian/x2goserver-x2goagent.install @@ -3,7 +3,7 @@ usr/lib/x2go/bin/x2goagent usr/share/pixmaps/x2go.xpm usr/share/x2go/rgb usr/share/man/man1/x2goagent.1* -usr/share/x2go/rgb +etc/x2go/rgb usr/share/x2go/versions/VERSION.x2goserver-x2goagent etc/x2go/keystrokes.cfg etc/x2go/x2goagent.keyboard -- Alioth's /srv/git/code.x2go.org/x2goserver.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 feature/move-x2goagent-into-x2goserver in repository x2goserver. commit 4dc71d490728fbf67abc1f34c3e43efa665003a4 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 30 08:49:16 2016 +0200 x2goserver-x2goagent/: rename share/x2go/rgb back to etc/rgb. --- debian/changelog | 1 + x2goserver-x2goagent/{share/x2go => etc}/rgb | 0 2 files changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 9ec14fa..89d00b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -157,6 +157,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low use deprecated defined (@array) construct which never really did what one would expect (defined () can only be used on scalar values.) - x2goserver/bin/x2gofeaturelist: whitespace only. + - x2goserver-x2goagent/: rename share/x2go/rgb back to etc/rgb. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver-x2goagent/share/x2go/rgb b/x2goserver-x2goagent/etc/rgb similarity index 100% rename from x2goserver-x2goagent/share/x2go/rgb rename to x2goserver-x2goagent/etc/rgb -- Alioth's /srv/git/code.x2go.org/x2goserver.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 feature/move-x2goagent-into-x2goserver in repository x2goserver. commit a814fc8618a38401cf7524820e32b192a1de0955 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 30 08:54:02 2016 +0200 x2goserver.spec: re-add etc/rgb as a config file. --- debian/changelog | 1 + x2goserver.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index a5124ce..b2c6cc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -176,6 +176,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low - Change deprecated and removed PreReq to Requires(pre) header. - Move shadow/shadow-utils/pwdutils Requires to x2goserver-common sub package (where they are actually needed.) + - Re-add etc/rgb as a config file. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. * debian/: diff --git a/x2goserver.spec b/x2goserver.spec index dce4024..1b0da9b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -813,6 +813,7 @@ fi %config(noreplace) %{_sysconfdir}/x2go/x2goagent.keyboard %config(noreplace) %{_sysconfdir}/x2go/x2goagent.options %config(noreplace) %{_sysconfdir}/x2go/keystrokes.cfg +%config(noreplace) %{_sysconfdir}/x2go/rgb %files printing -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org