This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/mate-minidesktop-stretch in repository live-build-x2go. from 7bf0268 Merge branch 'feature/openbox' into feature/mate-minidesktop-stretch adds c61f975 thinclient config script makes no sense in mate-minidesktop; as there is no openbox and a different user account we are running under adds 4824f16 Merge branch 'feature/openbox' into feature/mate-minidesktop adds 6047138 remove German firefox-esr langpack from base image adds 43ddd11 added list of all firefox-esr langpacks, but all disabled (idea is that buildscript will remove comment sign from desired entries) adds e301e3f adding some sane firefox-esr defaults adds a7804e1 removed firefox-esr.js, as it gets overwritten by package install. Needs to be patched at runtime instead. adds e7bb995 added runtime patching routine for firefox config adds 40a6269 fixed logic error in homepageurl script new 07d8986 Merge branch 'feature/mate-minidesktop' into feature/mate-minidesktop-stretch The 1 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: .../lib/live/config/2900-firefox-config | 27 +++++++ config/package-lists/firefox-langpacks.list.chroot | 93 ++++++++++++++++++++++ config/package-lists/mate-minidesktop.list.chroot | 1 - 3 files changed, 120 insertions(+), 1 deletion(-) create mode 100755 config/includes.chroot/lib/live/config/2900-firefox-config create mode 100644 config/package-lists/firefox-langpacks.list.chroot -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/mate-minidesktop-stretch in repository live-build-x2go. commit 07d8986789f9e965c27b788713f87f0cb3b08247 Merge: 7bf0268 40a6269 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Thu Nov 30 22:36:11 2017 +0100 Merge branch 'feature/mate-minidesktop' into feature/mate-minidesktop-stretch Conflicts: config/package-lists/mate-minidesktop.list.chroot .../lib/live/config/2900-firefox-config | 27 +++++++ config/package-lists/firefox-langpacks.list.chroot | 93 ++++++++++++++++++++++ config/package-lists/mate-minidesktop.list.chroot | 1 - 3 files changed, 120 insertions(+), 1 deletion(-) diff --cc config/package-lists/mate-minidesktop.list.chroot index 43fe0f2,4ec56a6..758b6f7 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@@ -1,4 -1,4 +1,3 @@@ firefox-esr - firefox-esr-l10n-de -flashplugin-nonfree x2gothinclient-minidesktop x2gothinclient-usbmount -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git