[X2Go-Commits] [x2gothinclient] 01/02: Make contrib and non-free software available on minidesktop TCE creation.

git-admin at x2go.org git-admin at x2go.org
Wed Aug 27 10:16:16 CEST 2014


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 at 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


More information about the x2go-commits mailing list