Merge gitorious@git.sugarlabs.org:opensuse/mainline

9 files changed, 0 insertions, 552 deletions

diff --git a/0.84/sucrose/sugar-presence-service/sugar-presence-service.changes.nubae b/0.84/sucrose/sugar-presence-service/SPECS/sugar-presence-service.changes
index 940e540..940e540 100644
--- a/0.84/sucrose/sugar-presence-service/sugar-presence-service.changes.nubae
+++ b/0.84/sucrose/sugar-presence-service/SPECS/sugar-presence-service.changes
diff --git a/0.84/sucrose/sugar-presence-service/sugar-presence-service.spec.nubae b/0.84/sucrose/sugar-presence-service/sugar-presence-service.spec.nubae
deleted file mode 100644
index 68d9c8d..0000000
--- a/0.84/sucrose/sugar-presence-service/sugar-presence-service.spec.nubae
+++ /dev/null
@@ -1,45 +0,0 @@
-Name:          sugar-presence-service
-Summary:       Sugar presence service
-Version:       0.84.0
-Release:       1
-Group:         System Environment/Libraries
-License:       GPLv2+
-Url:           http://dev.laptop.org/
-Source0:       http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 
-BuildArch:     noarch
-BuildRequires: python fdupes
-Requires:      python-telepathy >= 0.14.0
-Requires:      dbus-1-python 
-Requires:      telepathy-gabble
-Requires:      telepathy-salut
-Requires:      sugar
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-The Sugar presence service.
-
-%prep
-%setup -q
-
-%build
-%configure --disable-static
-%__make %{?jobs:-j%jobs}
-
-%install
-%makeinstall 
-%fdupes $RPM_BUILD_ROOT
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING
-%{_bindir}/sugar-presence-service
-%dir %{_datadir}/dbus-1
-%dir %{_datadir}/dbus-1/services
-%{_datadir}/sugar-presence-service
-%attr(755,root,root) %{_datadir}/sugar-presence-service/main.py
-%{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
-
-%changelog
diff --git a/0.84/sugar-artwork/SPECS/sugar-artwork.spec b/0.84/sugar-artwork/SPECS/sugar-artwork.spec
deleted file mode 100644
index aeb7d73..0000000
--- a/0.84/sugar-artwork/SPECS/sugar-artwork.spec
+++ /dev/null
@@ -1,76 +0,0 @@
-# NOTE: Do not edit, file was generated by jhconvert
-
-Name: sugar-artwork
-Version: 0.84.1
-Release: 1
-Summary: Artwork for Sugar look-and-feel
-License: LGPLv2+
-Group: User Interface/Desktops
-Url: http://sugarlabs.org/
-
-Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-artwork/sugar-artwork-0.84.1.tar.bz2
-
-Requires: gtk2 >= 2.9.0
-Requires: sugar-base >= 0.84.1
-
-BuildRequires: perl-XML-Parser  
-BuildRequires: gtk2-devel >= 2.9.0
-BuildRequires: icon-naming-utils  
-BuildRequires: icon-slicer  
-BuildRequires: python  
-BuildRequires: xorg-x11  
-BuildRequires: fdupes
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-Contains the themes and icons that make up the Sugar default look and feel.
-
-%prep
-%setup -q -n sugar-artwork-0.84.1
-
-
-# eliminate %%configure's "clever" behaviour
-%define __libtoolize true
-
-%build
-%configure 
-make 
-
-%install
-rm -rf %{buildroot}
-make  \
-	DESTDIR=%{buildroot} \
-	install
-%fdupes -s %{buildroot}
-
-
-%clean
-rm -rf %{buildroot}
-
-%post
-touch --no-create %{_datadir}/icons/sugar || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/sugar || :
-
-%postun
-touch --no-create %{_datadir}/icons/sugar || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/sugar || :
-
-%files 
-%defattr(-,root,root,-)
-%_datadir/icons/*
-%_datadir/themes/*
-%_libdir/gtk*/*/engines/*
-%doc COPYING NEWS README
-
-%changelog
-* Thu Apr 23 2009 alsroot@member.fsf.org
-- Switch to jhconvert
-* Sat Mar  7 2009 lars@linux-schulserver.de
-- use fdupes
-* Fri Mar  6 2009 cyberorg@opensuse.org
-- Update to 0.84.0
-* Fri Jan 16 2009 cyberorg@opensuse.org
-- Update to 0.83.2
-* Wed Aug 27 2008 cyberorg@opensuse.org
-- Initial openSUSE package
diff --git a/0.84/sugar-base/SPECS/sugar-base.spec b/0.84/sugar-base/SPECS/sugar-base.spec
deleted file mode 100644
index d9dabd4..0000000
--- a/0.84/sugar-base/SPECS/sugar-base.spec
+++ /dev/null
@@ -1,69 +0,0 @@
-# NOTE: Do not edit, file was generated by jhconvert
-
-Name: sugar-base
-Version: 0.84.1
-Release: 1
-Summary: Base Sugar library
-License: LGPLv2
-Group: System Environment/Libraries
-Url: http://sugarlabs.org/
-
-Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/sugar-base-0.84.1.tar.bz2
-
-Requires: dbus-1-python  
-Requires: python-gnome  
-Requires: python-gobject2 >= 2.15
-Requires: python-gtk  
-Requires: python  
-
-BuildRequires: perl-XML-Parser  
-BuildRequires: gettext  
-BuildRequires: intltool >= 0.33
-BuildRequires: pkgconfig  
-BuildRequires: python-gobject2-devel >= 2.15
-BuildRequires: python-gtk-devel  
-BuildRequires: python-devel  
-BuildRequires: fdupes
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-The base libary for Sugar. It provides helpers for the development
-of services and activities.
-
-%prep
-%setup -q -n sugar-base-0.84.1
-
-
-# eliminate %%configure's "clever" behaviour
-%define __libtoolize true
-
-%build
-%configure 
-make 
-
-%install
-rm -rf %{buildroot}
-make  \
-	DESTDIR=%{buildroot} \
-	install
-%fdupes -s %{buildroot}
-%find_lang sugar-base
-
-%clean
-rm -rf %{buildroot}
-
-%files -f sugar-base.lang
-%defattr(-,root,root,-)
-%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/*
-%doc COPYING NEWS
-
-%changelog
-* Thu Apr 23 2009 alsroot@member.fsf.org
-- Switch to jhconvert
-* Fri Mar  6 2009 cyberorg@opensuse.org
-- Update to 0.84.0
-* Fri Jan 16 2009 cyberorg@opensuse.org
-- Update to 0.83.2
-* Wed Aug 27 2008 cyberorg@opensuse.org
-- Initial openSUSE package
diff --git a/0.84/sugar-datastore/SPECS/sugar-datastore.spec b/0.84/sugar-datastore/SPECS/sugar-datastore.spec
deleted file mode 100644
index 44b29da..0000000
--- a/0.84/sugar-datastore/SPECS/sugar-datastore.spec
+++ /dev/null
@@ -1,69 +0,0 @@
-# NOTE: Do not edit, file was generated by jhconvert
-
-Name: sugar-datastore
-Version: 0.84.0
-Release: 1
-Summary: Datastore service for Sugar
-License: GPL
-Group: Development/Libraries
-Url: http://sugarlabs.org/
-
-Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-datastore/sugar-datastore-0.84.0.tar.bz2
-
-Requires: dbus-1-python  
-Requires: python  
-Requires: python-cjson  
-Requires: sugar-base >= 0.84.1
-Requires: python-xapian  
-
-BuildRequires: python-devel  
-BuildRequires: fdupes
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-This package contains a simple log like datastore able to connect with multiple
-backends. The datastore supports connecting and disconnecting from backends
-on the fly to help the support the limit space/memory characteristics and
-the fact that network services may become unavailable at times.
-
-%prep
-%setup -q -n sugar-datastore-0.84.0
-
-
-# eliminate %%configure's "clever" behaviour
-%define __libtoolize true
-
-%build
-%configure 
-make 
-
-%install
-rm -rf %{buildroot}
-make  \
-	DESTDIR=%{buildroot} \
-	install
-%fdupes -s %{buildroot}
-
-
-%clean
-rm -rf %{buildroot}
-
-%files 
-%defattr(-,root,root,-)
-%{_bindir}/*
-%{_datadir}/dbus*/services/*
-%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/*
-%doc LICENSE.GPL README.txt
-
-%changelog
-* Thu Apr 23 2009 alsroot@member.fsf.org
-- Switch to jhconvert
-* Sat Mar  7 2009 lars@linux-schulserver.de
-- use fdupes
-* Fri Mar  6 2009 cyberorg@opensuse.org
-- update to 0.84.0
-* Fri Jan 16 2009 cyberorg@opensuse.org
-- Update to 0.83.1
-* Tue Aug 26 2008 cyberorg@opensuse.org
-- initial package for openSUSE based on Fedora 10
diff --git a/0.84/sugar-presence-service/SPECS/sugar-presence-service.spec b/0.84/sugar-presence-service/SPECS/sugar-presence-service.spec
deleted file mode 100644
index 55609da..0000000
--- a/0.84/sugar-presence-service/SPECS/sugar-presence-service.spec
+++ /dev/null
@@ -1,62 +0,0 @@
-# NOTE: Do not edit, file was generated by jhconvert
-
-Name: sugar-presence-service
-Version: 0.84.0
-Release: 1
-Summary: The Sugar presence service
-License: GPLv2+
-Group: System Environment/Libraries
-Url: http://sugarlabs.org/
-
-Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-presence-service/sugar-presence-service-0.84.0.tar.bz2
-
-Requires: avahi  
-Requires: gnutls >= 2.4
-Requires: python  
-Requires: sugar-base >= 0.84.1
-Requires: telepathy-gabble >= 0.7.21
-Requires: python-telepathy >= 0.15.7
-Requires: telepathy-salut >= 0.3.8
-
-BuildRequires: python-devel  
-BuildRequires: fdupes
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-The Sugar presence service.
-
-%prep
-%setup -q -n sugar-presence-service-0.84.0
-
-
-%build
-%configure 
-make 
-
-%install
-rm -rf %{buildroot}
-make  \
-	DESTDIR=%{buildroot} \
-	install
-%fdupes -s %{buildroot}
-
-
-%clean
-rm -rf %{buildroot}
-
-%files 
-%defattr(-,root,root,-)
-%{_datadir}/sugar-presence-service
-%{_datadir}/dbus*/services/*
-%{_bindir}/*
-%doc COPYING NEWS
-%attr(755,root,root) %{_datadir}/sugar-presence-service/main.py
-
-%changelog
-* Thu Apr 23 2009 alsroot@member.fsf.org
-- Switch to jhconvert
-* Fri Jan 16 2009 cyberorg@opensuse.org
-- Update to 0.83.2
-* Tue Aug 26 2008 cyberorg@opensuse.org
-- Initial openSUSE packages based on Fedora 10
diff --git a/0.84/sugar-toolkit/SPECS/sugar-toolkit.spec b/0.84/sugar-toolkit/SPECS/sugar-toolkit.spec
deleted file mode 100644
index 55ccc1c..0000000
--- a/0.84/sugar-toolkit/SPECS/sugar-toolkit.spec
+++ /dev/null
@@ -1,81 +0,0 @@
-# NOTE: Do not edit, file was generated by jhconvert
-
-Name: sugar-toolkit
-Version: 0.84.4
-Release: 1
-Summary: Sugar toolkit
-License: LGPLv2
-Group: System Environment/Libraries
-Url: http://sugarlabs.org/
-
-Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/sugar-toolkit-0.84.4.tar.bz2
-
-Requires: sugar-datastore >= 0.84.0
-Requires: dbus-1-python  
-Requires: python-hippo-canvas >= 0.3.0
-Requires: gnome-python-desktop  
-Requires: sugar-presence-service >= 0.84.0
-Requires: python-gobject2 >= 2.14
-Requires: python  
-Requires: python-cjson  
-Requires: sugar-base >= 0.84.1
-
-BuildRequires: perl-XML-Parser  
-BuildRequires: alsa-devel  
-BuildRequires: gettext  
-BuildRequires: gtk2-devel  
-BuildRequires: intltool >= 0.33
-BuildRequires: xorg-x11-libSM-devel  
-BuildRequires: python-gobject2-devel >= 2.14
-BuildRequires: python-gtk-devel  
-BuildRequires: python-devel  
-BuildRequires: xorg-x11-proto-devel  
-BuildRequires: fdupes
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-The toolkit provides a set of widgets to build HIG compliant applications
-and interfaces to interact with system services like presence
-and the datastore.
-
-%prep
-%setup -q -n sugar-toolkit-0.84.4
-
-
-# eliminate %%configure's "clever" behaviour
-%define __libtoolize true
-
-%build
-%configure 
-make 
-
-%install
-rm -rf %{buildroot}
-make  \
-	DESTDIR=%{buildroot} \
-	install
-%fdupes -s %{buildroot}
-%find_lang sugar-toolkit
-
-%clean
-rm -rf %{buildroot}
-
-%files -f sugar-toolkit.lang
-%defattr(-,root,root,-)
-%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/*
-%doc AUTHORS COPYING README
-
-%changelog
-* Thu Apr 23 2009 alsroot@member.fsf.org
-- Switch to jhconvert
-* Sat Mar  7 2009 lars@linux-schulserver.de
-- use fdupes
-* Fri Mar  6 2009 cyberorg@opensuse.org
--  Update to 0.84.0
-* Fri Jan 16 2009 cyberorg@opensuse.org
-- Update to 0.83.3
-* Thu Oct 16 2008 cyberorg@opensuse.org
-- Update to 0.82.1
-* Wed Aug 27 2008 cyberorg@opensuse.org
-- Initial openSUSE packages
diff --git a/0.84/sugar/SOURCES/sugar-0.84.5-sugar-start-script.patch b/0.84/sugar/SOURCES/sugar-0.84.5-sugar-start-script.patch
deleted file mode 100644
index 0baf1cb..0000000
--- a/0.84/sugar/SOURCES/sugar-0.84.5-sugar-start-script.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/bin/sugar.in b/bin/sugar.in
-index b9f467c..f269fd0 100644
---- a/bin/sugar.in
-+++ b/bin/sugar.in
-@@ -1,7 +1,9 @@
- #!/bin/sh
- 
-+echo Xcursor.theme: sugar | xrdb
-+
- if test -z "$SUGAR_SCALING"; then
--    export SUGAR_SCALING=100
-+    export SUGAR_SCALING=72
- fi
- 
- export GTK2_RC_FILES="@prefix@/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc"
-@@ -19,4 +21,4 @@ fi
- matchbox-window-manager -use_titlebar no -theme sugar \
-                         -kbdconfig @prefix@/share/sugar/data/kbdconfig &
- 
--exec sugar-session
-+exec dbus-launch --exit-with-session sugar-session
diff --git a/0.84/sugar/SPECS/sugar.spec b/0.84/sugar/SPECS/sugar.spec
deleted file mode 100644
index 3f8864f..0000000
--- a/0.84/sugar/SPECS/sugar.spec
+++ /dev/null
@@ -1,129 +0,0 @@
-# NOTE: Do not edit, file was generated by jhconvert
-
-Name: sugar
-Version: 0.84.5
-Release: 1
-Summary: Sugar window manager
-License: GPL/LGPL
-Group: System Environment/Libraries
-Url: http://sugarlabs.org/
-
-Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar/sugar-0.84.5.tar.bz2
-
-Patch: sugar-0.84.5-sugar-start-script.patch
-
-Requires: sugar-artwork >= 0.84.1
-Requires: dbus-1  
-Requires: dbus-1-x11  
-Requires: gconf2  
-Requires: gstreamer-0_10-plugins-base  
-Requires: python-gstreamer-0_10  
-Requires: gtk2  
-Requires: hal  
-Requires: gnome-python-desktop  
-Requires: matchbox-window-manager  
-Requires: python-numpy  
-Requires: openssh  
-Requires: python-gtk  
-Requires: python-gtksourceview  
-Requires: python  
-Requires: python-cjson  
-Requires: sugar-toolkit >= 0.84.4
-Requires: xorg-x11  
-
-BuildRequires: perl-XML-Parser  
-BuildRequires: gconf2-devel  
-BuildRequires: gettext  
-BuildRequires: gtk2-devel  
-BuildRequires: intltool >= 0.33
-BuildRequires: python-gtk-devel  
-BuildRequires: python-devel  
-BuildRequires: fdupes
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-This package contains the base modules for Sugar.
-Sugar is a graphical user interface aimed at children which promotes sharing
-and collaborative learning. It was introduced on the One Laptop Per Child
-(OLPC) XO laptop but is useful on other devices as well.
-
-%package emulator
-Summary: The emulator for the Sugar Desktop Environment
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: x11-server-xephyr
-%description emulator
-This package contains the Sugar emulator. It is using Xephyr
-to run a Sugar environment similar to what is on the XO laptop. 
-
-%prep
-%setup -q -n sugar-0.84.5
-%patch -p1
-
-%build
-%configure 
-make 
-
-%install
-rm -rf %{buildroot}
-make  \
-	DESTDIR=%{buildroot} \
-	install
-%fdupes -s %{buildroot}
-%find_lang sugar
-
-%post
-if (update-mime-database -v &> /dev/null); then
-  update-mime-database "%{_datadir}/mime" > /dev/null
-fi
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/sugar.schemas > /dev/null || :
-
-%preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/sugar.schemas > /dev/null || :
-fi
-
-%postun
-if (update-mime-database -v &> /dev/null); then
-  update-mime-database "%{_datadir}/mime" > /dev/null
-fi
-
-%clean
-rm -rf %{buildroot}
-
-%files -f sugar.lang
-%defattr(-,root,root,-)
-%dir %{_datadir}/sugar
-%config(noreplace) %{_sysconfdir}/dbus*/system.d/*
-%config(noreplace) %{_sysconfdir}/gconf/schemas/*
-%{_bindir}/*
-%exclude %{_bindir}/sugar-emulator
-%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/*
-%{_datadir}/sugar/*
-%{_datadir}/mime/packages/*
-%{_datadir}/xsessions/sugar.desktop
-%doc AUTHORS COPYING README
-
-%files emulator
-%defattr(-,root,root,-)
-%{_bindir}/sugar-emulator
-
-%changelog
-* Thu Apr 23 2009 alsroot@member.fsf.org
-- Switch to jhconvert
-* Sat Mar  7 2009 lars@linux-schulserver.de
-- use fdupes
-* Fri Mar  6 2009 cyberorg@opensuse.org
-- Update to 0.84.0
-- See http://sugarlabs.org/go/DevelopmentTeam/Release/Releases/Sucrose/0.84.0
-* Fri Jan 16 2009 cyberorg@opensuse.org
-- Update to 0.83.4
-* Wed Aug 27 2008 cyberorg@opensuse.org
-- Update to 0.82.0
-* Tue Aug 26 2008 cyberorg@opensuse.org
-- Initial packages for openSUSE based on Fedora 10