summaryrefslogtreecommitdiff
path: root/conf/distro/include
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro/include')
-rw-r--r--conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--conf/distro/include/slugos.inc4
2 files changed, 4 insertions, 2 deletions
diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc
index 0681b01d3d..fa66d61a0a 100644
--- a/conf/distro/include/preferred-xorg-versions.inc
+++ b/conf/distro/include/preferred-xorg-versions.inc
@@ -103,7 +103,7 @@ PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2"
PREFERRED_VERSION_xrandr = "1.2.2"
PREFERRED_VERSION_xrdb = "1.0.3"
PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
-PREFERRED_VERSION_xserver-xorg = "1.1.0"
+PREFERRED_VERSION_xserver-xorg = "1.3.0.0"
PREFERRED_VERSION_xset = "1.0.2"
PREFERRED_VERSION_xtrans = "1.0.3"
PREFERRED_VERSION_xtrans-native = "1.0.3"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 00b9440b1f..acfe23d742 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -16,7 +16,7 @@
#TARGET_OS "linux" or "linux-uclibc"
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.5"
+SLUGOS_VERSION = "4.6"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
@@ -145,3 +145,5 @@ IGNORE_STRIP_ERRORS = ""
#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+
+PREFERRED_VERSION_openssh ?= "4.6p1"