[f-spot] Move gnome-keyring-sharp to lib/

[Ruben Vermeersch <rubenv src gnome org>]

commit 3f122fcc82fc510138cc12f6cb9f77634ec63313
Author: Ruben Vermeersch <ruben savanne be>
Date:   Fri Jul 17 23:27:12 2009 +0200

    Move gnome-keyring-sharp to lib/

 Makefile.am                                        |    2 --
 Makefile.include                                   |    2 +-
 configure.ac                                       |    2 +-
 lib/Makefile.am                                    |    1 +
 .../gnome-keyring-sharp}/.gitignore                |    0
 .../gnome-keyring-sharp}/AccessRights.cs           |    0
 .../gnome-keyring-sharp}/AssemblyInfo.cs           |    0
 .../gnome-keyring-sharp}/AttributeType.cs          |    0
 .../gnome-keyring-sharp}/GenericItemData.cs        |    0
 .../gnome-keyring-sharp}/ItemACL.cs                |    0
 .../gnome-keyring-sharp}/ItemData.cs               |    0
 .../gnome-keyring-sharp}/ItemType.cs               |    0
 .../gnome-keyring-sharp}/KeyringException.cs       |    0
 .../gnome-keyring-sharp}/KeyringInfo.cs            |    0
 .../gnome-keyring-sharp}/Makefile.am               |    0
 .../gnome-keyring-sharp}/NetItemData.cs            |    0
 .../gnome-keyring-sharp}/NoteItemData.cs           |    0
 .../gnome-keyring-sharp}/Operation.cs              |    0
 .../gnome-keyring-sharp}/RequestMessage.cs         |    0
 .../gnome-keyring-sharp}/ResponseMessage.cs        |    0
 .../gnome-keyring-sharp}/ResultCode.cs             |    0
 .../gnome-keyring-sharp}/Ring.cs                   |    0
 src/f-spot.in                                      |    2 +-
 23 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 09b75dc..cc180b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ SUBDIRS = 		\
 	gio-sharp	\
 	gtk-sharp-beans	\
 	docs		\
-	gnome-keyring-sharp \
 	icons		\
 	tools		\
 	po		\
@@ -22,7 +21,6 @@ DIST_SUBDIRS = 		\
 	dbus-sharp-glib	\
 	dpap-sharp	\
 	docs		\
-	gnome-keyring-sharp \
 	icons		\
 	tools		\
 	po		\
diff --git a/Makefile.include b/Makefile.include
index 745a9ad..4718574 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -12,7 +12,7 @@ DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
 DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
 DIR_ICONS = $(top_builddir)/icons
 DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
-DIR_KEYRING = $(top_builddir)/gnome-keyring-sharp
+DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
 DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
 DIR_SEMWEB = $(top_builddir)/lib/semweb
 DIR_SRC = $(top_builddir)/src
diff --git a/configure.ac b/configure.ac
index 347992e..82b60ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,6 +285,7 @@ Makefile
 lib/GKeyFile/Makefile
 lib/glitz-sharp/Makefile
 lib/glitz-sharp/src/Makefile
+lib/gnome-keyring-sharp/Makefile
 lib/libfspot/Makefile
 lib/libfspotraw/Makefile
 lib/libjpegtran/Makefile
@@ -309,7 +310,6 @@ dpap-sharp/dpap-server/Makefile
 dpap-sharp/DPAPService/Makefile
 dpap-sharp/DPAPBrowser/Makefile
 docs/Makefile
-gnome-keyring-sharp/Makefile
 icons/Makefile
 tools/Makefile
 po/Makefile.in
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0333d8c..628a0f2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,6 +4,7 @@
 SUBDIRS = 				\
 	GKeyFile 			\
 	glitz-sharp			\
+	gnome-keyring-sharp	\
 	libjpegtran			\
 	libfspot			\
 	libgphoto2-sharp	\
