Rebase patches wrt each other

3 files changed, 23 insertions, 439 deletions

diff --git a/rpms/sugar/accessibility_0001_cp_accessibility_keyboard.patch b/rpms/sugar/accessibility_0001_cp_accessibility_keyboard.patch
index dd02687..2b009f5 100644
--- a/rpms/sugar/accessibility_0001_cp_accessibility_keyboard.patch
+++ b/rpms/sugar/accessibility_0001_cp_accessibility_keyboard.patch
@@ -186,433 +186,6 @@ diff -u -r -N sugar-0.88.1.original/extensions/cpsection/accessibility/Makefile.
 +	__init__.py	\
 +	model.py	\
 +	view.py		
-diff -u -r -N sugar-0.88.1.original/extensions/cpsection/accessibility/Makefile.in sugar-0.88.1/extensions/cpsection/accessibility/Makefile.in
---- sugar-0.88.1.original/extensions/cpsection/accessibility/Makefile.in	1969-12-31 21:00:00.000000000 -0300
-+++ sugar-0.88.1/extensions/cpsection/accessibility/Makefile.in	2010-07-27 11:45:05.237504112 -0300
-@@ -0,0 +1,423 @@
-+# Makefile.in generated by automake 1.11 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+subdir = extensions/cpsection/accessibility
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+	$(sugar_PYTHON)
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+  for p in $$list; do echo "$$p $$p"; done | \
-+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+    if (++n[$$2] == $(am__install_max)) \
-+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+    END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+am__installdirs = "$(DESTDIR)$(sugardir)"
-+py_compile = $(top_srcdir)/py-compile
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+ALL_LINGUAS = @ALL_LINGUAS@
-+AMTAR = @AMTAR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CATALOGS = @CATALOGS@
-+CATOBJEXT = @CATOBJEXT@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DATADIRNAME = @DATADIRNAME@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+GCONFTOOL = @GCONFTOOL@
-+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GMOFILES = @GMOFILES@
-+GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+INSTOBJEXT = @INSTOBJEXT@
-+INTLLIBS = @INTLLIBS@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+INTLTOOL_MERGE = @INTLTOOL_MERGE@
-+INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MSGFMT = @MSGFMT@
-+MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PKG_CONFIG = @PKG_CONFIG@
-+POFILES = @POFILES@
-+POSUB = @POSUB@
-+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-+PYTHON = @PYTHON@
-+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-+PYTHON_PLATFORM = @PYTHON_PLATFORM@
-+PYTHON_PREFIX = @PYTHON_PREFIX@
-+PYTHON_VERSION = @PYTHON_VERSION@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SHELL_CFLAGS = @SHELL_CFLAGS@
-+SHELL_LIBS = @SHELL_LIBS@
-+STRIP = @STRIP@
-+SUCROSE_VERSION = @SUCROSE_VERSION@
-+USE_NLS = @USE_NLS@
-+VERSION = @VERSION@
-+XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build_alias = @build_alias@
-+builddir = @builddir@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host_alias = @host_alias@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+pkgpyexecdir = @pkgpyexecdir@
-+pkgpythondir = @pkgpythondir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+pyexecdir = @pyexecdir@
-+pythondir = @pythondir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+sugardir = $(pkgdatadir)/extensions/cpsection/accessibility
-+sugar_PYTHON = \
-+	__init__.py	\
-+	model.py	\
-+	view.py		
-+
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/cpsection/accessibility/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign extensions/cpsection/accessibility/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+install-sugarPYTHON: $(sugar_PYTHON)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(sugardir)" || $(MKDIR_P) "$(DESTDIR)$(sugardir)"
-+	@list='$(sugar_PYTHON)'; dlist=; list2=; test -n "$(sugardir)" || list=; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
-+	  if test -f $$b$$p; then \
-+	    $(am__strip_dir) \
-+	    dlist="$$dlist $$f"; \
-+	    list2="$$list2 $$b$$p"; \
-+	  else :; fi; \
-+	done; \
-+	for file in $$list2; do echo $$file; done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sugardir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sugardir)" || exit $$?; \
-+	done || exit $$?; \
-+	if test -n "$$dlist"; then \
-+	  if test -z "$(DESTDIR)"; then \
-+	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(sugardir)" $$dlist; \
-+	  else \
-+	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(sugardir)" $$dlist; \
-+	  fi; \
-+	else :; fi
-+
-+uninstall-sugarPYTHON:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(sugar_PYTHON)'; test -n "$(sugardir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	test -n "$$files" || exit 0; \
-+	filesc=`echo "$$files" | sed 's|$$|c|'`; \
-+	fileso=`echo "$$files" | sed 's|$$|o|'`; \
-+	echo " ( cd '$(DESTDIR)$(sugardir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(sugardir)" && rm -f $$files || exit $$?; \
-+	echo " ( cd '$(DESTDIR)$(sugardir)' && rm -f" $$filesc ")"; \
-+	cd "$(DESTDIR)$(sugardir)" && rm -f $$filesc || exit $$?; \
-+	echo " ( cd '$(DESTDIR)$(sugardir)' && rm -f" $$fileso ")"; \
-+	cd "$(DESTDIR)$(sugardir)" && rm -f $$fileso
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+	for dir in "$(DESTDIR)$(sugardir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-sugarPYTHON
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-sugarPYTHON
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
-+	install-strip install-sugarPYTHON installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-+	uninstall-am uninstall-sugarPYTHON
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
 diff -u -r -N sugar-0.88.1.original/extensions/cpsection/accessibility/model.py sugar-0.88.1/extensions/cpsection/accessibility/model.py
 --- sugar-0.88.1.original/extensions/cpsection/accessibility/model.py	1969-12-31 21:00:00.000000000 -0300
 +++ sugar-0.88.1/extensions/cpsection/accessibility/model.py	2010-07-27 11:45:05.237504112 -0300
@@ -793,14 +366,25 @@ diff -u -r -N sugar-0.88.1.original/extensions/cpsection/accessibility/view.py s
 diff -u -r -N sugar-0.88.1.original/extensions/cpsection/Makefile.am sugar-0.88.1/extensions/cpsection/Makefile.am
 --- sugar-0.88.1.original/extensions/cpsection/Makefile.am	2010-07-27 10:55:39.738753911 -0300
 +++ sugar-0.88.1/extensions/cpsection/Makefile.am	2010-07-27 11:46:37.115753833 -0300
-@@ -1,6 +1,7 @@
- SUBDIRS = \
- 	aboutme \
- 	aboutcomputer \
+@@ -1,5 +1,16 @@
+-SUBDIRS = aboutme aboutcomputer datetime frame keyboard language \
+-    modemconfiguration network power updater
++SUBDIRS = \
++	aboutme \
++	aboutcomputer \
 +	accessibility \
- 	datetime \
- 	frame \
- 	keyboard \
++	datetime \
++	frame \
++	keyboard \
++	language \
++	modemconfiguration \
++	network \
++	power \
++	updater \
++	#
+ 
+ sugardir = $(pkgdatadir)/extensions/cpsection
+ sugar_PYTHON = __init__.py
 diff -u -r -N sugar-0.88.1.original/src/jarabe/model/accessibility.py sugar-0.88.1/src/jarabe/model/accessibility.py
 --- sugar-0.88.1.original/src/jarabe/model/accessibility.py	1969-12-31 21:00:00.000000000 -0300
 +++ sugar-0.88.1/src/jarabe/model/accessibility.py	2010-07-27 11:45:05.238503821 -0300
diff --git a/rpms/sugar/accessibility_0006_virtualkeyboard.patch b/rpms/sugar/accessibility_0006_virtualkeyboard.patch
index 3ab0d82..51c4d69 100644
--- a/rpms/sugar/accessibility_0006_virtualkeyboard.patch
+++ b/rpms/sugar/accessibility_0006_virtualkeyboard.patch
@@ -11,13 +11,12 @@ diff -u -r -N sugar-0.88.1.sin_6/bin/sugar.in sugar-0.88.1/bin/sugar.in
 diff -u -r -N sugar-0.88.1.sin_6/extensions/deviceicon/Makefile.am sugar-0.88.1/extensions/deviceicon/Makefile.am
 --- sugar-0.88.1.sin_6/extensions/deviceicon/Makefile.am	2010-07-27 10:55:49.057527000 -0300
 +++ sugar-0.88.1/extensions/deviceicon/Makefile.am	2010-07-27 11:59:45.770753790 -0300
-@@ -5,5 +5,6 @@
- 	network.py	\
+@@ -5,4 +5,5 @@
+	resources.py	\
  	speaker.py	\
 	touchpad.py	\
 +	virtualkeyboard.py	\
- 	volume.py	\
- 	resources.py
+ 	volume.py
 diff -u -r -N sugar-0.88.1.sin_6/extensions/deviceicon/virtualkeyboard.py sugar-0.88.1/extensions/deviceicon/virtualkeyboard.py
 --- sugar-0.88.1.sin_6/extensions/deviceicon/virtualkeyboard.py	1969-12-31 21:00:00.000000000 -0300
 +++ sugar-0.88.1/extensions/deviceicon/virtualkeyboard.py	2010-07-27 12:10:36.323753898 -0300
diff --git a/rpms/sugar/cpu-and-memory-resource-indicator.patch b/rpms/sugar/cpu-and-memory-resource-indicator.patch
index 5450644..69f8a03 100644
--- a/rpms/sugar/cpu-and-memory-resource-indicator.patch
+++ b/rpms/sugar/cpu-and-memory-resource-indicator.patch
@@ -24,12 +24,13 @@ diff --git a/extensions/deviceicon/Makefile.am b/extensions/deviceicon/Makefile.
 index 8a2e765..eff368d 100644
 --- a/extensions/deviceicon/Makefile.am
 +++ b/extensions/deviceicon/Makefile.am
-@@ -4,5 +4,6 @@ sugar_PYTHON = 		\
+@@ -4,6 +4,7 @@ sugar_PYTHON = 		\
  	__init__.py	\
  	battery.py	\
  	network.py	\
 +	resources.py	\
  	speaker.py	\
+	touchpad.py	\
  	volume.py
 diff --git a/extensions/deviceicon/resources.py b/extensions/deviceicon/resources.py
 new file mode 100644