diff options
| author | Philip Balister <philip@balister.org> | 2008-06-26 14:28:18 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2008-06-26 14:28:18 +0000 |
| commit | 1ed0deaac092272dfa5206a227e30adc8efd4f88 (patch) | |
| tree | 7bdb9066a41c27b2f9d3a52871b7379d1cdacb41 /conf | |
| parent | d032555264023e95a5e9847be6133dd1d8c974c8 (diff) | |
| parent | 591be26f58217b3e726f58c2648a42b5e02e7b5c (diff) | |
merge of 'a1c5133ec8dfc7768c8883c8aa89593ce01f57cb'
and 'fb432a3c848fb8f9a30c288a565d9490a1d9b318'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 8 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index b84e2d46e2..5ba510a4b7 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1369,8 +1369,8 @@ PREFERRED_VERSION_openssl-native ?= "0.9.7g" PREFERRED_VERSION_openswan ?= "2.4.7" PREFERRED_VERSION_openttd ?= "0.4.0.1" PREFERRED_VERSION_openvpn ?= "2.0.9" -PREFERRED_VERSION_opkg-native ?= "4488" -PREFERRED_VERSION_opkg ?= "4488" +SRCREV_pn-opkg-native ?= "4488" +SRCREV_pn-opkg ?= "4488" PREFERRED_VERSION_oplinux-packages ?= "1.0" PREFERRED_VERSION_oprofile ?= "0.9.3" PREFERRED_VERSION_orage ?= "4.4.1" @@ -1530,8 +1530,8 @@ PREFERRED_VERSION_python-pyfits ?= "1.1" PREFERRED_VERSION_python-pyflakes ?= "0.2.1" PREFERRED_VERSION_python-pygame ?= "1.7.1" PREFERRED_VERSION_python-pygnome ?= "2.16.2" -PREFERRED_VERSION_python-pygobject ?= "2.12.3" -PREFERRED_VERSION_python-pygobject-native ?= "2.12.3" +PREFERRED_VERSION_python-pygobject ?= "2.14.2" +PREFERRED_VERSION_python-pygobject-native ?= "2.14.2" PREFERRED_VERSION_python-pygoogle ?= "0.6" PREFERRED_VERSION_python-pygtk-1.2 ?= "0.6.12" PREFERRED_VERSION_python-pygtk ?= "2.10.4" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 3acc8b2bc2..8661e5b065 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -166,5 +166,8 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" +PREFERRED_PROVIDER_avahi ?= "avahi" +PREFERRED_PROVIDER_gconf ?= "gconf" + require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc |