2009-08-10 Matt Lewandowsky <[email protected]>
authorlewellyn
Tue, 11 Aug 2009 06:23:02 +0000
changeset 2053 ba6b19511467
parent 2052 f7be80ab7eec
child 2054 e6f2e19e6c38
2009-08-10 Matt Lewandowsky <[email protected]> * SFEgdata-python26.spec, SFEpython26-dateutil.spec, SFEpython26-feedparser.spec, SFEpython26-sqlalchemy.spec, SFEpython26-xlib.spec: New spec-files, based upon their Python 2.4 spec-files. * SFEalpine.spec: Allow BuildRequires to accept SUNWgawk; Remove autoconf, as source is unfriendly to newer versions and aclocal doesn't help. * SFEgdata-python.spec: Bump to 2.0.1, ensure proper python version is called. * SFEgxmessage.spec: Fixed permissions for %{_prefix}/share and its children. * SFEpython-sqlalchemy.spec: Bump to 0.5.5, explicitly invoke Python 2.4 * SFEsysstat.spec: Bump version to 20090805, change dependency from ncurses to curses. * SFEavant-extras.spec, copyright/SFEavant-extras.copyright, patches/avant-extras-01-alsaaudio.diff, patches/avant-extras-02-disable-volume-applet.diff, patches/avant-extras-03-disable-mount-applet.diff, patches/avant-extras-04-disable-file-browser-launcher.diff, patches/avant-extras-05-disable-thinkhdaps.diff, patches/avant-extras-06-disable-stacks.diff, patches/avant-extras-07-disable-cairo-clock.diff, patches/avant-extras-08-disable-cairo-main-menu.diff, patches/avant-extras-09-disable-cpufreq-monitor.diff, patches/avant-extras-10-disable-desktop-manager.diff, patches/avant-extras-11-disable-digital-clock.diff, patches/avant-extras-12-rss-sqlite.diff: New spec-file, copyright, and patches.
SFEalpine.spec
SFEavant-extras.spec
SFEgdata-python.spec
SFEgdata-python26.spec
SFEgxmessage.spec
SFEpython-sqlalchemy.spec
SFEpython26-dateutil.spec
SFEpython26-feedparser.spec
SFEpython26-sqlalchemy.spec
SFEpython26-xlib.spec
SFEsysstat.spec
copyright/SFEavant-extras.copyright
patches/avant-extras-01-alsaaudio.diff
patches/avant-extras-02-disable-volume-applet.diff
patches/avant-extras-03-disable-mount-applet.diff
patches/avant-extras-04-disable-file-browser-launcher.diff
patches/avant-extras-05-disable-thinkhdaps.diff
patches/avant-extras-06-disable-stacks.diff
patches/avant-extras-07-disable-cairo-clock.diff
patches/avant-extras-08-disable-cairo-main-menu.diff
patches/avant-extras-09-disable-cpufreq-monitor.diff
patches/avant-extras-10-disable-desktop-manager.diff
patches/avant-extras-11-disable-digital-clock.diff
patches/avant-extras-12-rss-sqlite.diff
--- a/SFEalpine.spec	Mon Aug 10 23:03:34 2009 +0000
+++ b/SFEalpine.spec	Tue Aug 11 06:23:02 2009 +0000
@@ -5,6 +5,7 @@
 
 #%define tcl_version 8.4
 #%define tcl_8_3 %(pkgchk -l SUNWTcl 2>/dev/null | grep /usr/sfw/bin/tclsh8.3 >/dev/null && echo 1 || echo 0)
+%define SUNWgawk      %(/usr/bin/pkginfo -q SUNWgawk && echo 1 || echo 0)
 
 Name:                SFEalpine
 License:             Apache
@@ -23,7 +24,11 @@
 BuildRequires: SUNWhea
 Requires: SUNWcsl
 #BuildRequires: SUNWTcl
+%if %SUNWgawk
+BuildRequires: SUNWgawk
+%else
 BuildRequires: SFEgawk
+%endif
 
 %prep
 %setup -q -n alpine-%{version}
@@ -53,7 +58,7 @@
 	SSL_INCLUDE_DIR=/usr/include
 fi
 
-autoconf
+# autoconf
 
 ./configure --prefix=%{_prefix} \
             --bindir=%{_bindir} \
@@ -95,6 +100,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug 10 2009 - [email protected]
+- Allow BuildRequires to accept SUNWgawk
+- Remove autoconf, as source is unfriendly to newer versions and aclocal doesn't help.
 * Mon Mar 02 2009 - Albert Lee
 - Fix SSL support
 * Tue Oct 21 2008  - Pradhap Devarajan <pradhap (at) gmail.com>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEavant-extras.spec	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,240 @@
