[X2Go-Commits] [live-build-x2go] 93/94: Revert "cleanup after accidental stretch merge(s) into jessie"

git-admin at x2go.org git-admin at x2go.org
Fri Mar 22 12:19:02 CET 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox-stretch
in repository live-build-x2go.

commit 03cc9ab7062e4df22361054fdfac45f33e1f2d5f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Mar 22 12:11:41 2019 +0100

    Revert "cleanup after accidental stretch merge(s) into jessie"
    
    This reverts commit 4db92a1f841f1c1a5df5bc2c906fbcd09832c079.
    
    Switching back to jessie on a stretch branch is certainly the wrong
    thing to do.
---
 config/archives/x2go.list.chroot          | 2 +-
 config/package-lists/firmware.list.chroot | 2 +-
 config/package-lists/live.list.chroot     | 1 -
 config/package-lists/ntfs.list.chroot     | 2 +-
 config/package-lists/x2go.list.chroot     | 3 +--
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/config/archives/x2go.list.chroot b/config/archives/x2go.list.chroot
index 51c0819..033eeea 100644
--- a/config/archives/x2go.list.chroot
+++ b/config/archives/x2go.list.chroot
@@ -1 +1 @@
-deb http://packages.x2go.org/debian jessie main
+deb http://packages.x2go.org/debian stretch main
diff --git a/config/package-lists/firmware.list.chroot b/config/package-lists/firmware.list.chroot
index 603f805..103bd36 100644
--- a/config/package-lists/firmware.list.chroot
+++ b/config/package-lists/firmware.list.chroot
@@ -1,7 +1,7 @@
 firmware-linux-free 
 firmware-linux-nonfree 
 firmware-linux 
+firmware-misc-nonfree
 firmware-realtek 
-firmware-ralink 
 firmware-atheros 
 firmware-iwlwifi
diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot
index 5972111..2e7d164 100644
--- a/config/package-lists/live.list.chroot
+++ b/config/package-lists/live.list.chroot
@@ -2,7 +2,6 @@ cifs-utils
 console-setup
 console-setup-linux
 fuse
-httpfs2
 initramfs-tools
 kbd
 keyboard-configuration
diff --git a/config/package-lists/ntfs.list.chroot b/config/package-lists/ntfs.list.chroot
index e3e6fd6..da18f0e 100644
--- a/config/package-lists/ntfs.list.chroot
+++ b/config/package-lists/ntfs.list.chroot
@@ -1,6 +1,6 @@
 fuse
 libfuse2
 libgcrypt20
-libgnutls-deb0-28
+#libgnutls-deb0-28
 libgpg-error0
 ntfs-3g
diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot
index a692b23..8b91e0d 100644
--- a/config/package-lists/x2go.list.chroot
+++ b/config/package-lists/x2go.list.chroot
@@ -15,7 +15,7 @@ libfreerdp-primitives1.1
 libfreerdp-rail1.1
 libfreerdp-utils1.1
 libjpeg62-turbo
-libssl1.0.0
+libssl1.0.2
 libwinpr-crt0.1
 libwinpr-crypto0.1
 libwinpr-dsparse0.1
@@ -46,7 +46,6 @@ libxrender1
 libxv1
 pinentry-x2go
 pulseaudio
-pulseaudio-module-x11
 pulseaudio-utils
 rdesktop
 udev

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git


More information about the x2go-commits mailing list