diff options
| author |   Graeme Gregory <dp@xora.org.uk> | 2009-09-29 15:03:41 +0100 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-09-29 15:03:41 +0100 |
| commit | 20b087cc637f86cbb1b503a487084e9c4fc73a88 (patch) | |
| tree | bf6ffc8853dfa76ff71d1bf3792b7f28e3a561f8 /conf | |
| parent | 279d3f6e11eb9e76a1a3e977a28f92450875b2ce (diff) | |
| parent | 0834a71b91d99bfedd4659a25fb844e253518fe2 (diff) | |
| download | openembedded-20b087cc637f86cbb1b503a487084e9c4fc73a88.tar.gz | |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 16 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index b8a90104b4..5d850401ea 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -6622,6 +6622,10 @@ sha256=a24640d8ca9c485d7611880193f18e5ae62af07e3b9464904f3602277f1d4097 md5=414181781fb0923f884a38503e8e56da sha256=270e2e423a0b8e90091fd6f38422c488b67a23494d671764b9ed2e17ca802e16 +[http://pypi.python.org/packages/source/f/flup/flup-1.0.2.tar.gz] +md5=24dad7edc5ada31dddd49456ee8d5254 +sha256=4bad317a5fc1ce3d4fe5e9b6d846ec38a8023e16876785d4f88102f2c8097dd9 + [http://pypi.python.org/packages/source/f/flup/flup-1.0.tar.gz] md5=530801fe835fd9a680457e443eb95578 sha256=dd943b9746997bb6e49820187998dd26a58b2d0f886a45c166209e6d7d35aa32 @@ -11234,6 +11238,10 @@ sha256=f59292de39b9a4010414bd120a494226399767148efa37278bd53d9613167964 md5=b1e814c7f5ef2a5033e4c3e5162ac694 sha256=27b3703a0d6470e03e1574b481d6d05d652c787a793854f2f0e06d06c998a601 +[http://downloads.sourceforge.net/hplip/hplip-2.8.10.tar.gz] +md5=a9ad78c4f0d884caac6b176b3cb9bf21 +sha256=8e34e2bc5974fd0f4ab71fbb42ac76fe3074fb2a09960452e4a1a157a77e00f1 + [http://thegraveyard.org/files/hsetroot-1.0.2.tar.gz] md5=f599770a6411dcfe216c37b280fad9bc sha256=d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7 @@ -25378,6 +25386,10 @@ sha256=ac091ba9b2e2e9aff293969b3405b145c09789e59ac0caab2247211a19e09a8a md5=8ffa2ff763badd5de7592004d8d69a63 sha256=197c29803790efc0273bb4577d54629d0769a3b49b091c6430eb6704fd69824f +[http://download.videolan.org/pub/videolan/vlc/1.0.2/vlc-1.0.2.tar.bz2] +md5=69d4e30fe4fc2691780fbeacd40359d2 +sha256=38b176fd495f3254db74e03977235a0a2212fc6533d7cd1a4c3dddc495b074f0 + [http://www.lavrsen.dk/foswiki/pub/Motion/VideoFourLinuxLoopbackDevice/vloopback-1.2.tar.gz] md5=1b63bf5b3d2b7fae63497d285789aec5 sha256=d5af0c07aa53a6c93e92a6dd83f34dd9a08a05a0c0169c8ca8b15b023fdadf80 @@ -25882,6 +25894,10 @@ sha256=fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342 md5=25fcaa86a53333d416d5e837fb47ba7d sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21 +[http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090928-2245.tar.bz2] +md5=99870531113dafd01026c01a96c5fcbb +sha256=8b435c02ed0a09d039c0a89c8ddc5470e1885630a5dcedfe3d8bc60a6d63ab69 + [http://archive.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz] md5=fc805051f0fe505c7a4b1b5c8db9b9e3 sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043 diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 03e5c8ec23..83cf820f9b 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -8,11 +8,11 @@ PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" PREFERRED_VERSION_glib-2.0 = "2.22.0" PREFERRED_VERSION_glib-2.0-native = "2.22.0" -PREFERRED_VERSION_glibmm = "2.18.0" +PREFERRED_VERSION_glibmm = "2.22.1" PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.18.0" -PREFERRED_VERSION_gtkmm = "2.14.1" +PREFERRED_VERSION_gtkmm = "2.18.1" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" |