+#
+# Spec file for package awn-extras
+#
+# Future versions of awn-extras WILL require Python > 2.4...
+#
+
+%include Solaris.inc
+
+%define X11_DIR %{_prefix}/X11
+%define source_name awn-extras-applets
+%define SUNWavant %(/usr/bin/pkginfo -q SUNWavant && echo 1 || echo 0)
+
+Name:           SFEavant-extras
+Summary:        Avant Window Navigator Extras - Applets and Plugins
+Version:        0.3.2.2
+Source:		http://launchpad.net/awn-extras/0.2/%{version}/+download/awn-extras-applets-%{version}.tar.gz
+License:        GPL v3, LGPL v2, Apache, Other
+URL:            http://launchpad.net/awn-extras/
+SUNW_BaseDir:   %{_basedir}
+SUNW_Copyright: %{name}.copyright
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+# Patch notes.
+#
+# Patch1 ought to go away at 0.3.3, when alsaaudio is not a "hard" requirement at configure-time. At this time, the volume applet is ALSA-only.
+# Patch2 ought to go away at 0.3.9, when proper backend detection is done.
+# Patch3 is because the mount applet relies on /etc/fstab (which isn't on Solaris) and doesn't know about ZFS.
+# Patch4 is due to file-browser-launcher trying to enumerate filesystems via /etc/fstab.
+# Patch5 is because ThinkHDAPS is Linux-specific.
+# Patch6 may be unneeded with a *Kit upgrade. Error: "gnomevfs.GenericError: Generic error"
+# Patch7 is due to too-new python syntax, and can go away with a move to 2.6.
+# Patch8 is likely to be unneeded with 0.3.9
+# Patch9 is not yet diagnosed.
+# Patch10 is not yet diagnosed.
+# Patch11 is not yet diagnosed.
+# Patch12 can probably be reworked or removed with python 2.6.
+
+Patch1:         avant-extras-01-alsaaudio.diff
+Patch2:         avant-extras-02-disable-volume-applet.diff
+Patch3:         avant-extras-03-disable-mount-applet.diff
+Patch4:         avant-extras-04-disable-file-browser-launcher.diff
+Patch5:         avant-extras-05-disable-thinkhdaps.diff
+Patch6:         avant-extras-06-disable-stacks.diff
+Patch7:         avant-extras-07-disable-cairo-clock.diff
+Patch8:         avant-extras-08-disable-cairo-main-menu.diff
+Patch9:         avant-extras-09-disable-cpufreq-monitor.diff
+Patch10:        avant-extras-10-disable-desktop-manager.diff
+Patch11:        avant-extras-11-disable-digital-clock.diff
+Patch12:        avant-extras-12-rss-sqlite.diff
+
+%ifnarch sparc
+# these packages are only available on i386/x64
+# =============================================
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%include	default-depend.inc
+Requires:       SFEtomboy
+Requires:       SUNWbash
+Requires:       SUNWcompiz
+Requires:       SUNWdbus
+Requires:       SUNWdesktop-cache
+Requires:       SUNWdesktop-search
+Requires:       SUNWgnome-themes
+Requires:       SUNWgtk2
+Requires:       SFEgdata-python
+Requires:       SFEpython-dateutil
+Requires:       SFEpython-feedparser
+Requires:       SFEpython-sqlalchemy
+Requires:       SFEpython-vobject
+Requires:       SFEpython-xlib
+Requires:       SUNWPython
+Requires:       SUNWgnome-python-desktop
+Requires:       SUNWgnome-python-extras
+Requires:       SUNWgnome-python-libs
+Requires:       SUNWgst-python
+Requires:       SUNWpython-notify
+Requires:       SUNWpython-xdg
+Requires:       SUNWsexy-python
+# Requires:       SFEgdata-python26
+# Requires:       SFEpython-vobject26
+# Requires:       SFEpython26-dateutil
+# Requires:       SFEpython26-feedparser
+# Requires:       SFEpython26-sqlalchemy
+# Requires:       SFEpython26-sqlite
+# Requires:       SFEpython26-xlib
+# Requires:       SUNWPython26
+# Requires:       SUNWgnome-python26-desktop
+# Requires:       SUNWgnome-python26-extras
+# Requires:       SUNWgnome-python26-libs
+# Requires:       SUNWgst-python26
+# Requires:       SUNWpython26-notify
+# Requires:       SUNWpython26-xdg
+# Requires:       SUNWsexy-python26
+Requires:       %{name}-root
+%if %SUNWavant
+Requires:       SUNWavant
+%else
+Requires:       SFEavant
+%endif
+BuildRequires:  SUNWcompiz-devel
+BuildRequires:  SUNWdbus-devel
+BuildRequires:  SUNWdesktop-search-devel
+BuildRequires:  SUNWgtk2-devel
+BuildRequires:  SUNWxwinc
+BuildRequires:  SUNWgst-python
+BuildRequires:  SUNWpython-setuptools
+# BuildRequires:  SUNWgst-python26-devel
+# BuildRequires:  SUNWpython26-setuptools
+%if %SUNWavant
+Requires:       SUNWavant-devel
+%else
+Requires:       SFEavant-devel
+%endif
+
+%package devel
+Summary:		 %summary - developer files
+SUNW_BaseDir:            %{_basedir}
+%include default-depend.inc
+Requires:		 %name
+
+%package root
+Summary:                 %{summary} - / filesystem
+SUNW_BaseDir:            /
+%include default-depend.inc
+
+%define python_version 2.4
+# %define python_version 2.6
+
+%prep
+%setup -q -c -n %name-%{version}
+cd %{source_name}-%{version}
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
+%patch10 -p0
+%patch11 -p0
+%patch12 -p0
+cd %{_builddir}/%name-%version
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+    CPUS=1
+fi
+
+rm -rf $RPM_BUILD_ROOT
+mkdir $RPM_BUILD_ROOT
+export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig:%{X11_DIR}/lib/pkgconfig
+
+PROTO_LIB=$RPM_BUILD_DIR/%{name}/usr/X11/lib
+
+export CFLAGS="%optflags -I%{X11_DIR}/include" 
+export LDFLAGS="-L$PROTO_LIB -L%{X11_DIR}/lib -R%{X11_DIR}/lib"
+
+cd %{source_name}-%{version}
+intltoolize --force --copy --automake
+
+autoconf
+CFLAGS="-g -fast" PYTHON_VERSION=%{python_version} \
+./configure --prefix=%{_prefix}		\
+	    --bindir=%{_bindir}         \
+	    --sysconfdir=%{_sysconfdir}	\
+	    --libdir=%{_libdir}         \
+            --includedir=%{_includedir} \
+            --mandir=%{_mandir}   \
+	    --datadir=%{_datadir}	
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd %{source_name}-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# move to vendor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages/* \
+   $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages
+
+rm -f ${RPM_BUILD_ROOT}/x11.pc
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%restart_fmri icon-cache gconf-cache
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, bin) %{_libdir}/python%{python_version}
+%dir %attr (0755, root, bin) %{_libdir}/python%{python_version}/vendor-packages
+%dir %attr (0755, root, bin) %{_libdir}/python%{python_version}/vendor-packages/awn/
+%dir %attr (0755, root, bin) %{_libdir}/python%{python_version}/vendor-packages/awn/extras/
+%dir %attr (0755, root, bin) %{_libdir}/awn
+%dir %attr (0755, root, bin) %{_libdir}/awn/applets
+%dir %attr (0755, root, bin) %{_libdir}/awn/applets/*/
+%{_libdir}/lib*so*
+%{_libdir}/awn/applets/*/*
+%{_libdir}/python%{python_version}/vendor-packages/awn/extras/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/avant-window-navigator
+%{_datadir}/avant-window-navigator/*
+%dir %attr (0755, root, other) %{_datadir}/icons
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/scalable/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/scalable/apps/
+%{_datadir}/icons/hicolor/scalable/apps/*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_includedir}
+%dir %attr (0755, root, bin) %{_includedir}/libawn-extras
+%{_includedir}/libawn-extras/*
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+%dir %attr (0755, root, sys) %{_datadir}
+
+%files root
+%defattr (-, root, sys)
+%attr (0755, root, sys) %dir %{_sysconfdir}
+%{_sysconfdir}/gconf/schemas/*
+
+# endif for "ifnarch sparc"
+%endif
+
+%changelog
+* Mon Aug 10 2009 - [email protected]
+- Initial spec
--- a/SFEgdata-python.spec	Mon Aug 10 23:03:34 2009 +0000
+++ b/SFEgdata-python.spec	Tue Aug 11 06:23:02 2009 +0000
@@ -8,7 +8,7 @@
 Name:                    SFEgdata-python
 Summary:                 Google Data API provide a simple protocol for reading and writing data on the web
 URL:                     http://code.google.com/p/gdata-python-client/
-Version:                 1.3.3
+Version:                 2.0.1
 Source:                  http://gdata-python-client.googlecode.com/files/gdata-%{version}.tar.gz
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -22,11 +22,11 @@
 %setup -q -n gdata-%version
 
 %build
-python setup.py build
+python%{pythonver} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install --root=%{buildroot}
+python%{pythonver} setup.py install --root=%{buildroot}
 
 # move to vendor-packages
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
@@ -44,6 +44,9 @@
 %{_libdir}/python%{pythonver}/vendor-packages/gdata/*
 
 %changelog
+* Mon Aug 10 2009 - [email protected]
+- Bump to 2.0.1
+- Ensure proper python version is called
 * Mon Jun 08 2009 - [email protected]
 - Bump to 1.3.3.
 * Mon Mar 17 2009 - [email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEgdata-python26.spec	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,57 @@
+#
+# spec file for package SFEgdata-python26
+#
+# includes module(s): gdata-python
+#
+
+%include Solaris.inc
+Name:                    SFEgdata-python26
+Summary:                 Google Data API provide a simple protocol for reading and writing data on the web
+URL:                     http://code.google.com/p/gdata-python-client/
+Version:                 2.0.1
+Source:                  http://gdata-python-client.googlecode.com/files/gdata-%{version}.tar.gz
+SUNW_BaseDir:            %{_basedir}
+BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+Requires:                SUNWPython26
+
+%include default-depend.inc
+
+%define pythonver 2.6
+
+%prep
+%setup -q -n gdata-%version
+
+%build
+python%{pythonver} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+python%{pythonver} setup.py install --root=%{buildroot}
+
+# move to vendor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
+   $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/python%{pythonver}/vendor-packages/*
+
+%changelog
+* Mon Aug 10 2009 - [email protected]
+- Initial spec, based on SFEgdata-python.spec
+* Mon Jun 08 2009 - [email protected]
+- Bump to 1.3.3.
+* Mon Mar 17 2009 - [email protected]
+- Bump to 1.2.4
+* Mon Jun 16 2008 - [email protected]
+- Bump to 1.1.1
+* Fri Jun 06 2008 - [email protected]
+- Bump to 1.0.13
+* Tue Apr 29 2008 - [email protected]
+- Created
--- a/SFEgxmessage.spec	Mon Aug 10 23:03:34 2009 +0000
+++ b/SFEgxmessage.spec	Tue Aug 11 06:23:02 2009 +0000
@@ -52,10 +52,15 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/*
-%dir %attr(0755, root, bin) %{_basedir}/share
-%{_basedir}/share/*
+%dir %attr(0755, root, sys) %{_prefix}/share
+%dir %attr(0755, root, other) %{_prefix}/share/icons
+%dir %attr(0755, root, other) %{_prefix}/share/info
+%dir %attr(0755, root, other) %{_prefix}/share/locale
+%{_prefix}/share/*
 
 
 %changelog
+* Mon Aug 10 2009 - [email protected]
+- Fixed permissions for %{_prefix}/share and its children.
 * Mon Jun 01 2009 - [email protected]
 - Initial version
--- a/SFEpython-sqlalchemy.spec	Mon Aug 10 23:03:34 2009 +0000
+++ b/SFEpython-sqlalchemy.spec	Tue Aug 11 06:23:02 2009 +0000
@@ -11,7 +11,7 @@
 Name:                    SFEpython-sqlalchemy
 Summary:                 SQL-Alchemy is a Python SQL toolkit and Object Relational Mapper
 URL:                     http://www.sqlalchemy.org
-Version:                 0.3.10
+Version:                 0.5.5
 Source:                  %{src_url}/%{src_name}-%{version}.tar.gz
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -25,11 +25,11 @@
 %setup -q -n %{src_name}-%{version}
 
 %build
-python setup.py build
+python${python_version} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install --root=$RPM_BUILD_ROOT/% --prefix=%{_prefix} --no-compile
+python%{python_version} setup.py install --root=$RPM_BUILD_ROOT/% --prefix=%{_prefix} --no-compile
 
 # move to vendor-packages
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages
@@ -48,5 +48,8 @@
 %{_libdir}/python%{python_version}/vendor-packages/
 
 %changelog
+* Mon Aug 10 2009 - [email protected]
+- Bump to 0.5.5
+- Explicitly invoke Python 2.4
 * Sun Nov 04 2007 - Ananth Shrinivas <[email protected]>
 - Initial Version
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEpython26-dateutil.spec	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,49 @@
+#
+# spec file for package SFEpython26-dateutil
+#
+# includes module(s): dateutil
+#
+%include Solaris.inc
+
+Name:                    SFEpython26-dateutil
+Summary:                 dateutil - Provides powerful extensions to the standard datetime module
+URL:                     http://labix.org/python-dateutil
+Version:                 1.4.1
+Source:                  http://labix.org/download/python-dateutil/python-dateutil-%{version}.tar.gz
+SUNW_BaseDir:            %{_basedir}
+BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+Requires:                SUNWPython26
+
+%include default-depend.inc
+
+%define python_version  2.6
+
+%prep
+%setup -q -n python-dateutil-%{version}
+
+%build
+python%{python_version} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+python%{python_version} setup.py install --root=$RPM_BUILD_ROOT --prefix=%{_prefix} --no-compile
+
+# move to vendor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages/* \
+   $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/python%{python_version}/vendor-packages
+
+%changelog
+* Mon Apr 10 2009 - [email protected]
+- Initial Spec
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEpython26-feedparser.spec	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,51 @@
+#
+# spec file for package SFEpython26-feedparser
+#
+# includes module(s): feedparser
+#
+%include Solaris.inc
+
+Name:                    SFEpython26-feedparser
+Summary:                 FeedParser - A Python module for downloading and parsing syndicated feeds.
+URL:                     http://feedparser.org/
+Version:                 4.1
+Source:                  http://feedparser.googlecode.com/files/feedparser-%{version}.zip
+SUNW_BaseDir:            %{_basedir}
+BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+Requires:                SUNWPython26
+
+%include default-depend.inc
+
+%define python_version  2.6
+
+%prep
+%setup -c -q -n feedparser-%{version}
+
+%build
+python%{python_version} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+python%{python_version} setup.py install --root=$RPM_BUILD_ROOT --prefix=%{_prefix} --no-compile
+
+# move to vendor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages/* \
+   $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/python%{python_version}/vendor-packages
+
+%changelog
+* Mon Apr 10 2009 - [email protected]
+- Initial version based on SFEpython-feedparser.spec
+* Tue Dec 25 2007 - Ananth Shrinivas <[email protected]>
+- Initial Version
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEpython26-sqlalchemy.spec	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,54 @@
+#
+# spec file for package SFEpython26-sqlalchemy
+#
+# includes module(s): sqlalchemy
+#
+%include Solaris.inc
+
+%define src_url     http://nchc.dl.sourceforge.net/sourceforge/sqlalchemy
+%define src_name    SQLAlchemy
+
+Name:                    SFEpython26-sqlalchemy
+Summary:                 SQL-Alchemy is a Python SQL toolkit and Object Relational Mapper
+URL:                     http://www.sqlalchemy.org
+Version:                 0.5.5
+Source:                  %{src_url}/%{src_name}-%{version}.tar.gz
+SUNW_BaseDir:            %{_basedir}
+BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+Requires:                SUNWPython26
+
+%include default-depend.inc
+
+%define python_version  2.6
+
+%prep
+%setup -q -n %{src_name}-%{version}
+
+%build
+python%{python_version} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+python%{python_version} setup.py install --root=$RPM_BUILD_ROOT/% --prefix=%{_prefix} --no-compile
+
+# move to vendor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages/* \
+   $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/python%{python_version}/vendor-packages/
+
+%changelog
+* Mon Aug 10 2009 - [email protected]
+- Initial spec based on SFEpython-sqlalchemy.spec
+* Sun Nov 04 2007 - Ananth Shrinivas <[email protected]>
+- Initial Version
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEpython26-xlib.spec	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,55 @@
+#
+# spec file for package SFEpython26-xlib
+#
+# includes module(s): python-xlib
+#
+%include Solaris.inc
+
+%define src_url         http://jaist.dl.sourceforge.net/sourceforge/python-xlib/python-xlib-0.14.tar.gz
+%define src_name        python-xlib
+
+Name:                   SFEpython26-xlib
+Summary:                A complete X11R6 client-side implementation in pure-python
+URL:                    http://jaist.dl.sourceforge.net/sourceforge/python-xlib
+Version:                0.14
+Source:                 %{src_url}/%{src_name}-%{version}.tar.gz
+SUNW_BaseDir:           %{_basedir}
+BuildRoot:              %{_tmppath}/%{name}-%{version}-build
+
+%include default-depend.inc
+Requires:               SUNWPython26
+BuildRequires:          SUNWPython26-devel
+
+%define python_version  2.6
+
+%prep
+%setup -q -n %{src_name}-%{version}
+
+%build
+python%{python_version} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+python%{python_version} setup.py install --root=$RPM_BUILD_ROOT --prefix=%{_prefix} --no-compile
+
+# move to vendor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages/* \
+   $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/python%{python_version}/vendor-packages
+
+%changelog
+* Mon Aug 10 2009 - [email protected]
+- Initial spec file based on SFEpython-xlib.spec
+* Tue Dec 25 2007 - Ananth Shrinivas <[email protected]>
+- Initial Version
--- a/SFEsysstat.spec	Mon Aug 10 23:03:34 2009 +0000
+++ b/SFEsysstat.spec	Tue Aug 11 06:23:02 2009 +0000
@@ -6,14 +6,14 @@
 
 Name:                SFEsysstat
 Summary:             Most important perf metrics at a single glance
-Version:             20070317
+Version:             20090805
 Source:              http://www.maier-komor.de/sysstat/sysstat-%{version}.tgz
 SUNW_BaseDir:        %{_basedir}
 BuildRoot:           %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 
-BuildRequires: SFEncurses
-Requires: SFEncurses
+BuildRequires: SUNWcsl
+Requires: SUNWcsl
 
 %prep
 %setup -q -n sysstat-%{version}
@@ -27,7 +27,7 @@
 fi
 
 # Make configure find ncurses in /usr/gnu...
-perl -i.orig -lpe 'print "DIRS=/usr/gnu\n" if $. == 4' configure
+# perl -i.orig -lpe 'print "DIRS=/usr/gnu\n" if $. == 4' configure
 
 ./configure --prefix=/usr
 make -j$CPUS
@@ -57,5 +57,8 @@
 
 %changelog
 
+* Mon Aug 10 2009 - [email protected]
+- Bump version to 20090805
+- Change dependency from ncurses to curses.
 * Wed Apr 07 2007 - Eric Boutilier
 - Initial spec
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/copyright/SFEavant-extras.copyright	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,1330 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+		    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+Creative Commons Attribution-Share Alike 3.0 License: 
+
+   THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS 
+   PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR 
+   OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS 
+   LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+   BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE 
+   BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED 
+   TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN 
+   CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+   1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other 
+   pre-existing works, such as a translation, adaptation, derivative work, arrangement 
+   of music or other alterations of a literary or artistic work, or phonogram or performance 
+   and includes cinematographic adaptations or any other form in which the Work may be 
+   recast, transformed, or adapted including in any form recognizably derived from the 
+   original, except that a work that constitutes a Collection will not be considered an 
+   Adaptation for the purpose of this License. For the avoidance of doubt, where the Work 
+   is a musical work, performance or phonogram, the synchronization of the Work in 
+   timed-relation with a moving image ("synching") will be considered an Adaptation for 
+   the purpose of this License.
+
+   2. "Collection" means a collection of literary or artistic works, such as encyclopedias 
+   and anthologies, or performances, phonograms or broadcasts, or other works or subject 
+   matter other than works listed in Section 1(f) below, which, by reason of the selection 
+   and arrangement of their contents, constitute intellectual creations, in which the Work 
+   is included in its entirety in unmodified form along with one or more other contributions, 
+   each constituting separate and independent works in themselves, which together are 
+   assembled into a collective whole. A work that constitutes a Collection will not be 
+   considered an Adaptation (as defined below) for the purposes of this License.
+
+   3. "Creative Commons Compatible License" means a license that is listed at 
+   http://creativecommons.org/compatiblelicenses that has been approved by Creative 
+   Commons as being essentially equivalent to this License, including, at a minimum, because 
+   that license: (i) contains terms that have the same purpose, meaning and effect as the 
+   License Elements of this License; and, (ii) explicitly permits the relicensing of 
+   adaptations of works made available under that license under this License or a Creative 
+   Commons jurisdiction license with the same License Elements as this License.
+
+   4. "Distribute" means to make available to the public the original and copies of the Work 
+   or Adaptation, as appropriate, through sale or other transfer of ownership.
+
+   5. "License Elements" means the following high-level license attributes as selected by 
+   Licensor and indicated in the title of this License: Attribution, ShareAlike.
+
+   6. "Licensor" means the individual, individuals, entity or entities that offer(s) 
+   the Work under the terms of this License.
+
+   7. "Original Author" means, in the case of a literary or artistic work, the individual, 
+   individuals, entity or entities who created the Work or if no individual or entity can 
+   be identified, the publisher; and in addition 
+   (i) in the case of a performance the actors, singers, musicians, dancers, and other 
+   persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary 
+   or artistic works or expressions of folklore; 
+   (ii) in the case of a phonogram the producer being the person or legal entity who first 
+   fixes the sounds of a performance or other sounds; and, 
+   (iii) in the case of broadcasts, the organization that transmits the broadcast.
+
+   8. "Work" means the literary and/or artistic work offered under the terms of this License 
+   including without limitation any production in the literary, scientific and artistic 
+   domain, whatever may be the mode or form of its expression including digital form, 
+   such as a book, pamphlet and other writing; a lecture, address, sermon or other work of 
+   the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment 
+   in dumb show; a musical composition with or without words; a cinematographic work to which 
+   are assimilated works expressed by a process analogous to cinematography; a work of drawing, 
+   painting, architecture, sculpture, engraving or lithography; a photographic work to which 
+   are assimilated works expressed by a process analogous to photography; a work of applied art; 
+   an illustration, map, plan, sketch or three-dimensional work relative to geography, 
+   topography, architecture or science; a performance; a broadcast; a phonogram; a compilation 
+   of data to the extent it is protected as a copyrightable work; or a work performed by a 
+   variety or circus performer to the extent it is not otherwise considered a literary or 
+   artistic work.
+
+   9. "You" means an individual or entity exercising rights under this License who has not 
+   previously violated the terms of this License with respect to the Work, or who has received 
+   express permission from the Licensor to exercise rights under this License despite a 
+   previous violation.
+
+   10. "Publicly Perform" means to perform public recitations of the Work and to communicate 
+   to the public those public recitations, by any means or process, including by wire or 
+   wireless means or public digital performances; to make available to the public Works in 
+   such a way that members of the public may access these Works from a place and at a place 
+   individually chosen by them; to perform the Work to the public by any means or process 
+   and the communication to the public of the performances of the Work, including by public 
+   digital performance; to broadcast and rebroadcast the Work by any means including signs, 
+   sounds or images.
+
+   11. "Reproduce" means to make copies of the Work by any means including without limitation 
+   by sound or visual recordings and the right of fixation and reproducing fixations of the 
+   Work, including storage of a protected performance or phonogram in digital form or other 
+   electronic medium.
+
+   2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict 
+   any uses free from copyright or rights arising from limitations or exceptions that are 
+   provided for in connection with the copyright protection under copyright law or other 
+   applicable laws.
+
+   3. License Grant. Subject to the terms and conditions of this License, Licensor hereby 
+   grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the 
+   applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to 
+   Reproduce the Work as incorporated in the Collections;
+
+   2. to create and Reproduce Adaptations provided that any such Adaptation, including any 
+   translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise 
+   identify that changes were made to the original Work. For example, a translation could be 
+   marked "The original work was translated from English to Spanish," or a modification could 
+   indicate "The original work has been modified.";
+
+   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5. For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right 
+   to collect royalties through any statutory or compulsory licensing scheme cannot be waived, 
+   the Licensor reserves the exclusive right to collect such royalties for any exercise by 
+   You of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right 
+   to collect royalties through any statutory or compulsory licensing scheme can be waived, 
+   the Licensor waives the exclusive right to collect such royalties for any exercise by 
+   You of the rights granted under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, 
+   whether individually or, in the event that the Licensor is a member of a collecting society 
+   that administers voluntary licensing schemes, via that society, from any exercise by You of 
+   the rights granted under this License.
+
+   The above rights may be exercised in all media and formats whether now known or hereafter 
+   devised. The above rights include the right to make such modifications as are technically 
+   necessary to exercise the rights in other media and formats. Subject to Section 8(f), 
+   all rights not expressly granted by Licensor are hereby reserved.
+
+   4. Restrictions. The license granted in Section 3 above is expressly made subject to 
+   and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of this License. 
+   You must include a copy of, or the Uniform Resource Identifier (URI) for, this License 
+   with every copy of the Work You Distribute or Publicly Perform. You may not offer or 
+   impose any terms on the Work that restrict the terms of this License or the ability of 
+   the recipient of the Work to exercise the rights granted to that recipient under the terms 
+   of the License. You may not sublicense the Work. You must keep intact all notices that 
+   refer to this License and to the disclaimer of warranties with every copy of the Work 
+   You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, 
+   You may not impose any effective technological measures on the Work that restrict the 
+   ability of a recipient of the Work from You to exercise the rights granted to that 
+   recipient under the terms of the License. This Section 4(a) applies to the Work as 
+   incorporated in a Collection, but this does not require the Collection apart from the 
+   Work itself to be made subject to the terms of this License. If You create a Collection, 
+   upon notice from any Licensor You must, to the extent practicable, remove from the 
+   Collection any credit as required by Section 4(c), as requested. If You create an 
+   Adaptation, upon notice from any Licensor You must, to the extent practicable, remove 
+   from the Adaptation any credit as required by Section 4(c), as requested.
+
+   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: 
+   (i) this License; 
+   (ii) a later version of this License with the same License Elements as this License; 
+   (iii) a Creative Commons jurisdiction license (either this or a later license version) 
+   that contains the same License Elements as this License (e.g., Attribution-ShareAlike 
+   3.0 US)); 
+   (iv) a Creative Commons Compatible License. If you license the Adaptation under one of 
+   the licenses mentioned in (iv), you must comply with the terms of that license. 
+   If you license the Adaptation under the terms of any of the licenses mentioned in (i), 
+   (ii) or (iii) (the "Applicable License"), you must comply with the terms of the 
+   Applicable License generally and the following provisions: 
+   (I) You must include a copy of, or the URI for, the Applicable License with every copy 
+   of each Adaptation You Distribute or Publicly Perform; 
+   (II) You may not offer or impose any terms on the Adaptation that restrict the terms 
+   of the Applicable License or the ability of the recipient of the Adaptation to exercise 
+   the rights granted to that recipient under the terms of the Applicable License; 
+   (III) You must keep intact all notices that refer to the Applicable License and to 
+   the disclaimer of warranties with every copy of the Work as included in the Adaptation 
+   You Distribute or Publicly Perform; 
+   (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any 
+   effective technological measures on the Adaptation that restrict the ability of a 
+   recipient of the Adaptation from You to exercise the rights granted to that recipient 
+   under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as 
+   incorporated in a Collection, but this does not require the Collection apart from the 
+   Adaptation itself to be made subject to the terms of the Applicable License.
+
+   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, 
+   You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright 
+   notices for the Work and provide, reasonable to the medium or means You are utilizing: 
+   (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if 
+   the Original Author and/or Licensor designate another party or parties (e.g., a sponsor 
+   institute, publishing entity, journal) for attribution ("Attribution Parties") in 
+   Licensor's copyright notice, terms of service or by other reasonable means, the name of 
+   such party or parties; 
+   (ii) the title of the Work if supplied; 
+   (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies 
+   to be associated with the Work, unless such URI does not refer to the copyright notice 
+   or licensing information for the Work; and 
+   (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying 
+   the use of the Work in the Adaptation (e.g., "French translation of the Work by Original 
+   Author," or "Screenplay based on original Work by Original Author"). The credit required 
+   by this Section 4(c) may be implemented in any reasonable manner; provided, however, 
+   that in the case of a Adaptation or Collection, at a minimum such credit will appear, 
+   if a credit for all contributing authors of the Adaptation or Collection appears, then 
+   as part of these credits and in a manner at least as prominent as the credits for the 
+   other contributing authors. For the avoidance of doubt, You may only use the credit 
+   required by this Section for the purpose of attribution in the manner set out above and, 
+   by exercising Your rights under this License, You may not implicitly or explicitly assert 
+   or imply any connection with, sponsorship or endorsement by the Original Author, Licensor 
+   and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the 
+   separate, express prior written permission of the Original Author, Licensor and/or 
+   Attribution Parties.
+
+   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted 
+   by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by 
+   itself or as part of any Adaptations or Collections, You must not distort, mutilate, 
+   modify or take other derogatory action in relation to the Work which would be prejudicial 
+   to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions 
+   (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License 
+   (the right to make Adaptations) would be deemed to be a distortion, mutilation, 
+   modification or other derogatory action prejudicial to the Original Author's honor and 
+   reputation, the Licensor will waive or not assert, as appropriate, this Section, to the 
+   fullest extent permitted by the applicable national law, to enable You to reasonably 
+   exercise Your right under Section 3(b) of this License (right to make Adaptations) but 
+   not otherwise.
+
+   5. Representations, Warranties and Disclaimer
+
+   UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK 
+   AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, 
+   IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, 
+   MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF 
+   LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT 
+   DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO 
+   SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+   6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT 
+   WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, 
+   CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE 
+   OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+   7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any 
+   breach by You of the terms of this License. Individuals or entities who have received 
+   Adaptations or Collections from You under this License, however, will not have their 
+   licenses terminated provided such individuals or entities remain in full compliance with 
+   those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+
+   2. Subject to the above terms and conditions, the license granted here is perpetual 
+   (for the duration of the applicable copyright in the Work). Notwithstanding the above, 
+   Licensor reserves the right to release the Work under different license terms or to stop 
+   distributing the Work at any time; provided, however that any such election will not serve 
+   to withdraw this License (or any other license that has been, or is required to be, granted 
+   under the terms of this License), and this License will continue in full force and effect 
+   unless terminated as stated above.
+
+   8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor 
+   offers to the recipient a license to the Work on the same terms and conditions as the 
+   license granted to You under this License.
+
+   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the 
+   recipient a license to the original Work on the same terms and conditions as the license 
+   granted to You under this License.
+
+   3. If any provision of this License is invalid or unenforceable under applicable law, 
+   it shall not affect the validity or enforceability of the remainder of the terms of this 
+   License, and without further action by the parties to this agreement, such provision 
+   shall be reformed to the minimum extent necessary to make such provision valid and 
+   enforceable.
+
+   4. No term or provision of this License shall be deemed waived and no breach consented 
+   to unless such waiver or consent shall be in writing and signed by the party to be charged 
+   with such waiver or consent.
+
+   5. This License constitutes the entire agreement between the parties with respect to the 
+   Work licensed here. There are no understandings, agreements or representations with respect 
+   to the Work not specified here. Licensor shall not be bound by any additional provisions 
+   that may appear in any communication from You. This License may not be modified without 
+   the mutual written agreement of the Licensor and You.
+
+   6. The rights granted under, and the subject matter referenced, in this License were 
+   drafted utilizing the terminology of the Berne Convention for the Protection of Literary 
+   and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the 
+   WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and 
+   the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject 
+   matter take effect in the relevant jurisdiction in which the License terms are sought to 
+   be enforced according to the corresponding provisions of the implementation of those 
+   treaty provisions in the applicable national law. If the standard suite of rights granted 
+   under applicable copyright law includes additional rights not granted under this License, 
+   such additional rights are deemed to be included in the License; this License is not intended 
+   to restrict the license of any rights under applicable law.
+
+   Creative Commons Notice
+
+   Creative Commons is not a party to this License, and makes no warranty whatsoever in 
+   connection with the Work. Creative Commons will not be liable to You or any party on any 
+   legal theory for any damages whatsoever, including without limitation any general, 
+   special, incidental or consequential damages arising in connection to this license. 
+   Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly 
+   identified itself as the Licensor hereunder, it shall have all rights and obligations 
+   of Licensor.
+
+   Except for the limited purpose of indicating to the public that the Work is licensed 
+   under the CCPL, Creative Commons does not authorize the use by either party of the 
+   trademark "Creative Commons" or any related trademark or logo of Creative Commons 
+   without the prior written consent of Creative Commons. Any permitted use will be in 
+   compliance with Creative Commons' then-current trademark usage guidelines, as may be 
+   published on its website or otherwise made available upon request from time to time. 
+   For the avoidance of doubt, this trademark restriction does not form part of the License.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-01-alsaaudio.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2009-08-10 06:58:39.020595683 -0700
++++ configure.ac	2009-08-10 07:22:05.707426170 -0700
+@@ -178,8 +178,6 @@
+               enable_pymod_checks=yes)
+ 
+ if test x${enable_pymod_checks} = xyes; then
+-    # volume-control
+-    AM_CHECK_PYMOD(alsaaudio,,,AC_MSG_ERROR([python module alsaaudio required (python-alsaaudio)]))
+     # battery-applet
+     AM_CHECK_PYMOD(pynotify,,,AC_MSG_ERROR([python module pynotify required (python-notify)]))
+     # arss, mail
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-02-disable-volume-applet.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,39 @@
+--- configure.ac.volume-control	2009-08-10 14:05:47.085859388 -0700
++++ configure.ac	2009-08-10 14:06:24.869895608 -0700
+@@ -375,7 +375,6 @@
+ src/trasher/trasher.desktop.in
+ src/vala-test/Makefile
+ src/vala-test/vala-test.desktop.in
+-src/volume-control/Makefile
+ src/weather/Makefile
+ src/weather/images/Makefile
+ src/weather/locale/Makefile
+--- src/Makefile.am.volume-control	2009-08-10 14:31:19.986203114 -0700
++++ src/Makefile.am	2009-08-10 14:31:32.670841777 -0700
+@@ -82,7 +82,6 @@
+ 	thinkhdaps			\
+ 	to-do				\
+ 	tomboy-applet		\
+-	volume-control		\
+ 	weather			\
+ 	$(WOBBLYZINI)		\
+ 	$(GCONF_APPLETS)	\
+--- src/Makefile.in.volume-control	2009-08-10 15:07:21.297562540 -0700
++++ src/Makefile.in	2009-08-10 15:07:31.897520605 -0700
+@@ -90,7 +90,7 @@
+ 	media-icon-next media-icon-play media-player notification-area \
+ 	places pynot pynot-rgba python-test quit-applet separator \
+ 	shiny-switcher showdesktop thinkhdaps to-do tomboy-applet \
+-	volume-control weather wobblyzini awnsystemmonitor cairo-menu \
++	weather wobblyzini awnsystemmonitor cairo-menu \
+ 	calendar filebrowser plugger stacks trasher \
+ 	notification-daemon media-control mount-applet digg main-menu \
+ 	MiMenu pandora rtm trash vala-test webapplet
+@@ -380,7 +380,6 @@
+ 	thinkhdaps			\
+ 	to-do				\
+ 	tomboy-applet		\
+-	volume-control		\
+ 	weather			\
+ 	$(WOBBLYZINI)		\
+ 	$(GCONF_APPLETS)	\
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-03-disable-mount-applet.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,38 @@
+--- configure.ac.orig	2009-08-10 19:00:17.840556901 -0700
++++ configure.ac	2009-08-10 19:00:40.631798877 -0700
+@@ -199,7 +199,7 @@
+     AM_CHECK_PYMOD(gtkmozembed,,,AC_MSG_ERROR([python module gtkmozembed required (python-gnome2-extras)]))
+     fi
+     if test "$with_gconf" != "no"; then
+-    # calendar, media-control, media-player, mount-applet, stacks
++    # calendar, media-control, media-player, stacks
+     AM_CHECK_PYMOD(gconf,,,AC_MSG_ERROR([python module gconf required]))
+     # lastfm, media-player
+     AM_CHECK_PYMOD(gst,,,AC_MSG_ERROR([python module gstreamer required (python-gst0.10)]))
+@@ -340,7 +340,6 @@
+ src/media-icon-next/Makefile
+ src/media-icon-play/Makefile
+ src/media-player/Makefile
+-src/mount-applet/Makefile
+ src/MiMenu/Makefile
+ src/notification-area/Makefile
+ src/notification-area/notification-area.desktop.in
+--- src/Makefile.in.orig	2009-08-10 19:01:56.629239381 -0700
++++ src/Makefile.in	2009-08-10 19:02:15.923274236 -0700
+@@ -47,7 +47,6 @@
+ @WITH_GCONF_TRUE@am__append_2 = \
+ @WITH_GCONF_TRUE@	notification-daemon	\
+ @WITH_GCONF_TRUE@	media-control		\
+-@WITH_GCONF_TRUE@	mount-applet		\
+ @WITH_GCONF_TRUE@	$(NULL)
+ 
+ # --with-gnome
+@@ -92,7 +91,7 @@
+ 	shiny-switcher showdesktop thinkhdaps to-do tomboy-applet \
+ 	weather wobblyzini awnsystemmonitor cairo-menu \
+ 	calendar filebrowser plugger stacks trasher \
+-	notification-daemon media-control mount-applet digg main-menu \
++	notification-daemon media-control digg main-menu \
+ 	MiMenu pandora rtm trash vala-test webapplet
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-04-disable-file-browser-launcher.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,29 @@
+--- configure.ac.orig	2009-08-10 19:41:48.624601281 -0700
++++ configure.ac	2009-08-10 19:46:19.657643757 -0700
+@@ -320,7 +320,6 @@
+ src/DesktopManager/Makefile
+ src/digg/Makefile
+ src/digitalClock/Makefile
+-src/file-browser-launcher/Makefile
+ src/filebrowser/Makefile
+ src/filebrowser/filebrowser.desktop.in
+ src/lastfm/Makefile
+--- src/Makefile.in.orig	2009-08-10 19:41:53.091231366 -0700
++++ src/Makefile.in	2009-08-10 19:46:48.027330354 -0700
+@@ -85,7 +85,7 @@
+ CTAGS = ctags
+ DIST_SUBDIRS = libawn-extras animal-farm arss awn-meebo awnterm \
+ 	battery-applet cairo-clock comic comics cpufreq DesktopManager \
+-	digitalClock file-browser-launcher lastfm mail media-icon-back \
++	digitalClock lastfm mail media-icon-back \
+ 	media-icon-next media-icon-play media-player notification-area \
+ 	places pynot pynot-rgba python-test quit-applet separator \
+ 	shiny-switcher showdesktop thinkhdaps to-do tomboy-applet \
+@@ -360,7 +360,6 @@
+ 	cpufreq			\
+ 	DesktopManager		\
+ 	digitalClock		\
+-	file-browser-launcher	\
+ 	lastfm			\
+ 	mail			\
+ 	media-icon-back		\
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-05-disable-thinkhdaps.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,29 @@
+--- configure.ac.orig	2009-08-10 21:16:48.755729304 -0700
++++ configure.ac	2009-08-10 21:17:35.796524035 -0700
+@@ -364,7 +364,6 @@
+ src/shiny-switcher/shinyswitcher.desktop.in
+ src/showdesktop/Makefile
+ src/stacks/Makefile
+-src/thinkhdaps/Makefile
+ src/to-do/Makefile
+ src/tomboy-applet/Makefile
+ src/trash/Makefile
+--- src/Makefile.in.orig	2009-08-10 21:17:03.750353743 -0700
++++ src/Makefile.in	2009-08-10 21:17:42.828725652 -0700
+@@ -88,7 +88,7 @@
+ 	digitalClock lastfm mail media-icon-back \
+ 	media-icon-next media-icon-play media-player notification-area \
+ 	places pynot pynot-rgba python-test quit-applet separator \
+-	shiny-switcher showdesktop thinkhdaps to-do tomboy-applet \
++	shiny-switcher showdesktop to-do tomboy-applet \
+ 	weather wobblyzini awnsystemmonitor cairo-menu \
+ 	calendar filebrowser plugger stacks trasher \
+ 	notification-daemon media-control digg main-menu \
+@@ -375,7 +375,6 @@
+ 	separator		\
+ 	shiny-switcher		\
+ 	showdesktop		\
+-	thinkhdaps			\
+ 	to-do				\
+ 	tomboy-applet		\
+ 	weather			\
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-06-disable-stacks.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,107 @@
+--- configure.ac.orig	2009-08-10 21:18:21.329019988 -0700
++++ configure.ac	2009-08-10 21:18:52.462876055 -0700
+@@ -189,17 +189,13 @@
+     AM_CHECK_PYMOD(gmenu,,,AC_MSG_ERROR([python module gmenu required]))
+     fi
+     if test "$with_gconf" != "no" -o "$with_gnome" != "no"; then
+-    # stacks
+-    AM_CHECK_PYMOD(gnomedesktop,,,AC_MSG_ERROR([python module gnomedesktop required]))
+-    # calendar, stacks
++    # calendar
+     AM_CHECK_PYMOD(gnomevfs,,,AC_MSG_ERROR([python module gnomevfs required]))
+-    # stacks
+-    AM_CHECK_PYMOD(gnome.ui,,,AC_MSG_ERROR([python module gnome.ui required]))
+     # awn-meebo, digg, pandora
+     AM_CHECK_PYMOD(gtkmozembed,,,AC_MSG_ERROR([python module gtkmozembed required (python-gnome2-extras)]))
+     fi
+     if test "$with_gconf" != "no"; then
+-    # calendar, media-control, media-player, stacks
++    # calendar, media-control, media-player
+     AM_CHECK_PYMOD(gconf,,,AC_MSG_ERROR([python module gconf required]))
+     # lastfm, media-player
+     AM_CHECK_PYMOD(gst,,,AC_MSG_ERROR([python module gstreamer required (python-gst0.10)]))
+@@ -363,7 +359,6 @@
+ src/shiny-switcher/Makefile
+ src/shiny-switcher/shinyswitcher.desktop.in
+ src/showdesktop/Makefile
+-src/stacks/Makefile
+ src/to-do/Makefile
+ src/tomboy-applet/Makefile
+ src/trash/Makefile
+--- src/Makefile.in.orig	2009-08-10 21:18:27.936918843 -0700
++++ src/Makefile.in	2009-08-10 21:19:02.623483668 -0700
+@@ -39,7 +39,6 @@
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	calendar		\
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	filebrowser		\
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	plugger			\
+-@WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	stacks			\
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	trasher			\
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	$(NULL)
+ 
+@@ -90,7 +89,7 @@
+ 	places pynot pynot-rgba python-test quit-applet separator \
+ 	shiny-switcher showdesktop to-do tomboy-applet \
+ 	weather wobblyzini awnsystemmonitor cairo-menu \
+-	calendar filebrowser plugger stacks trasher \
++	calendar filebrowser plugger trasher \
+ 	notification-daemon media-control digg main-menu \
+ 	MiMenu pandora rtm trash vala-test webapplet
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+--- configure.ac.orig	2009-08-10 22:02:45.943035884 -0700
++++ configure.ac	2009-08-10 22:03:23.118141332 -0700
+@@ -89,7 +89,7 @@
+ # awn-terminal
+ PKG_CHECK_MODULES(VTE, [vte])
+ 
+-# awn-system-monitor, cairo-menu, filebrowser, notification-daemon, plugger, trasher
++# awn-system-monitor, cairo-menu, filebrowser, notification-daemon
+ if test "$with_gconf" != "no" -a "$config_backend" != "GConf"; then
+   PKG_CHECK_MODULES(GCONF, [gconf-2.0])
+   gconf=gconf-2.0
+@@ -100,7 +100,7 @@
+ PKG_CHECK_MODULES(GNOMEUI, [libgnomeui-2.0])
+ # filebrowser
+ PKG_CHECK_MODULES(GNOME_DESKTOP, [gnome-desktop-2.0])
+-# filebrowser, cairo-menu, plugger, trash, trasher
++# filebrowser, cairo-menu, trash
+ PKG_CHECK_MODULES(GNOME_VFS, [gnome-vfs-2.0])
+ # awn-system-monitor
+ PKG_CHECK_MODULES(GTOP, [libgtop-2.0])
+@@ -347,8 +347,6 @@
+ src/pandora/Makefile
+ src/places/Makefile
+ src/places/places.desktop.in
+-src/plugger/Makefile
+-src/plugger/plugger.desktop.in
+ src/pynot/Makefile
+ src/pynot-rgba/Makefile
+ src/python-test/Makefile
+@@ -363,8 +361,6 @@
+ src/tomboy-applet/Makefile
+ src/trash/Makefile
+ src/trash/trash.desktop.in
+-src/trasher/Makefile
+-src/trasher/trasher.desktop.in
+ src/vala-test/Makefile
+ src/vala-test/vala-test.desktop.in
+ src/weather/Makefile
+--- src/Makefile.in.orig	2009-08-10 22:02:49.231753699 -0700
++++ src/Makefile.in	2009-08-10 22:03:33.214720812 -0700
+@@ -38,8 +38,6 @@
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	cairo-menu		\
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	calendar		\
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	filebrowser		\
+-@WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	plugger			\
+-@WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	trasher			\
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	$(NULL)
+ 
+ # --with-gconf
+@@ -89,7 +87,7 @@
+ 	places pynot pynot-rgba python-test quit-applet separator \
+ 	shiny-switcher showdesktop to-do tomboy-applet \
+ 	weather wobblyzini awnsystemmonitor cairo-menu \
+-	calendar filebrowser plugger trasher \
++	calendar filebrowser \
+ 	notification-daemon media-control digg main-menu \
+ 	MiMenu pandora rtm trash vala-test webapplet
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-07-disable-cairo-clock.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,38 @@
+--- configure.ac.orig	2009-08-10 21:19:39.875584590 -0700
++++ configure.ac	2009-08-10 21:20:17.801878254 -0700
+@@ -182,8 +182,6 @@
+     AM_CHECK_PYMOD(pynotify,,,AC_MSG_ERROR([python module pynotify required (python-notify)]))
+     # arss, mail
+     AM_CHECK_PYMOD(feedparser,,,AC_MSG_ERROR([python module feedparser required (python-feedparser)]))
+-    # cairo-clock
+-    AM_CHECK_PYMOD(rsvg,,,AC_MSG_ERROR([python module rsvg required (gnome-python-desktop)]))
+     if test "$with_gnome" != "no"; then
+     # MiMenu
+     AM_CHECK_PYMOD(gmenu,,,AC_MSG_ERROR([python module gmenu required]))
+@@ -291,7 +289,6 @@
+ src/awnterm/Makefile
+ src/awnterm/awnterm.desktop.in
+ src/battery-applet/Makefile
+-src/cairo-clock/Makefile
+ src/cairo-menu/Makefile
+ src/cairo-menu/cairo_main_menu.desktop.in
+ src/calendar/Makefile
+--- src/Makefile.in.orig	2009-08-10 21:19:34.139709761 -0700
++++ src/Makefile.in	2009-08-10 21:20:35.186426854 -0700
+@@ -83,7 +83,7 @@
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = libawn-extras animal-farm arss awn-meebo awnterm \
+-	battery-applet cairo-clock comic comics cpufreq DesktopManager \
++	battery-applet comic comics cpufreq DesktopManager \
+ 	digitalClock lastfm mail media-icon-back \
+ 	media-icon-next media-icon-play media-player notification-area \
+ 	places pynot pynot-rgba python-test quit-applet separator \
+@@ -353,7 +353,6 @@
+ 	awn-meebo		\
+ 	awnterm			\
+ 	battery-applet		\
+-	cairo-clock		\
+ 	comic			\
+ 	comics			\
+ 	cpufreq			\
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-08-disable-cairo-main-menu.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,65 @@
+--- configure.ac.orig	2009-08-10 22:08:25.875016944 -0700
++++ configure.ac	2009-08-10 22:09:12.553657753 -0700
+@@ -81,7 +81,7 @@
+ PKG_CHECK_MODULES(LIBX11, [x11])
+ PKG_CHECK_MODULES(COMPOSITE, [xcomposite])
+ PKG_CHECK_MODULES(XRENDER, [xrender])
+-# cairo-menu, notification-daemon
++# notification-daemon
+ PKG_CHECK_MODULES(LIBSEXY, [libsexy])
+ PKG_CHECK_MODULES(LIBNOTIFY, [libnotify])
+ # standalone-launcher, taskmand, taskmand-applet
+@@ -89,7 +89,7 @@
+ # awn-terminal
+ PKG_CHECK_MODULES(VTE, [vte])
+ 
+-# awn-system-monitor, cairo-menu, filebrowser, notification-daemon
++# awn-system-monitor, filebrowser, notification-daemon
+ if test "$with_gconf" != "no" -a "$config_backend" != "GConf"; then
+   PKG_CHECK_MODULES(GCONF, [gconf-2.0])
+   gconf=gconf-2.0
+@@ -100,14 +100,14 @@
+ PKG_CHECK_MODULES(GNOMEUI, [libgnomeui-2.0])
+ # filebrowser
+ PKG_CHECK_MODULES(GNOME_DESKTOP, [gnome-desktop-2.0])
+-# filebrowser, cairo-menu, trash
++# filebrowser, trash
+ PKG_CHECK_MODULES(GNOME_VFS, [gnome-vfs-2.0])
+ # awn-system-monitor
+ PKG_CHECK_MODULES(GTOP, [libgtop-2.0])
+ fi
+ 
+ if test "$with_gnome" != "no"; then
+-# main-menu, cairo-menu
++# main-menu
+ PKG_CHECK_MODULES(GNOME_MENU, [libgnome-menu])
+ fi
+ 
+@@ -289,8 +289,6 @@
+ src/awnterm/Makefile
+ src/awnterm/awnterm.desktop.in
+ src/battery-applet/Makefile
+-src/cairo-menu/Makefile
+-src/cairo-menu/cairo_main_menu.desktop.in
+ src/calendar/Makefile
+ src/calendar/google/Makefile
+ src/calendar/google/atom/Makefile
+--- src/Makefile.in.orig	2009-08-10 22:08:31.451299741 -0700
++++ src/Makefile.in	2009-08-10 22:09:24.074017178 -0700
+@@ -35,7 +35,6 @@
+ # --with-gnome --with-gconf
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@am__append_1 = \
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	awnsystemmonitor	\
+-@WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	cairo-menu		\
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	calendar		\
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	filebrowser		\
+ @WITH_GCONF_TRUE@@WITH_GNOME_TRUE@	$(NULL)
+@@ -86,7 +85,7 @@
+ 	media-icon-next media-icon-play media-player notification-area \
+ 	places pynot pynot-rgba python-test quit-applet separator \
+ 	shiny-switcher showdesktop to-do tomboy-applet \
+-	weather wobblyzini awnsystemmonitor cairo-menu \
++	weather wobblyzini awnsystemmonitor \
+ 	calendar filebrowser \
+ 	notification-daemon media-control digg main-menu \
+ 	MiMenu pandora rtm trash vala-test webapplet
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-09-disable-cpufreq-monitor.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,29 @@
+--- configure.ac.orig	2009-08-10 21:22:34.665557161 -0700
++++ configure.ac	2009-08-10 21:22:57.439835026 -0700
+@@ -307,7 +307,6 @@
+ src/comics/locale/Makefile
+ src/comics/locale/sv_SE/Makefile
+ src/comics/locale/sv_SE/LC_MESSAGES/Makefile
+-src/cpufreq/Makefile
+ src/DesktopManager/Makefile
+ src/digg/Makefile
+ src/digitalClock/Makefile
+--- src/Makefile.in.orig	2009-08-10 21:22:39.080976411 -0700
++++ src/Makefile.in	2009-08-10 21:23:05.311490579 -0700
+@@ -82,7 +82,7 @@
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = libawn-extras animal-farm arss awn-meebo awnterm \
+-	battery-applet comic comics cpufreq DesktopManager \
++	battery-applet comic comics DesktopManager \
+ 	digitalClock lastfm mail media-icon-back \
+ 	media-icon-next media-icon-play media-player notification-area \
+ 	places pynot pynot-rgba python-test quit-applet separator \
+@@ -354,7 +354,6 @@
+ 	battery-applet		\
+ 	comic			\
+ 	comics			\
+-	cpufreq			\
+ 	DesktopManager		\
+ 	digitalClock		\
+ 	lastfm			\
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-10-disable-desktop-manager.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,29 @@
+--- configure.ac.orig	2009-08-10 21:23:54.387853614 -0700
++++ configure.ac	2009-08-10 21:24:43.314689873 -0700
+@@ -307,7 +307,6 @@
+ src/comics/locale/Makefile
+ src/comics/locale/sv_SE/Makefile
+ src/comics/locale/sv_SE/LC_MESSAGES/Makefile
+-src/DesktopManager/Makefile
+ src/digg/Makefile
+ src/digitalClock/Makefile
+ src/filebrowser/Makefile
+--- src/Makefile.in.orig	2009-08-10 21:23:57.876136682 -0700
++++ src/Makefile.in	2009-08-10 21:24:50.331425674 -0700
+@@ -82,7 +82,7 @@
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = libawn-extras animal-farm arss awn-meebo awnterm \
+-	battery-applet comic comics DesktopManager \
++	battery-applet comic comics \
+ 	digitalClock lastfm mail media-icon-back \
+ 	media-icon-next media-icon-play media-player notification-area \
+ 	places pynot pynot-rgba python-test quit-applet separator \
+@@ -354,7 +354,6 @@
+ 	battery-applet		\
+ 	comic			\
+ 	comics			\
+-	DesktopManager		\
+ 	digitalClock		\
+ 	lastfm			\
+ 	mail			\
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-11-disable-digital-clock.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,29 @@
+--- configure.ac.orig	2009-08-10 21:25:30.943070482 -0700
++++ configure.ac	2009-08-10 21:25:42.919600338 -0700
+@@ -308,7 +308,6 @@
+ src/comics/locale/sv_SE/Makefile
+ src/comics/locale/sv_SE/LC_MESSAGES/Makefile
+ src/digg/Makefile
+-src/digitalClock/Makefile
+ src/filebrowser/Makefile
+ src/filebrowser/filebrowser.desktop.in
+ src/lastfm/Makefile
+--- src/Makefile.in.orig	2009-08-10 21:25:33.063680613 -0700
++++ src/Makefile.in	2009-08-10 21:25:49.572954992 -0700
+@@ -83,7 +83,7 @@
+ CTAGS = ctags
+ DIST_SUBDIRS = libawn-extras animal-farm arss awn-meebo awnterm \
+ 	battery-applet comic comics \
+-	digitalClock lastfm mail media-icon-back \
++	lastfm mail media-icon-back \
+ 	media-icon-next media-icon-play media-player notification-area \
+ 	places pynot pynot-rgba python-test quit-applet separator \
+ 	shiny-switcher showdesktop to-do tomboy-applet \
+@@ -354,7 +354,6 @@
+ 	battery-applet		\
+ 	comic			\
+ 	comics			\
+-	digitalClock		\
+ 	lastfm			\
+ 	mail			\
+ 	media-icon-back		\
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/avant-extras-12-rss-sqlite.diff	Tue Aug 11 06:23:02 2009 +0000
@@ -0,0 +1,38 @@
+--- configure.ac.orig	2009-08-10 21:26:32.112768928 -0700
++++ configure.ac	2009-08-10 21:26:44.526718401 -0700
+@@ -180,7 +180,7 @@
+ if test x${enable_pymod_checks} = xyes; then
+     # battery-applet
+     AM_CHECK_PYMOD(pynotify,,,AC_MSG_ERROR([python module pynotify required (python-notify)]))
+-    # arss, mail
++    # mail
+     AM_CHECK_PYMOD(feedparser,,,AC_MSG_ERROR([python module feedparser required (python-feedparser)]))
+     if test "$with_gnome" != "no"; then
+     # MiMenu
+@@ -282,7 +282,6 @@
+ po/Makefile.in
+ src/Makefile
+ src/animal-farm/Makefile
+-src/arss/Makefile
+ src/awn-meebo/Makefile
+ src/awnsystemmonitor/Makefile
+ src/awnsystemmonitor/awnsystemmonitor.desktop.in
+--- src/Makefile.in.orig	2009-08-10 21:26:34.544819826 -0700
++++ src/Makefile.in	2009-08-10 21:26:50.055307432 -0700
+@@ -81,7 +81,7 @@
+   distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = libawn-extras animal-farm arss awn-meebo awnterm \
++DIST_SUBDIRS = libawn-extras animal-farm awn-meebo awnterm \
+ 	battery-applet comic comics \
+ 	lastfm mail media-icon-back \
+ 	media-icon-next media-icon-play media-player notification-area \
+@@ -348,7 +348,6 @@
+ SUBDIRS = \
+ 	libawn-extras		\
+ 	animal-farm		\
+-	arss			\
+ 	awn-meebo		\
+ 	awnterm			\
+ 	battery-applet		\