summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-01-26 11:14:35 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-28 16:49:12 (GMT)
commit1b26bce9675f1beb3d0370f49fc5ed9709c979f6 (patch)
tree7a24e783ae68cc1c26c0c8ba16c4e1e53af97ac7 /meta/recipes-sato
parent5612838d7e7f958633d211a186ab1cbab2803805 (diff)
downloadpoky-1b26bce9675f1beb3d0370f49fc5ed9709c979f6.tar.gz
matchbox: Convert all the matchbox components' repo from svn to git including:
matchbox-wm matchbox-panel-2 matchbox-terminal matchbox-config-gtk matchbox-stroke matchbox-desktop matchbox-keyboard matchbox-themes-extra libfakekey settings-daemon Also remove some old recipes. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb (renamed from meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb)8
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb (renamed from meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb)8
-rw-r--r--meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb (renamed from meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb)8
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb (renamed from meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb)8
-rw-r--r--meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb (renamed from meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb)8
-rw-r--r--meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb (renamed from meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb)6
-rw-r--r--meta/recipes-sato/settings-daemon/settings-daemon_git.bb (renamed from meta/recipes-sato/settings-daemon/settings-daemon_svn.bb)8
7 files changed, 27 insertions, 27 deletions
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
index fce21a3..9f4e4d3 100644
--- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb
+++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
9DEPENDS = "gconf gtk+" 9DEPENDS = "gconf gtk+"
10RDEPENDS_${PN} = "settings-daemon" 10RDEPENDS_${PN} = "settings-daemon"
11 11
12PV = "0.0+svnr${SRCPV}" 12PV = "0.0+git${SRCPV}"
13PR = "r1" 13PR = "r0"
14 14
15S = "${WORKDIR}/${PN}" 15S = "${WORKDIR}/git"
16 16
17SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 17SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
18 file://no-handed.patch;patch=1;pnum=0" 18 file://no-handed.patch;patch=1;pnum=0"
19 19
20inherit autotools pkgconfig 20inherit autotools pkgconfig
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
index bed82ac..09f7913 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
@@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
10 10
11DEPENDS = "gtk+ startup-notification dbus" 11DEPENDS = "gtk+ startup-notification dbus"
12SECTION = "x11/wm" 12SECTION = "x11/wm"
13PV = "2.0+svnr${SRCPV}" 13PV = "2.0+git${SRCPV}"
14PR = "r1" 14PR = "r0"
15 15
16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN}-2;proto=http \ 16SRC_URI = "git://git.pokylinux.org/${PN}-2;protocol=git \
17 file://dso_linking_change_build_fix.patch" 17 file://dso_linking_change_build_fix.patch"
18 18
19EXTRA_OECONF = "--enable-startup-notification --with-dbus" 19EXTRA_OECONF = "--enable-startup-notification --with-dbus"
20 20
21S = "${WORKDIR}/${PN}-2" 21S = "${WORKDIR}/git"
22 22
23inherit autotools pkgconfig 23inherit autotools pkgconfig
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index 380e5ba..245f999 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -10,15 +10,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
10DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" 10DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
11RDEPENDS_${PN} = "formfactor dbus-wait" 11RDEPENDS_${PN} = "formfactor dbus-wait"
12SECTION = "x11" 12SECTION = "x11"
13PV = "0.0+svnr${SRCPV}" 13PV = "0.0+git${SRCPV}"
14PR = "r5" 14PR = "r0"
15 15
16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 16SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
17 file://configure_fix.patch;patch=1;maxrev=1819 \ 17 file://configure_fix.patch;patch=1;maxrev=1819 \
18 file://single-instance.patch;patch=1 \ 18 file://single-instance.patch;patch=1 \
19 file://80matchboxkeyboard.shbg" 19 file://80matchboxkeyboard.shbg"
20 20
21S = "${WORKDIR}/${PN}" 21S = "${WORKDIR}/git"
22 22
23inherit autotools pkgconfig gettext 23inherit autotools pkgconfig gettext
24 24
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index d76fc09..256b5a2 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -12,21 +12,21 @@ DEPENDS = "gtk+ startup-notification dbus dbus-glib"
12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" 12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
13DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" 13DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
14 14
15PV = "0.0+svnr${SRCPV}" 15PV = "0.0+git${SRCPV}"
16PR = "r7" 16PR = "r0"
17 17
18RPROVIDES_${PN} = "matchbox-panel" 18RPROVIDES_${PN} = "matchbox-panel"
19RREPLACES_${PN} = "matchbox-panel" 19RREPLACES_${PN} = "matchbox-panel"
20RCONFLICTS_${PN} = "matchbox-panel" 20RCONFLICTS_${PN} = "matchbox-panel"
21 21
22SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 22SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
23 file://startup_fix.diff;patch=1" 23 file://startup_fix.diff;patch=1"
24 24
25EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 25EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
26EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" 26EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
27EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" 27EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}"
28 28
29S = "${WORKDIR}/${PN}" 29S = "${WORKDIR}/git"
30 30
31FILES_${PN} += "${libdir}/matchbox-panel/*.so \ 31FILES_${PN} += "${libdir}/matchbox-panel/*.so \
32 ${datadir}/matchbox-panel/brightness/*.png \ 32 ${datadir}/matchbox-panel/brightness/*.png \
diff --git a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
index de675c2..8077a56 100644
--- a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb
+++ b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
@@ -7,15 +7,15 @@ LIC_FILES_CHKSUM = "file://src/matchbox-stroke.h;endline=12;md5=8ed5c5bbec2321fb
7 7
8DEPENDS = "libfakekey expat libxft" 8DEPENDS = "libfakekey expat libxft"
9SECTION = "x11/wm" 9SECTION = "x11/wm"
10PV = "0.0+svnr${SRCPV}" 10PV = "0.0+git${SRCPV}"
11PR = "r1" 11PR = "r0"
12 12
13SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 13SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
14 file://single-instance.patch;patch=1 \ 14 file://single-instance.patch;patch=1 \
15 file://configure_fix.patch;patch=1;maxrev=1819 \ 15 file://configure_fix.patch;patch=1;maxrev=1819 \
16 file://dso_linking_change_build_fix.patch " 16 file://dso_linking_change_build_fix.patch "
17 17
18S = "${WORKDIR}/${PN}" 18S = "${WORKDIR}/git"
19 19
20inherit autotools pkgconfig gettext 20inherit autotools pkgconfig gettext
21 21
diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
index f06d80c..c26c338 100644
--- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb
+++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
8 8
9DEPENDS = "gtk+ vte" 9DEPENDS = "gtk+ vte"
10SECTION = "x11/utils" 10SECTION = "x11/utils"
11PV = "0.0+svnr${SRCPV}" 11PV = "0.0+git${SRCPV}"
12PR = "r0" 12PR = "r0"
13 13
14SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" 14SRC_URI = "git://git.pokylinux.org/${PN};protocol=git"
15 15
16S = "${WORKDIR}/${PN}" 16S = "${WORKDIR}/git"
17 17
18inherit autotools pkgconfig 18inherit autotools pkgconfig
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
index 4f798b8..f7dc86f 100644
--- a/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb
+++ b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
@@ -6,16 +6,16 @@ LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc
6 file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" 6 file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
7DEPENDS = "gconf glib-2.0 gtk+" 7DEPENDS = "gconf glib-2.0 gtk+"
8SECTION = "x11" 8SECTION = "x11"
9PV = "0.0+svnr${SRCPV}" 9PV = "0.0+git${SRCPV}"
10 10
11PR = "r4" 11PR = "r0"
12 12
13SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 13SRC_URI = "git://git.pokylinux.org/xsettings-daemon;protocol=git \
14 file://addsoundkeys.patch;apply=yes \ 14 file://addsoundkeys.patch;apply=yes \
15 file://70settings-daemon.sh \ 15 file://70settings-daemon.sh \
16 file://dso_linking_change_build_fix.patch" 16 file://dso_linking_change_build_fix.patch"
17 17
18S = "${WORKDIR}/${PN}" 18S = "${WORKDIR}/git"
19 19
20inherit autotools pkgconfig gconf 20inherit autotools pkgconfig gconf
21 21