diff --git a/gnome-keyring-sharp/.gitignore b/lib/gnome-keyring-sharp/.gitignore
similarity index 100%
rename from gnome-keyring-sharp/.gitignore
rename to lib/gnome-keyring-sharp/.gitignore
diff --git a/gnome-keyring-sharp/AccessRights.cs b/lib/gnome-keyring-sharp/AccessRights.cs
similarity index 100%
rename from gnome-keyring-sharp/AccessRights.cs
rename to lib/gnome-keyring-sharp/AccessRights.cs
diff --git a/gnome-keyring-sharp/AssemblyInfo.cs b/lib/gnome-keyring-sharp/AssemblyInfo.cs
similarity index 100%
rename from gnome-keyring-sharp/AssemblyInfo.cs
rename to lib/gnome-keyring-sharp/AssemblyInfo.cs
diff --git a/gnome-keyring-sharp/AttributeType.cs b/lib/gnome-keyring-sharp/AttributeType.cs
similarity index 100%
rename from gnome-keyring-sharp/AttributeType.cs
rename to lib/gnome-keyring-sharp/AttributeType.cs
diff --git a/gnome-keyring-sharp/GenericItemData.cs b/lib/gnome-keyring-sharp/GenericItemData.cs
similarity index 100%
rename from gnome-keyring-sharp/GenericItemData.cs
rename to lib/gnome-keyring-sharp/GenericItemData.cs
diff --git a/gnome-keyring-sharp/ItemACL.cs b/lib/gnome-keyring-sharp/ItemACL.cs
similarity index 100%
rename from gnome-keyring-sharp/ItemACL.cs
rename to lib/gnome-keyring-sharp/ItemACL.cs
diff --git a/gnome-keyring-sharp/ItemData.cs b/lib/gnome-keyring-sharp/ItemData.cs
similarity index 100%
rename from gnome-keyring-sharp/ItemData.cs
rename to lib/gnome-keyring-sharp/ItemData.cs
diff --git a/gnome-keyring-sharp/ItemType.cs b/lib/gnome-keyring-sharp/ItemType.cs
similarity index 100%
rename from gnome-keyring-sharp/ItemType.cs
rename to lib/gnome-keyring-sharp/ItemType.cs
diff --git a/gnome-keyring-sharp/KeyringException.cs b/lib/gnome-keyring-sharp/KeyringException.cs
similarity index 100%
rename from gnome-keyring-sharp/KeyringException.cs
rename to lib/gnome-keyring-sharp/KeyringException.cs
diff --git a/gnome-keyring-sharp/KeyringInfo.cs b/lib/gnome-keyring-sharp/KeyringInfo.cs
similarity index 100%
rename from gnome-keyring-sharp/KeyringInfo.cs
rename to lib/gnome-keyring-sharp/KeyringInfo.cs
diff --git a/gnome-keyring-sharp/Makefile.am b/lib/gnome-keyring-sharp/Makefile.am
similarity index 100%
rename from gnome-keyring-sharp/Makefile.am
rename to lib/gnome-keyring-sharp/Makefile.am
diff --git a/gnome-keyring-sharp/NetItemData.cs b/lib/gnome-keyring-sharp/NetItemData.cs
similarity index 100%
rename from gnome-keyring-sharp/NetItemData.cs
rename to lib/gnome-keyring-sharp/NetItemData.cs
diff --git a/gnome-keyring-sharp/NoteItemData.cs b/lib/gnome-keyring-sharp/NoteItemData.cs
similarity index 100%
rename from gnome-keyring-sharp/NoteItemData.cs
rename to lib/gnome-keyring-sharp/NoteItemData.cs
diff --git a/gnome-keyring-sharp/Operation.cs b/lib/gnome-keyring-sharp/Operation.cs
similarity index 100%
rename from gnome-keyring-sharp/Operation.cs
rename to lib/gnome-keyring-sharp/Operation.cs
diff --git a/gnome-keyring-sharp/RequestMessage.cs b/lib/gnome-keyring-sharp/RequestMessage.cs
similarity index 100%
rename from gnome-keyring-sharp/RequestMessage.cs
rename to lib/gnome-keyring-sharp/RequestMessage.cs
diff --git a/gnome-keyring-sharp/ResponseMessage.cs b/lib/gnome-keyring-sharp/ResponseMessage.cs
similarity index 100%
rename from gnome-keyring-sharp/ResponseMessage.cs
rename to lib/gnome-keyring-sharp/ResponseMessage.cs
diff --git a/gnome-keyring-sharp/ResultCode.cs b/lib/gnome-keyring-sharp/ResultCode.cs
similarity index 100%
rename from gnome-keyring-sharp/ResultCode.cs
rename to lib/gnome-keyring-sharp/ResultCode.cs
diff --git a/gnome-keyring-sharp/Ring.cs b/lib/gnome-keyring-sharp/Ring.cs
similarity index 100%
rename from gnome-keyring-sharp/Ring.cs
rename to lib/gnome-keyring-sharp/Ring.cs
diff --git a/src/f-spot.in b/src/f-spot.in
index 022dbc1..96ac608 100644
--- a/src/f-spot.in
+++ b/src/f-spot.in
@@ -60,7 +60,7 @@ for arg in "$@"; do
 	x--uninstalled)
 	    echo "*** Running uninstalled f-spot ***"
 	    EXE_TO_RUN="./f-spot.exe"
-	    export MONO_PATH= PATH_DBUS@../lib/Tao/Tao.OpenGl:../lib/Tao/Tao.OpenGl.Glu:../lib/Tao/Tao.OpenGl.ExtensionLoader:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../lib/libgphoto2-sharp:../lib/semweb:../lib/glitz-sharp/src/:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../gio-sharp/gio:../gtk-sharp-beans:$MONO_PATH
+	    export MONO_PATH= PATH_DBUS@../lib/Tao/Tao.OpenGl:../lib/Tao/Tao.OpenGl.Glu:../lib/Tao/Tao.OpenGl.ExtensionLoader:../lib/gnome-keyring-sharp:../lib/libgphoto2-sharp:../lib/semweb:../lib/glitz-sharp/src/:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../gio-sharp/gio:../gtk-sharp-beans:$MONO_PATH
 	    ;;
     esac
 done