Disabled local activities

5 files changed, 10 insertions, 186 deletions

diff --git a/activities/z_browse-146.1.xo b/activities/z_browse-146.1.xo
deleted file mode 100644
index 23a7584..0000000
--- a/activities/z_browse-146.1.xo
+++ /dev/null
diff --git a/examples/dextrose4-xo1.5.ini b/examples/dextrose4-xo1.5.ini
index 5805ed8..cd5702a 100644
--- a/examples/dextrose4-xo1.5.ini
+++ b/examples/dextrose4-xo1.5.ini
@@ -88,64 +88,20 @@ protected_activities=
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/DX/4
 
-[sugar_activities_extra]
-local_dir = activities
-
 [buildnr_from_file]
 path=latestbuild-xo1.5
 
 [custom_packages]
 add_packages=
-; '/etc/powerd/postresume.d/disable_mesh.sh' is no more required.
-; now, mesh is being disabled via kernel parameter.
-; see 'config/disable_mesh.sh' for details.
-;       dextrose-platform,
-; being replaced by sugar-client (alsroot's awesome work!)
-;       dextrose-updater,
-; remove ds-backup-client 
-;
-; now no more needed, via the fix to au#1563.
-;       sugar-client,
 ; FIXME: plugins not available for the XO-1.75
 ;       gstreamer-plugins-bad,
 ;       gstreamer-plugins-ugly,
 ;       gstreamer-ffmpeg,
-;        sugar-control-frame,
-;        sugar-control-accessibility,
-        hunspell-es,
-        hunspell-pt,
-        ipython,
-        liberation-mono-fonts,
-        liberation-serif-fonts,
-        liberation-sans-fonts,
-        telepathy-idle,
-        telepathy-sofiasip,
-        x11vnc,
-        httpd,
-; au#1588: need "openssl-devel" package, for "libcrypto.so".
-        openssl-devel,
-        mod_ssl,
-        
-; temporary workaround for yum pulling in the wrong versions of Sugar packages
-; first and disregarding the dependencies of the DX3 versions of Sugar.
-        python-xlib,
-        upower,
-; Wasn't being picked automatically unlike previous builds      
-        chkconfig,
-;       Not in dx4:
-;        sugar-hidden-network-connect,
-; sl#3285
-        rsyslog,
-        cronie,
-; sl#3336
-        ntp,
-        ntpdate,
 ; uy#1792: needed to register "Documents" (and other special) folders.
         xdg-user-dirs,
 ; Stats
          sugar-stats,
          sugar-client,
 ; #a11y , sugar-cp-accessibily has the neccessary packages in the Requires field
-          sugar-cp-accessibility
-
-
+         sugar-cp-accessibility
+~                                          
diff --git a/examples/dextrose4-xo1.75.ini b/examples/dextrose4-xo1.75.ini
index 9602960..8ac5ac2 100644
--- a/examples/dextrose4-xo1.75.ini
+++ b/examples/dextrose4-xo1.75.ini
@@ -87,63 +87,20 @@ protected_activities=
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/DX/4
 
-[sugar_activities_extra]
-local_dir = activities
-
 [buildnr_from_file]
 path=latestbuild-xo1.75
 
 [custom_packages]
 add_packages=
-; '/etc/powerd/postresume.d/disable_mesh.sh' is no more required.
-; now, mesh is being disabled via kernel parameter.
-; see 'config/disable_mesh.sh' for details.
-;       dextrose-platform,
-; being replaced by sugar-client (alsroot's awesome work!)
-;       dextrose-updater,
-; remove ds-backup-client 
-;
-; now no more needed, via the fix to au#1563.
-;       sugar-client,
 ; FIXME: plugins not available for the XO-1.75
 ;       gstreamer-plugins-bad,
 ;       gstreamer-plugins-ugly,
 ;       gstreamer-ffmpeg,
-;        sugar-control-frame,
-;        sugar-control-accessibility,
-        hunspell-es,
-        hunspell-pt,
-        ipython,
-        liberation-mono-fonts,
-        liberation-serif-fonts,
-        liberation-sans-fonts,
-        telepathy-idle,
-        telepathy-sofiasip,
-        x11vnc,
-        httpd,
-; au#1588: need "openssl-devel" package, for "libcrypto.so".
-        openssl-devel,
-        mod_ssl,
-
-; temporary workaround for yum pulling in the wrong versions of Sugar packages
-; first and disregarding the dependencies of the DX3 versions of Sugar.
-        python-xlib,
-        upower,
-; Wasn't being picked automatically unlike previous builds      
-        chkconfig,
-;       Not in dx4:
-;        sugar-hidden-network-connect,
-; sl#3285
-        rsyslog,
-        cronie,
-; sl#3336
-        ntp,
-        ntpdate,
 ; uy#1792: needed to register "Documents" (and other special) folders.
         xdg-user-dirs,
 ; Stats
          sugar-stats,
-         sugar-client,
+         sugar-client
 ; #a11y , sugar-cp-accessibily has the neccessary packages in the Requires field
-          sugar-cp-accessibility
-
+;         sugar-cp-accessibility
+~                                          
diff --git a/examples/dextrose4-xo1.ini b/examples/dextrose4-xo1.ini
index 2966dc5..98adf95 100644
--- a/examples/dextrose4-xo1.ini
+++ b/examples/dextrose4-xo1.ini
@@ -76,9 +76,6 @@ protected_activities=
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/DX/4Lite
 
-[sugar_activities_extra]
-local_dir = activities
-
 ; still too many open blockers for XO-1 idle suspend to work well
 [powerd]
 enable_idle_suspend=0
@@ -88,56 +85,14 @@ path=latestbuild-xo1
 
 [custom_packages]
 add_packages=
-; '/etc/powerd/postresume.d/disable_mesh.sh' is no more required.
-; now, mesh is being disabled via kernel parameter.
-; see 'config/disable_mesh.sh' for details.
-;       dextrose-platform,
-; being replaced by sugar-client (alsroot's awesome work!)
-;       dextrose-updater,
-; remove ds-backup-client 
-;
-; now no more needed, via the fix to au#1563.
-;       sugar-client,
 ; FIXME: plugins not available for the XO-1.75
 ;       gstreamer-plugins-bad,
 ;       gstreamer-plugins-ugly,
 ;       gstreamer-ffmpeg,
-;        sugar-control-frame,
-;        sugar-control-accessibility,
-        hunspell-es,
-        hunspell-pt,
-        ipython,
-        liberation-mono-fonts,
-        liberation-serif-fonts,
-        liberation-sans-fonts,
-        telepathy-idle,
-        telepathy-sofiasip,
-        x11vnc,
-        httpd,
-; au#1588: need "openssl-devel" package, for "libcrypto.so".
-        openssl-devel,
-        mod_ssl,
-
-; temporary workaround for yum pulling in the wrong versions of Sugar packages
-; first and disregarding the dependencies of the DX3 versions of Sugar.
-        python-xlib,
-        upower,
-; Wasn't being picked automatically unlike previous builds      
-        chkconfig,
-;       Not in dx4:
-;        sugar-hidden-network-connect,
-; sl#3285
-        rsyslog,
-        cronie,
-; sl#3336
-        ntp,
-        ntpdate,
 ; uy#1792: needed to register "Documents" (and other special) folders.
         xdg-user-dirs,
 ; Stats
          sugar-stats,
          sugar-client,
-; dx#2722 , vte3 is needed by Terminal and Pippy activities
-	 vte3,
 ; #a11y , sugar-cp-accessibily has the neccessary packages in the Requires field
-	 sugar-cp-accessibility,
+	 sugar-cp-accessibility
diff --git a/examples/dextrose4-xo4.ini b/examples/dextrose4-xo4.ini
index cee5f31..a5b994e 100644
--- a/examples/dextrose4-xo4.ini
+++ b/examples/dextrose4-xo4.ini
@@ -88,64 +88,20 @@ protected_activities=
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/DX/4
 
-
-[sugar_activities_extra]
-local_dir = activities
-
 [buildnr_from_file]
 path=latestbuild-xo4
 
 [custom_packages]
 add_packages=
-; '/etc/powerd/postresume.d/disable_mesh.sh' is no more required.
-; now, mesh is being disabled via kernel parameter.
-; see 'config/disable_mesh.sh' for details.
-;       dextrose-platform,
-; being replaced by sugar-client (alsroot's awesome work!)
-;       dextrose-updater,
-; remove ds-backup-client 
-;
-; now no more needed, via the fix to au#1563.
-;       sugar-client,
 ; FIXME: plugins not available for the XO-1.75
 ;       gstreamer-plugins-bad,
 ;       gstreamer-plugins-ugly,
 ;       gstreamer-ffmpeg,
-;        sugar-control-frame,
-;        sugar-control-accessibility,
-        hunspell-es,
-        hunspell-pt,
-        ipython,
-        liberation-mono-fonts,
-        liberation-serif-fonts,
-        liberation-sans-fonts,
-        telepathy-idle,
-        telepathy-sofiasip,
-        x11vnc,
-        httpd,
-; au#1588: need "openssl-devel" package, for "libcrypto.so".
-        openssl-devel,
-        mod_ssl,
-
-; temporary workaround for yum pulling in the wrong versions of Sugar packages
-; first and disregarding the dependencies of the DX3 versions of Sugar.
-        python-xlib,
-        upower,
-; Wasn't being picked automatically unlike previous builds      
-        chkconfig,
-;       Not in dx4:
-;        sugar-hidden-network-connect,
-; sl#3285
-        rsyslog,
-        cronie,
-; sl#3336
-        ntp,
-        ntpdate,
 ; uy#1792: needed to register "Documents" (and other special) folders.
         xdg-user-dirs,
 ; Stats
-        sugar-stats,
-        sugar-client,
+         sugar-stats,
+         sugar-client
 ; #a11y , sugar-cp-accessibily has the neccessary packages in the Requires field
-          sugar-cp-accessibility
-          
+;         sugar-cp-accessibility
+~