This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 4b1b0246f93cfab79ecc0fc9ebcc970d92db743d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 29 07:35:12 2018 +0100 debian/x2goserver.postinst: Drop duplicate sourcing of debconf includes. --- debian/changelog | 4 +++- debian/x2goserver.postinst | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2f51d48..c15cf04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goserver (4.1.0.4-0x2go1) UNRELEASED; urgency=medium - * Continue development + [ Mike Gabriel ] + * debian/x2goserver.postinst: + + Drop duplicate sourcing of debconf includes. -- X2Go Release Manager <git-admin@x2go.org> Thu, 29 Nov 2018 07:57:20 +0100 diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 1e75c45..a8670f8 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -20,9 +20,6 @@ set -e # for details, see https://www.debian.org/doc/debian-policy/ or # the debian-policy package -# Source debconf library. -. /usr/share/debconf/confmodule - case "${1}" in 'configure') ### cleaning up setgid stuff of older versions of package x2goserver -- 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 344dcfa93ce4630832f50fdd96390db98f0606b4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 29 11:21:12 2018 +0100 x2goserver-x2goagent: Drop x2goagent.keyboard file. --- debian/changelog | 1 + debian/x2goserver-x2goagent.install | 1 - debian/x2goserver-x2goagent.postinst | 3 +++ debian/x2goserver-x2goagent.postrm | 3 +++ debian/x2goserver-x2goagent.preinst | 3 +++ x2goserver-x2goagent/Makefile | 1 - x2goserver-x2goagent/etc/x2goagent.keyboard | 1 - x2goserver.spec | 1 - 8 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7025b5c..2f787cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goserver (4.1.0.4-0x2go1) UNRELEASED; urgency=medium [ Mike Gabriel ] * New upstream version (4.1.0.4): - Fix version number in VERSION.x2goserver-desktopsharing. + - x2goserver-x2goagent: Drop x2goagent.keyboard file. * debian/x2goserver.postinst: + Drop duplicate sourcing of debconf includes. diff --git a/debian/x2goserver-x2goagent.install b/debian/x2goserver-x2goagent.install index 99db72e..26e5666 100644 --- a/debian/x2goserver-x2goagent.install +++ b/debian/x2goserver-x2goagent.install @@ -1,5 +1,4 @@ etc/x2go/keystrokes.cfg -etc/x2go/x2goagent.keyboard etc/x2go/x2goagent.options usr/bin/x2goagent usr/lib/*/nx/bin/x2goagent diff --git a/debian/x2goserver-x2goagent.postinst b/debian/x2goserver-x2goagent.postinst index 0c46ab1..368ed12 100755 --- a/debian/x2goserver-x2goagent.postinst +++ b/debian/x2goserver-x2goagent.postinst @@ -19,6 +19,9 @@ set -e dpkg-maintscript-helper 'rm_conffile' \ '/etc/x2go/rgb' '4.1.0.0-999' 'x2goserver-x2goagent' -- "${@}" +dpkg-maintscript-helper 'rm_conffile' \ + '/etc/x2go/x2goagent.keyboard' '4.1.0.2-3' 'x2goserver-x2goagent' -- "${@}" + # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff --git a/debian/x2goserver-x2goagent.postrm b/debian/x2goserver-x2goagent.postrm index 7e91211..284eb99 100755 --- a/debian/x2goserver-x2goagent.postrm +++ b/debian/x2goserver-x2goagent.postrm @@ -19,6 +19,9 @@ set -e dpkg-maintscript-helper 'rm_conffile' \ '/etc/x2go/rgb' '4.1.0.0-999' 'x2goserver-x2goagent' -- "${@}" +dpkg-maintscript-helper 'rm_conffile' \ + '/etc/x2go/x2goagent.keyboard' '4.1.0.2-3' 'x2goserver-x2goagent' -- "${@}" + # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff --git a/debian/x2goserver-x2goagent.preinst b/debian/x2goserver-x2goagent.preinst index 0402151..d2413b2 100755 --- a/debian/x2goserver-x2goagent.preinst +++ b/debian/x2goserver-x2goagent.preinst @@ -17,6 +17,9 @@ set -e dpkg-maintscript-helper 'rm_conffile' \ '/etc/x2go/rgb' '4.1.0.0-999' 'x2goserver-x2goagent' -- "${@}" +dpkg-maintscript-helper 'rm_conffile' \ + '/etc/x2go/x2goagent.keyboard' '4.1.0.2-3' 'x2goserver-x2goagent' -- "${@}" + # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff --git a/x2goserver-x2goagent/Makefile b/x2goserver-x2goagent/Makefile index 1a7f6ac..c9bc7b5 100755 --- a/x2goserver-x2goagent/Makefile +++ b/x2goserver-x2goagent/Makefile @@ -68,7 +68,6 @@ install_data: install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/x2goagent.options $(DESTDIR)$(ETCDIR)/ - $(INSTALL_FILE) etc/x2goagent.keyboard $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)$(ETCDIR)/ install_man: diff --git a/x2goserver-x2goagent/etc/x2goagent.keyboard b/x2goserver-x2goagent/etc/x2goagent.keyboard deleted file mode 100644 index afe2832..0000000 --- a/x2goserver-x2goagent/etc/x2goagent.keyboard +++ /dev/null @@ -1 +0,0 @@ -rules=xfree86 diff --git a/x2goserver.spec b/x2goserver.spec index 0f6ff8a..e66851c 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1028,7 +1028,6 @@ fi %{_datadir}/pixmaps/x2goagent.xpm %{_datadir}/x2go/x2gofeature.d/x2goserver-x2goagent.features %{_mandir}/man1/x2goagent.1* -%config(noreplace) %{_sysconfdir}/x2go/x2goagent.keyboard %config(noreplace) %{_sysconfdir}/x2go/x2goagent.options %config(noreplace) %{_sysconfdir}/x2go/keystrokes.cfg -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git