This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 99fbb76 x2goserver-x2goagent/Makefile: add missing bin component in symlink target for ${PREFIX}/bin/x2goagent. new d943b7c x2goserver-common/Makefile: stage tmpfiles.d config file into ${PREFIX}/lib/. new bd724bc x2goserver-common/: move etc/tmpfiles.d to lib/tmpfiles.d. new 234a1d0 debian/copyright.in: change reference from x2goserver-common/etc/tmpfiles.d to x2goserver-common/lib/tmpfiles.d. new 128bea4 debian/x2goserver-common.install: move etc/tmpfiles.d entry to usr/lib/tmpfiles.d. new 767dbfc x2goserver.spec: move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d. new 1ee9a4d debian/x2goserver-x2goagent.{{pre,post}inst,postrm}: handle /etc/tmpfiles.d/x2goserver.conf conffile (re-)move to /usr/lib/tmpfiles.d/ gracefully. 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/copyright.in | 2 +- debian/x2goserver-common.install | 2 +- debian/x2goserver-common.postinst | 3 +++ debian/x2goserver-common.postrm | 3 +++ debian/x2goserver-common.preinst | 3 +++ x2goserver-common/Makefile | 8 ++++---- x2goserver-common/{etc => lib}/tmpfiles.d/x2goserver.conf | 0 x2goserver.spec | 4 ++-- 9 files changed, 28 insertions(+), 8 deletions(-) rename x2goserver-common/{etc => lib}/tmpfiles.d/x2goserver.conf (100%) -- 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 bd724bcf3fb444650e67d751902158e2bcf99a48 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 21 22:02:11 2018 +0100 x2goserver-common/: move etc/tmpfiles.d to lib/tmpfiles.d. --- debian/changelog | 1 + x2goserver-common/{etc => lib}/tmpfiles.d/x2goserver.conf | 0 2 files changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index c883df4..3955de5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium target for ${PREFIX}/bin/x2goagent. - x2goserver-common/Makefile: stage tmpfiles.d config file into ${PREFIX}/lib/. File should not be modified by users. + - x2goserver-common/: move etc/tmpfiles.d to lib/tmpfiles.d. * debian/{control,compat}: + Bump DH compat level to 9. * debian/: diff --git a/x2goserver-common/etc/tmpfiles.d/x2goserver.conf b/x2goserver-common/lib/tmpfiles.d/x2goserver.conf similarity index 100% rename from x2goserver-common/etc/tmpfiles.d/x2goserver.conf rename to x2goserver-common/lib/tmpfiles.d/x2goserver.conf -- 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 d943b7c00e330a94c5529d3fff12f57ed952aae2 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 21 22:00:00 2018 +0100 x2goserver-common/Makefile: stage tmpfiles.d config file into ${PREFIX}/lib/. File should not be modified by users. --- debian/changelog | 2 ++ x2goserver-common/Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index bd25a26..c883df4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium - x2goserver-x2goagent/Makefile: it's $(NXLIBDIR), not $(NX_LIBDIR). - x2goserver-x2goagent/Makefile: add missing bin component in symlink target for ${PREFIX}/bin/x2goagent. + - x2goserver-common/Makefile: stage tmpfiles.d config file into + ${PREFIX}/lib/. File should not be modified by users. * debian/{control,compat}: + Bump DH compat level to 9. * debian/: diff --git a/x2goserver-common/Makefile b/x2goserver-common/Makefile index 559b1bc..fe2cb99 100755 --- a/x2goserver-common/Makefile +++ b/x2goserver-common/Makefile @@ -64,8 +64,8 @@ install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql - $(INSTALL_DIR) $(DESTDIR)/etc/tmpfiles.d || true - $(INSTALL_FILE) etc/tmpfiles.d/x2goserver.conf $(DESTDIR)/etc/tmpfiles.d/ + $(INSTALL_DIR) $(DESTDIR)/${PREFIX}/lib/tmpfiles.d || true + $(INSTALL_FILE) lib/tmpfiles.d/x2goserver.conf $(DESTDIR)/${PREFIX}/lib/tmpfiles.d/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5 @@ -87,8 +87,8 @@ uninstall_config: $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true $(RM_DIR) $(DESTDIR)$(ETCDIR) || true - $(RM_FILE) $(DESTDIR)/etc/tmpfiles.d/x2goserver.conf - $(RM_DIR) $(DESTDIR)/etc/tmpfiles.d || true + $(RM_FILE) $(DESTDIR)/${PREFIX}/lib/tmpfiles.d/x2goserver.conf + $(RM_DIR) $(DESTDIR)/${PREFIX}/lib/tmpfiles.d || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man5/$$file.5.gz; done -- 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 234a1d0218e342f1cee2541439628ce33c592dac Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 21 22:03:55 2018 +0100 debian/copyright.in: change reference from x2goserver-common/etc/tmpfiles.d to x2goserver-common/lib/tmpfiles.d. --- debian/changelog | 2 ++ debian/copyright.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3955de5..2bb6914 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Remove reference to rgb file. + Remove reference to x2goagent wrapper script. + Add .keep file in x2goserver-x2goagent/bin directory. + + Change reference from x2goserver-common/etc/tmpfiles.d to + x2goserver-common/lib/tmpfiles.d. * debian/x2goserver.dirs: + Remove etc/x2go/x2gosql references, already handled by x2goserver-common. diff --git a/debian/copyright.in b/debian/copyright.in index 2e0290a..cc54f3c 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -64,9 +64,9 @@ Files: INSTALL rpm/x2goserver.init x2goserver-common/Makefile x2goserver-common/VERSION.x2goserver-common - x2goserver-common/etc/tmpfiles.d/x2goserver.conf x2goserver-common/etc/x2goserver.conf x2goserver-common/etc/x2gosql/sql + x2goserver-common/lib/tmpfiles.d/x2goserver.conf x2goserver-common/man/man5/x2goserver.conf.5 x2goserver-extensions/Makefile x2goserver-extensions/README.md -- 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 128bea4268abee83d1f11cf27db5540965edb004 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 21 22:05:44 2018 +0100 debian/x2goserver-common.install: move etc/tmpfiles.d entry to usr/lib/tmpfiles.d. --- debian/changelog | 2 ++ debian/x2goserver-common.install | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2bb6914..5062011 100644 --- a/debian/changelog +++ b/debian/changelog @@ -106,6 +106,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium levels not falling back to looking into debian/tmp/ for files. * debian/x2goserver.{install,manpages}: + Also install x2goumount_* symlinks. + * debian/x2goserver-common.install: + + Move etc/tmpfiles.d entry to usr/lib/tmpfiles.d. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/x2goserver-common.install b/debian/x2goserver-common.install index 7914339..daf5248 100644 --- a/debian/x2goserver-common.install +++ b/debian/x2goserver-common.install @@ -1,4 +1,4 @@ etc/x2go/x2goserver.conf etc/x2go/x2gosql/ -etc/tmpfiles.d/x2go* +usr/lib/tmpfiles.d/x2go* usr/share/x2go/versions/VERSION.x2goserver-common -- 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 1ee9a4d152d349445d6b6883e40ef6cc238f7ff6 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 21 22:15:13 2018 +0100 debian/x2goserver-x2goagent.{{pre,post}inst,postrm}: handle /etc/tmpfiles.d/x2goserver.conf conffile (re-)move to /usr/lib/tmpfiles.d/ gracefully. --- debian/changelog | 3 +++ debian/x2goserver-common.postinst | 3 +++ debian/x2goserver-common.postrm | 3 +++ debian/x2goserver-common.preinst | 3 +++ 4 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3f3c505..99c85fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -109,6 +109,9 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Also install x2goumount_* symlinks. * debian/x2goserver-common.install: + Move etc/tmpfiles.d entry to usr/lib/tmpfiles.d. + * debian/x2goserver-x2goagent.{{pre,post}inst,postrm}: + + Handle /etc/tmpfiles.d/x2goserver.conf conffile (re-)move to + /usr/lib/tmpfiles.d/ gracefully. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/x2goserver-common.postinst b/debian/x2goserver-common.postinst index 6f77ddf..a49c10e 100755 --- a/debian/x2goserver-common.postinst +++ b/debian/x2goserver-common.postinst @@ -17,6 +17,9 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package +dpkg-maintscript-helper 'rm_conffile' \ + '/etc/tmpfiles.d/x2goserver.conf' '4.1.0.0-999' 'x2goserver-common' -- "${@}" + case "${1}" in 'configure') ### diff --git a/debian/x2goserver-common.postrm b/debian/x2goserver-common.postrm index f57e911..c51a05d 100755 --- a/debian/x2goserver-common.postrm +++ b/debian/x2goserver-common.postrm @@ -15,6 +15,9 @@ set -e +dpkg-maintscript-helper 'rm_conffile' \ + '/etc/tmpfiles.d/x2goserver.conf' '4.1.0.0-999' 'x2goserver-common' -- "${@}" + case "${1}" in 'purge') getent 'passwd' 'x2gouser' >'/dev/null' && deluser 'x2gouser' diff --git a/debian/x2goserver-common.preinst b/debian/x2goserver-common.preinst index 166f891..be9af4b 100755 --- a/debian/x2goserver-common.preinst +++ b/debian/x2goserver-common.preinst @@ -17,6 +17,9 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package +dpkg-maintscript-helper 'rm_conffile' \ + '/etc/tmpfiles.d/x2goserver.conf' '4.1.0.0-999' 'x2goserver-common' -- "${@}" + case "${1}" in 'install'|'upgrade') if getent 'group' 'x2gousers' >'/dev/null'; then -- 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 767dbfc308e09b32062ac64bf1ca9046a9c83622 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 21 22:09:39 2018 +0100 x2goserver.spec: move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d. --- debian/changelog | 1 + x2goserver.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5062011..3f3c505 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,6 +74,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Bump nxagent requirement to 3.5.99.5+. + Remove stale symlinks check workaround now that we pull in nxagent >= 3.5.99.0 by default. + + Move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d. * debian/copyright.in: + Remove reference to rgb file. + Remove reference to x2goagent wrapper script. diff --git a/x2goserver.spec b/x2goserver.spec index 595ba15..bf09179 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -623,7 +623,7 @@ rm -f "%{buildroot}/etc/sudoers.d/x2goserver" # Delete tmpfiles.d configuration file on systems # not using systemd. %if ( ! 0%{?fedora} ) && ( ( 0%{?rhel} && 0%{?rhel} < 7 ) || ( 0%{?suse_version} && 0%{?suse_version} < 1210 ) ) -rm -f "%{buildroot}/etc/tmpfiles.d/x2goserver.conf" +rm -f "%{buildroot}/%{_prefix}/lib/tmpfiles.d/x2goserver.conf" %endif # Dummy file - will be created/removed in post* scriptlets. @@ -905,7 +905,7 @@ fi %config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf %config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 -%config(noreplace) %{_sysconfdir}/tmpfiles.d/x2goserver.conf +%{_prefix}/lib/tmpfiles.d/x2goserver.conf %endif %{_mandir}/man5/x2goserver.conf.5.gz %dir %{_datadir}/x2go/versions -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org