[f-spot: 8/8] Merge branch 'FSPOT_0_6_0_STABLE'

[Stephane Delcroix <sdelcroix src gnome org>]

commit 7deb811fb9dd6e92a735fa73ff7824c97ee54bc3
Merge: 423c01d... 755aecf...
Author: Stephane Delcroix <stephane delcroix org>
Date:   Wed Aug 19 15:03:11 2009 +0200

    Merge branch 'FSPOT_0_6_0_STABLE'

 Makefile.include                                   |    8 -
 configure.ac                                       |    7 +-
 extensions/Makefile.am                             |    3 +-
 .../CoverTransition/CoverTransition.addin.xml      |   15 +
 .../Transitions/CoverTransition/CoverTransition.cs |   59 +
 extensions/Transitions/CoverTransition/Makefile.am |   52 +
 extensions/Transitions/Makefile.am                 |    2 +
 lib/Makefile.am                                    |    3 +-
 lib/Tao/.gitignore                                 |    4 -
 lib/Tao/COPYING                                    |   22 -
 lib/Tao/Makefile.am                                |    7 -
 lib/Tao/Tao.GlPostProcess/.gitignore               |    4 -
 lib/Tao/Tao.GlPostProcess/AssemblyInfo.cs          |   66 -
 lib/Tao/Tao.GlPostProcess/GlPostProcess.cs         |  588 -
 lib/Tao/Tao.GlPostProcess/Makefile.am              |   29 -
 lib/Tao/Tao.GlPostProcess/Tao.GlPostProcess.snk    |  Bin 596 -> 0 bytes
 lib/Tao/Tao.OpenGl.ExtensionLoader/.gitignore      |    4 -
 lib/Tao/Tao.OpenGl.ExtensionLoader/AssemblyInfo.cs |   52 -
 .../GlExtensionLoader.cs                           |  425 -
 lib/Tao/Tao.OpenGl.ExtensionLoader/Makefile.am     |   35 -
 .../Tao.OpenGl.ExtensionLoader.dll.config          |    4 -
 .../Tao.OpenGl.ExtensionLoader.snk                 |  Bin 596 -> 0 bytes
 lib/Tao/Tao.OpenGl.Glu/.gitignore                  |    4 -
 lib/Tao/Tao.OpenGl.Glu/AssemblyInfo.cs             |   53 -
 lib/Tao/Tao.OpenGl.Glu/Glu.cs                      |48356 --------------------
 lib/Tao/Tao.OpenGl.Glu/Makefile.am                 |   36 -
 lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.dll.config   |    4 -
 lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.snk          |  Bin 596 -> 0 bytes
 lib/Tao/Tao.OpenGl.Glu/Tao.OpenGl.Glu.xml          |46954 -------------------
 lib/Tao/Tao.OpenGl/.gitignore                      |    4 -
 lib/Tao/Tao.OpenGl/AssemblyInfo.cs                 |   53 -
 lib/Tao/Tao.OpenGl/ContextGl.cs                    |39495 ----------------
 lib/Tao/Tao.OpenGl/Gl.cs                           |42310 -----------------
 lib/Tao/Tao.OpenGl/Makefile.am                     |   46 -
 lib/Tao/Tao.OpenGl/Tao.OpenGl.dll.config           |    4 -
 lib/Tao/Tao.OpenGl/Tao.OpenGl.snk                  |  Bin 596 -> 0 bytes
 po/POTFILES.in                                     |    1 -
 src/Bling/Animation.cs                             |    8 +-
 src/Bling/DoubleAnimation.cs                       |    8 +
 src/Bling/EasedAnimation.cs                        |    9 +
 src/Extensions/TransitionNode.cs                   |   34 +
 src/FSpot.addin.xml                                |   11 +-
 src/FullScreenView.cs                              |   27 +-
 src/GdkGlx.cs                                      |    1 -
 src/GlTransition.cs                                |  394 -
 src/Makefile.am                                    |   14 +-
 src/Texture.cs                                     |  163 -
 src/TextureDisplay.cs                              |  452 -
 src/Widgets/CairoTransition.cs                     |   38 +
 src/Widgets/DissolveTransition.cs                  |   57 +
 src/Widgets/PushTransition.cs                      |   80 +
 src/Widgets/SlideShow.cs                           |  157 +
 src/Widgets/SlideShowTransition.cs                 |   37 +
 53 files changed, 603 insertions(+), 179596 deletions(-)
---
diff --cc lib/Makefile.am
index 5c37805,f2adf82..d1480d7
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -11,12 -11,15 +11,11 @@@ UNCONDITIONAL_SUBDIRS = 
  	libfspot			\
  	libgphoto2-sharp	\
  	mono-addins			\
- 	semweb				\
- 	Tao
+ 	semweb
  
 -# Depending on whether the packaged ndesk-dbus is used, we might not want to
 -# build it, but we will always want to ship it. Also, dpap-sharp isn't built,
 -# but it is shipped.
 +# dpap-sharp isn't built, but it is shipped.
  
  SUBDIRS = 				\
 -	$(DIR_DBUS)			\
 -	$(DIR_DBUS_GLIB)	\
  	$(UNCONDITIONAL_SUBDIRS)
  
  DIST_SUBDIRS = 			\