Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-11-17 22:39:05 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-11-17 22:39:05 (GMT)
commit059e15d49b4e1afbe407daf104a8116ac2ec348b (patch)
tree4fc25c46e18e2dba83701778edf99c7f7093752b /config
parente51677b9cf1f3b1d1faa09774c90de8b56350a97 (diff)
Add sugar-docs to the build
Diffstat (limited to 'config')
-rw-r--r--config/deps/sugar-buildtime-3.4.json2
-rw-r--r--config/deps/sugar-buildtime-3.6.json2
-rw-r--r--config/modules/sugar.json5
-rw-r--r--config/packages/deps-3.4.json50
-rw-r--r--config/packages/deps-3.6.json85
5 files changed, 14 insertions, 130 deletions
diff --git a/config/deps/sugar-buildtime-3.4.json b/config/deps/sugar-buildtime-3.4.json
index 4362766..4f470dd 100644
--- a/config/deps/sugar-buildtime-3.4.json
+++ b/config/deps/sugar-buildtime-3.4.json
@@ -2,6 +2,8 @@
"checker": "binary" },
{ "check": "autoreconf",
"checker": "binary" },
+ { "check": "sphinx-build",
+ "checker": "binary" },
{ "check": "xrdb",
"checker": "binary" },
{ "check": "aclocal",
diff --git a/config/deps/sugar-buildtime-3.6.json b/config/deps/sugar-buildtime-3.6.json
index cbe41b9..fc8d5cd 100644
--- a/config/deps/sugar-buildtime-3.6.json
+++ b/config/deps/sugar-buildtime-3.6.json
@@ -1,5 +1,7 @@
[{ "check": "gcc",
"checker": "binary" },
+ { "check": "sphinx-build",
+ "checker": "binary" },
{ "check": "autoreconf",
"checker": "binary" },
{ "check": "xrdb",
diff --git a/config/modules/sugar.json b/config/modules/sugar.json
index bc96cac..13438f9 100644
--- a/config/modules/sugar.json
+++ b/config/modules/sugar.json
@@ -1,4 +1,7 @@
-[{ "name": "sugar-base",
+[{ "name": "sugar-docs",
+ "repo": "git://git.sugarlabs.org/sugar-docs/sugar-docs.git",
+ "out-of-source": false },
+ { "name": "sugar-base",
"repo": "git://git.sugarlabs.org/sugar-base/mainline.git" },
{ "name": "sugar-toolkit",
"repo": "git://git.sugarlabs.org/sugar-toolkit/mainline.git" },
diff --git a/config/packages/deps-3.4.json b/config/packages/deps-3.4.json
index 9ffabd8..e202386 100644
--- a/config/packages/deps-3.4.json
+++ b/config/packages/deps-3.4.json
@@ -1,53 +1,9 @@
{ "Xvfb":
{ "fedora": "xorg-x11-server-Xvfb",
"ubuntu": "xvfb" },
- "base-system":
- { "fedora": ["kernel",
- "kernel-PAE",
- "kernel-modules-extra",
- "yum",
- "NetworkManager",
- "make",
- "git",
- "sudo",
- "xorg-x11-drv-ati",
- "xorg-x11-drv-evdev",
- "xorg-x11-drv-fbdev",
- "xorg-x11-drv-geode",
- "xorg-x11-drv-intel",
- "xorg-x11-drv-mga",
- "xorg-x11-drv-modesetting",
- "xorg-x11-drv-nouveau",
- "xorg-x11-drv-openchrome",
- "xorg-x11-drv-qxl",
- "xorg-x11-drv-synaptics",
- "xorg-x11-drv-vesa",
- "xorg-x11-drv-vmmouse",
- "xorg-x11-drv-vmware",
- "xorg-x11-drv-wacom",
- "xorg-x11-server-Xorg",
- "grub2",
- "setserial",
- "rootfiles",
- "e2fsprogs",
- "openssh-server",
- "mingetty",
- "hostname",
- "system-config-firewall-base",
- "lvm2",
- "passwd",
- "acl",
- "plymouth-scripts",
- "policycoreutils",
- "selinux-policy-targeted",
- "parted",
- "sendmail",
- "biosdevname",
- "cronie",
- "audit",
- "attr",
- "gpg-pubkey"],
- "ubuntu": [] },
+ "sphinx-build":
+ { "fedora": "python-sphinx",
+ "ubuntu": "python-sphinx" },
"xinit":
{ "fedora": "xorg-x11-xinit",
"ubuntu": "xinit" },
diff --git a/config/packages/deps-3.6.json b/config/packages/deps-3.6.json
index f52a5e8..a1a27dc 100644
--- a/config/packages/deps-3.6.json
+++ b/config/packages/deps-3.6.json
@@ -1,88 +1,9 @@
{ "Xvfb":
{ "fedora": "xorg-x11-server-Xvfb",
"ubuntu": "xvfb" },
- "base-system":
- { "fedora": ["kernel",
- "kernel-PAE",
- "kernel-modules-extra",
- "yum",
- "NetworkManager",
- "make",
- "git",
- "sudo",
- "xorg-x11-drv-ati",
- "xorg-x11-drv-evdev",
- "xorg-x11-drv-fbdev",
- "xorg-x11-drv-geode",
- "xorg-x11-drv-intel",
- "xorg-x11-drv-mga",
- "xorg-x11-drv-modesetting",
- "xorg-x11-drv-nouveau",
- "xorg-x11-drv-openchrome",
- "xorg-x11-drv-qxl",
- "xorg-x11-drv-synaptics",
- "xorg-x11-drv-vesa",
- "xorg-x11-drv-vmmouse",
- "xorg-x11-drv-vmware",
- "xorg-x11-drv-wacom",
- "xorg-x11-server-Xorg",
- "grub2",
- "setserial",
- "e2fsprogs",
- "openssh-server",
- "mingetty",
- "hostname",
- "system-config-firewall-base",
- "lvm2",
- "passwd",
- "acl",
- "plymouth-scripts",
- "policycoreutils",
- "selinux-policy-targeted",
- "parted",
- "sendmail",
- "biosdevname",
- "cronie",
- "audit",
- "attr",
- "gpg-pubkey"],
- "ubuntu": ["apt",
- "make",
- "apparmor",
- "apt-transport-https",
- "apt-utils",
- "apt-xapian-index",
- "aptdaemon",
- "at",
- "base-files",
- "biosdevname",
- "buildbot",
- "buildbot-slave",
- "dash",
- "e2fslibs",
- "e2fsprogs",
- "fakeroot",
- "grub-pc",
- "gzip",
- "hostname",
- "krb5-locales",
- "language-pack-en",
- "language-pack-en-base",
- "linux-generic",
- "linux-headers-generic",
- "linux-image-generic",
- "login",
- "logrotate",
- "network-manager",
- "plymouth-theme-ubuntu-text",
- "ubuntu-minimal",
- "ubuntu-standard",
- "git",
- "dash",
- "bash",
- "diffutils",
- "grep",
- "ncurses-base"] },
+ "sphinx-build",
+ { "fedora": "python-sphinx",
+ "ubuntu": "python-sphinx" },
"xinit":
{ "fedora": "xorg-x11-xinit",
"ubuntu": "xinit" },