summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2007-12-26 00:42:23 +0000
committerHolger Freyther <zecke@selfish.org>2007-12-26 00:42:23 +0000
commit5867852a8e90a31151acdd555a313ce660d4573c (patch)
tree0564255a65f8e6b6ab1bbd5c58c85a686da22345 /conf/distro
parent6e03f54929969450bcc876200c6aabcb7123cbe3 (diff)
parent697b9b92a5931ad9042a282ccc0297c595d46644 (diff)
merge of '909c536d732a709ac1bbe82a546de7dade5fdf07'
and 'dafddd1d044d96ecf2e968c17c56e4f9f332240d'
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/include/angstrom-2007-preferred-versions.inc8
-rw-r--r--conf/distro/include/sane-srcdates.inc1
-rw-r--r--conf/distro/include/slugos.inc2
3 files changed, 3 insertions, 8 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 8a189c7fb4..97fed90f21 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -709,11 +709,6 @@ PREFERRED_VERSION_imlib ?= "1.9.15"
PREFERRED_VERSION_imlib2 ?= "1.4.0.002"
PREFERRED_VERSION_imposter ?= "0.3"
PREFERRED_VERSION_inetutils ?= "1.4.2"
-PREFERRED_VERSION_initramfs-jffs2 ?= "0.1"
-PREFERRED_VERSION_initramfs-module-block ?= "0.1"
-PREFERRED_VERSION_initramfs-module-loop ?= "0.1"
-PREFERRED_VERSION_initramfs-module-nfs ?= "0.1"
-PREFERRED_VERSION_initramfs-uniboot ?= "0.2"
PREFERRED_VERSION_initscripts ?= "1.0"
PREFERRED_VERSION_initscripts-openprotium ?= "1.0"
PREFERRED_VERSION_initscripts-slugos ?= "1.0"
@@ -1659,6 +1654,7 @@ PREFERRED_VERSION_rfakeap ?= "0.2"
PREFERRED_VERSION_rglueap ?= "0.1"
PREFERRED_VERSION_rhythmbox ?= "0.8.7"
PREFERRED_VERSION_rlpr ?= "2.05"
+PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0"
PREFERRED_VERSION_rott ?= "1.0"
PREFERRED_VERSION_rox-filer ?= "2.5"
PREFERRED_VERSION_rp-pppoe ?= "3.8"
@@ -2126,7 +2122,7 @@ PREFERRED_VERSION_zmerlin ?= "0.9.1"
PREFERRED_VERSION_zope ?= "3.3.1"
PREFERRED_VERSION_zrally ?= "0.90"
PREFERRED_VERSION_zrev7 ?= "1.0.1"
-PREFERRED_VERSION_zroadmap ?= "1.0.12"
+PREFERRED_VERSION_zroadmap ?= "1.1.0"
PREFERRED_VERSION_zsafe ?= "2.1.3"
PREFERRED_VERSION_zsh ?= "4.1.1"
PREFERRED_VERSION_zshopi ?= "0.2"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index b3b47093b7..8f82eb4611 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -148,7 +148,6 @@ SRCDATE_xcompmgr ?= "20060814"
SRCDATE_xirssi ?= "20060814"
SRCDATE_xsvg ?= "20060814"
SRCDATE_yamonenv ?= "20060814"
-SRCDATE_zroadmap ?= "20060814"
# Freedesktop.org
SRCDATE_poppler0.6 = "20070708"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index ab80719646..177a0edfe8 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.7"
+SLUGOS_VERSION = "4.8"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):