Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Silva <sebastian@somosazucar.org>2013-07-26 20:58:13 (GMT)
committer Sebastian Silva <sebastian@somosazucar.org>2013-07-26 20:58:13 (GMT)
commit398812ea78ef7dd608fcaf93240c013ae6b4fd1a (patch)
tree977d04bd607550be4162f6224cc8b92717483208
parent40cb047caac9ed917e1284d21230e7a6d35b60ab (diff)
Modifications for testing branch
-rw-r--r--Makefile4
-rw-r--r--etc/sweets.conf2
-rw-r--r--image/common.ini4
-rw-r--r--image/latestbuild2
4 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 9421dd5..aa8cb8f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-VERSION = $(shell grep "^Version:" deployment.spec | sed 's/^Version: *//')
+VERSION = $(shell grep "^Version:" deployment-testing.spec | sed 's/^Version: *//')
all:
dist:
- git archive --prefix=deployment-$(VERSION)/ HEAD | gzip > deployment-$(VERSION).tar.gz
+ git archive --prefix=deployment-testing-$(VERSION)/ HEAD | gzip > deployment-testing-$(VERSION).tar.gz
.PHONY: dist
diff --git a/etc/sweets.conf b/etc/sweets.conf
index a670b83..ddb39eb 100644
--- a/etc/sweets.conf
+++ b/etc/sweets.conf
@@ -1,6 +1,6 @@
[shell]
# space separated list of plugins to enable
-plugins = telepathy proxy sn stats
+plugins = telepathy proxy sn
[blacklist]
# Uncomment it to hide "Plugins" Control Panel section to
diff --git a/image/common.ini b/image/common.ini
index 6ac405f..cf697ad 100644
--- a/image/common.ini
+++ b/image/common.ini
@@ -51,7 +51,7 @@ path = latestbuild
# This repository will be used to install packages during image building,
# and, for post-image system upgrades. Repository should be in form of:
# <OBS_PROJECT>::<OBS_REPOSITORY>
-deployment_repository = Hexoquinasa:1/SweetsDistribution_0.94_SugarNetwork_Fedora-14
+deployment_repository = Hexoquinasa:1/Fedora-14
# List of bundle_ids (or Context GUIDs in Sugar Network terms) of activities
# to prefetch to the final image to make them accessible in offline right after
@@ -111,7 +111,7 @@ add_packages =
# Deployment package which fetches all required dependencies and contains
# proper configuration. Post-image support will happen by updating
# `deployment.rpm` and spreading it via Sugar Network nodes.
- deployment,
+ deployment-testing,
sugar-plugin-stats,
sugar-stats,
# Useful packages from rpmfusion repository.
diff --git a/image/latestbuild b/image/latestbuild
index 6d58c4e..9d07aa0 100644
--- a/image/latestbuild
+++ b/image/latestbuild
@@ -1 +1 @@
-109 \ No newline at end of file
+111 \ No newline at end of file