This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from b4ddbb6 debian/control: use dist-substitution variable instead of hardcoding perl:any. new 11bcf36 Makefile.PL: update version number. new e2d59a4 x2goserver-xsession/Makefile: consolidate a few entries. new 380ec5e x2goserver-xsession/Makefile: also remove Xresource*, Xsession*, xinit* and Xclient* config files. new 07d7cea debian/control: add build dependency on x11-common for /etc/X11/Xsession* to be available in the build environment and the symlinks to be created correctly. The 4 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: Makefile.PL | 2 +- debian/changelog | 7 +++++++ debian/control | 2 ++ x2goserver-xsession/Makefile | 11 +++++++---- 4 files changed, 17 insertions(+), 5 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/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 11bcf367d18521410507db03e8e6313bca8fec85 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 30 02:45:42 2018 +0200 Makefile.PL: update version number. --- Makefile.PL | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.PL b/Makefile.PL index b1cd2b2..609acfc 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -5,5 +5,5 @@ use ExtUtils::MakeMaker; WriteMakefile(FIRST_MAKEFILE => 'Makefile.perl', PMLIBDIRS => ['X2Go'], NAME => '', - VERSION => '4.1.0.1', + VERSION => '4.1.0.2', ); diff --git a/debian/changelog b/debian/changelog index 0a3c205..27882da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x2goserver (4.1.0.2-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (4.1.0.2): + - Makefile.PL: update version number. * debian/rules: + Add support for perl/perl:any substitution variable based upon detected OS version. -- Alioth's /home/x2go-admin/maintenancescripts/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 e2d59a4117cb38a14b2f5742c0d24ba9fbc64472 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jul 31 00:48:16 2018 +0200 x2goserver-xsession/Makefile: consolidate a few entries. --- debian/changelog | 1 + x2goserver-xsession/Makefile | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 27882da..ed95e87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goserver (4.1.0.2-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (4.1.0.2): - Makefile.PL: update version number. + - x2goserver-xsession/Makefile: consolidate a few entries. * debian/rules: + Add support for perl/perl:any substitution variable based upon detected OS version. diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index a834a6f..cae3dbf 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -56,10 +56,8 @@ install_config: $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ if [ -e /etc/debian_version ]; then if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi; fi if [ -e /etc/debian_version ]; then if [ -d $(XSESSIONDIR) ]; then $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi - if [ -e /etc/redhat-release ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi - if [ -e /etc/redhat-release ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi - if [ -e /etc/gentoo-release ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi - if [ -e /etc/gentoo-release ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi + if [ -e /etc/redhat-release ] || [ -e /etc/gentoo-release ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi + if [ -e /etc/redhat-release ] || [ -e /etc/gentoo-release ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi if [ -e /etc/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null || [ -d /usr/share/doc/packages/brp-check-suse ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi install_man: -- Alioth's /home/x2go-admin/maintenancescripts/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 380ec5e62131f122044bbec7b9025324e67eab73 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jul 31 00:50:30 2018 +0200 x2goserver-xsession/Makefile: also remove Xresource*, Xsession*, xinit* and Xclient* config files. --- debian/changelog | 2 ++ x2goserver-xsession/Makefile | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index ed95e87..f970552 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ x2goserver (4.1.0.2-0x2go1) UNRELEASED; urgency=medium * New upstream version (4.1.0.2): - Makefile.PL: update version number. - x2goserver-xsession/Makefile: consolidate a few entries. + - x2goserver-xsession/Makefile: also remove Xresource*, Xsession*, xinit* + and Xclient* config files. * debian/rules: + Add support for perl/perl:any substitution variable based upon detected OS version. diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index cae3dbf..ad6c765 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -74,6 +74,11 @@ uninstall_scripts: uninstall_config: for file in $(ETC_FILES); do $(RM_FILE) $(DESTDIR)$(ETCDIR)/$$file; done + $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xresources + $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.options + $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.d + $(RM_FILE) $(DESTDIR)$(ETCDIR)/xinitrc.d + $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xclients.d uninstall_man: -- Alioth's /home/x2go-admin/maintenancescripts/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 07d7cea57e7db22d9bf999cd7fd9a230e70aaef3 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jul 31 00:58:11 2018 +0200 debian/control: add build dependency on x11-common for /etc/X11/Xsession* to be available in the build environment and the symlinks to be created correctly. --- debian/changelog | 3 +++ debian/control | 2 ++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index f970552..4c33060 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ x2goserver (4.1.0.2-0x2go1) UNRELEASED; urgency=medium OS version. * debian/control: + Use dist-substitution variable instead of hardcoding perl:any. + + Add build dependency on x11-common for /etc/X11/Xsession* to be + available in the build environment and the symlinks to be created + correctly. -- X2Go Release Manager <git-admin@x2go.org> Fri, 27 Jul 2018 07:06:39 +0200 diff --git a/debian/control b/debian/control index 377c9fe..fafc793 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,8 @@ Build-Depends: dpkg-dev (>= 1.16.1.1), dh-systemd | hello, man2html-base, +# Needed for /etc/X11/Xsession.d + x11-common, Standards-Version: 4.1.4 Homepage: https://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org