This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from f130663 fix symlinking new 9adc29e Make contrib and non-free software available on minidesktop TCE creation. new fffaa85 Add R (x2gothinclient-minidesktop): flashplugin-nonfree. The 2 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 | 3 +++ debian/control | 2 ++ management/sbin/x2gothinclient_create | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 9adc29eab0b85c3d534fe519cc5593bf1235f194 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Aug 27 10:16:08 2014 +0200 Make contrib and non-free software available on minidesktop TCE creation. --- debian/changelog | 2 ++ management/sbin/x2gothinclient_create | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0d31067..fa71ad0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low way (dpkg-divert) and provide the TCE's .desktop file instead. . Make sure that launching x2goclient via a terminal or the run command box in MATE results in the restricted TCE X2Go Client. + . Make contrib and non-free software available on minidesktop TCE + creation. - Adapt management package to TCE flavouring. Add new configuration option in x2gothinclient_settings: TC_FLAVOUR (can be: minidesktop or displaymanager). diff --git a/management/sbin/x2gothinclient_create b/management/sbin/x2gothinclient_create index 9137f6b..256c507 100755 --- a/management/sbin/x2gothinclient_create +++ b/management/sbin/x2gothinclient_create @@ -136,7 +136,13 @@ fi if [ "x$TC_DISTRO_CODENAME" = "xwheezy" ] && [ "x$TC_FLAVOUR" = "xminidesktop" ]; then cat >> $TC_CHROOT/etc/apt/sources.list.d/backports.list <<EOF -deb $TC_DEBMIRROR_URL ${TC_DISTRO_CODENAME}-backports main +deb $TC_DEBMIRROR_URL ${TC_DISTRO_CODENAME}-backports main contrib non-free +EOF + cat >> $TC_CHROOT/etc/apt/sources.list.d/contrib.list <<EOF +deb $TC_DEBMIRROR_URL ${TC_DISTRO_CODENAME} contrib +EOF + cat >> $TC_CHROOT/etc/apt/sources.list.d/non-free.list <<EOF +deb $TC_DEBMIRROR_URL ${TC_DISTRO_CODENAME} non-free EOF fi -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit fffaa859228c40ff9404acfa1388d228cc73f2a8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Aug 27 10:16:12 2014 +0200 Add R (x2gothinclient-minidesktop): flashplugin-nonfree. --- debian/changelog | 1 + debian/control | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index fa71ad0..71de310 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low x2gothinclient-minidesktop and x2gothinclient-displaymanager + Add D (displaymanager flavour, minidesktop flavour): pinentry-x2go. + Add D (x2gothinclient-minidesktop): nodm. + + Add R (x2gothinclient-minidesktop): flashplugin-nonfree. * debian/copyright: + Use copyright-format 1.0. diff --git a/debian/control b/debian/control index 3a8f5bf..046b12e 100644 --- a/debian/control +++ b/debian/control @@ -119,6 +119,8 @@ Depends: xinit, x2gothinclient-common (>= ${source:Version}), nodm, +Recommends: + flashplugin-nonfree Breaks: x2gothinclient-minidesktop-mate, Replaces: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org