diff options
-rw-r--r-- | meta-moblin/conf/distro/include/moblin-fixed-revisions.inc | 1 | ||||
-rw-r--r-- | meta-moblin/conf/distro/include/moblin-floating-revisions.inc | 1 | ||||
-rw-r--r-- | meta-moblin/packages/libjana/libjana_git.bb (renamed from meta-moblin/packages/libjana/libjana_svn.bb) | 11 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-fixed-revisions.inc | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-floating-revisions.inc | 5 |
5 files changed, 10 insertions, 10 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc index 0fbba06fa0..78e5b7c54b 100644 --- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc | |||
@@ -65,6 +65,7 @@ SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878" | |||
65 | SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a" | 65 | SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a" |
66 | SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495" | 66 | SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495" |
67 | SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" | 67 | SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" |
68 | SRCREV_pn-libjana ?= "9ec1da8a534e87a83a6d729b48a41ca7b9cfb7b7" | ||
68 | SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47" | 69 | SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47" |
69 | SRCREV_pn-libsocialweb ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5" | 70 | SRCREV_pn-libsocialweb ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5" |
70 | SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" | 71 | SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" |
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc index a20942f3be..8e63005a8c 100644 --- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc | |||
@@ -32,6 +32,7 @@ SRCREV_pn-hornsey ?= "${AUTOREV}" | |||
32 | PREFERRED_VERSION_hornsey ?= "1.0+git%" | 32 | PREFERRED_VERSION_hornsey ?= "1.0+git%" |
33 | SRCREV_pn-json-glib ?= "${AUTOREV}" | 33 | SRCREV_pn-json-glib ?= "${AUTOREV}" |
34 | SRCREV_pn-libccss ?= "${AUTOREV}" | 34 | SRCREV_pn-libccss ?= "${AUTOREV}" |
35 | SRCREV_pn-libjana ?= "${AUTOREV}" | ||
35 | SRCREV_pn-librest ?= "${AUTOREV}" | 36 | SRCREV_pn-librest ?= "${AUTOREV}" |
36 | SRCREV_pn-libsocialweb ?= "${AUTOREV}" | 37 | SRCREV_pn-libsocialweb ?= "${AUTOREV}" |
37 | PREFERRED_VERSION_libsocialweb ?= "0.0+git%" | 38 | PREFERRED_VERSION_libsocialweb ?= "0.0+git%" |
diff --git a/meta-moblin/packages/libjana/libjana_svn.bb b/meta-moblin/packages/libjana/libjana_git.bb index 49692b7465..976e9adab3 100644 --- a/meta-moblin/packages/libjana/libjana_svn.bb +++ b/meta-moblin/packages/libjana/libjana_git.bb | |||
@@ -1,13 +1,12 @@ | |||
1 | DESCRIPTION = "O-Hand Jana Library" | 1 | DESCRIPTION = "O-Hand Jana Library" |
2 | DEPENDS = "libmokojournal2" | 2 | DEPENDS = "gtk+ eds-dbus gconf" |
3 | DEPENDS = "gtk+ eds-dbus gconf" | 3 | PV = "0.4.4+git${SRCPV}" |
4 | PV = "0.1.0+svnr${SRCREV}" | 4 | PR = "r0" |
5 | PR = "r5" | ||
6 | 5 | ||
7 | inherit autotools_stage pkgconfig lib_package | 6 | inherit autotools_stage pkgconfig lib_package |
8 | 7 | ||
9 | SRC_URI = "svn://svn.gnome.org/svn/jana/;module=trunk;proto=http" | 8 | SRC_URI = "git://git.gnome.org/jana;protocol=git" |
10 | S = "${WORKDIR}/trunk/" | 9 | S = "${WORKDIR}/git/" |
11 | 10 | ||
12 | EXTRA_OECONF = "--enable-examples " | 11 | EXTRA_OECONF = "--enable-examples " |
13 | 12 | ||
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index 9477c3bcfb..b964020384 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc | |||
@@ -124,7 +124,6 @@ SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25" | |||
124 | SRCREV_pn-dfu-util-native ?= "3139" | 124 | SRCREV_pn-dfu-util-native ?= "3139" |
125 | SRCREV_pn-dfu-util ?= "3139" | 125 | SRCREV_pn-dfu-util ?= "3139" |
126 | SRCREV_pn-libgsmd ?= "4335" | 126 | SRCREV_pn-libgsmd ?= "4335" |
127 | SRCREV_pn-libjana ?= "749" | ||
128 | SRCREV_pn-libmokogsmd2 ?= "4334" | 127 | SRCREV_pn-libmokogsmd2 ?= "4334" |
129 | SRCREV_pn-libmokojournal2 ?= "3473" | 128 | SRCREV_pn-libmokojournal2 ?= "3473" |
130 | SRCREV_pn-libmokopanelui2 ?= "3349" | 129 | SRCREV_pn-libmokopanelui2 ?= "3349" |
@@ -250,6 +249,7 @@ SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878" | |||
250 | SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a" | 249 | SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a" |
251 | SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495" | 250 | SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495" |
252 | SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" | 251 | SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" |
252 | SRCREV_pn-libjana ?= "9ec1da8a534e87a83a6d729b48a41ca7b9cfb7b7" | ||
253 | SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47" | 253 | SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47" |
254 | SRCREV_pn-libsocialweb ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5" | 254 | SRCREV_pn-libsocialweb ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5" |
255 | SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" | 255 | SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" |
diff --git a/meta/conf/distro/include/poky-floating-revisions.inc b/meta/conf/distro/include/poky-floating-revisions.inc index 5037265465..22b4c38e5b 100644 --- a/meta/conf/distro/include/poky-floating-revisions.inc +++ b/meta/conf/distro/include/poky-floating-revisions.inc | |||
@@ -55,9 +55,8 @@ SRCREV_pn-clutter-cairo ?= "${AUTOREV}" | |||
55 | SRCREV_pn-table ?= "${AUTOREV}" | 55 | SRCREV_pn-table ?= "${AUTOREV}" |
56 | SRCREV_pn-libmatchbox ?= "${AUTOREV}" | 56 | SRCREV_pn-libmatchbox ?= "${AUTOREV}" |
57 | SRCREV_pn-tasks ?= "${AUTOREV}" | 57 | SRCREV_pn-tasks ?= "${AUTOREV}" |
58 | SRCREV_pn-libjana = "${AUTOREV}" | 58 | SRCREV_pn-mutter ?= "${AUTOREV}" |
59 | SRCREV_pn-mutter = "${AUTOREV}" | 59 | SRCREV_pn-ofono ?= "${AUTOREV}" |
60 | SRCREV_pn-ofono = "${AUTOREV}" | ||
61 | 60 | ||
62 | SRCREV_pn-dri2proto = "${AUTOREV}" | 61 | SRCREV_pn-dri2proto = "${AUTOREV}" |
63 | #PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}" | 62 | #PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}" |