[banshee/hyena-submodule] [hyena] Move to src/Hyena

[Gabriel Burt <gburt src gnome org>]

commit ec22ea7627779840f40a4845bc7be9b12715ef1f
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Fri Jul 9 14:19:41 2010 -0700

    [hyena] Move to src/Hyena

 .gitmodules      |    4 ++--
 Banshee.sln      |    8 ++++----
 Makefile.am      |    1 -
 configure.ac     |   14 +++++++-------
 lib/Hyena        |    1 -
 po/POTFILES.in   |   34 +++++++++++++++++-----------------
 po/POTFILES.skip |    2 +-
 src/Hyena        |    1 +
 src/Makefile.am  |    1 +
 9 files changed, 33 insertions(+), 33 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index a894988..7a550da 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "lib/Hyena"]
-	path = lib/Hyena
+[submodule "src/Hyena"]
+	path = src/Hyena
 	url = git://git.gnome.org/hyena
diff --git a/Banshee.sln b/Banshee.sln
index eb50ec2..7ba9785 100644
--- a/Banshee.sln
+++ b/Banshee.sln
@@ -130,11 +130,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena", "lib\Hyena\src\Hyena\Hyena.csproj", "{95374549-9553-4C1E-9D89-667755F90E12}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena", "src\Hyena\Hyena\Hyena.csproj", "{95374549-9553-4C1E-9D89-667755F90E12}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Data.Sqlite", "lib\Hyena\src\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj", "{95374549-9553-4C1E-9D89-667755F90E13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Data.Sqlite", "src\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj", "{95374549-9553-4C1E-9D89-667755F90E13}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Gui", "lib\Hyena\src\Hyena.Gui\Hyena.Gui.csproj", "{C856EFD8-E812-4E61-8B76-E3583D94C233}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Gui", "src\Hyena\Hyena.Gui\Hyena.Gui.csproj", "{C856EFD8-E812-4E61-8B76-E3583D94C233}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lastfm", "src\Libraries\Lastfm\Lastfm.csproj", "{C1F63FC5-4B96-48B2-B7F7-5B33FCC4F2A2}"
 EndProject
@@ -148,7 +148,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicBrainz", "src\Librarie
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Migo", "src\Libraries\Migo\Migo.csproj", "{9C7B8E9C-A4E6-4459-A2C4-3D2D199EA919}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Data.Sqlite", "lib\Hyena\src\Mono.Data.Sqlite\Mono.Data.Sqlite.csproj", "{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Data.Sqlite", "src\Hyena\Mono.Data.Sqlite\Mono.Data.Sqlite.csproj", "{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "metrics", "extras\metrics\metrics.csproj", "{6D17167C-AC3F-4D40-A652-46627276A9A1}"
 EndProject
diff --git a/Makefile.am b/Makefile.am
index 261109f..496c2a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ SUBDIRS = \
 	help \
 	libbanshee \
 	gstreamer \
-	lib/Hyena \
 	src \
 	docs \
 	tests \
diff --git a/configure.ac b/configure.ac
index a01a095..9dd2678 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,13 +268,13 @@ libbanshee/Makefile
 gstreamer/Makefile
 gstreamer/equalizer/Makefile
 
-lib/Hyena/Makefile
-lib/Hyena/build/Makefile
-lib/Hyena/build/m4/Makefile
-lib/Hyena/src/Mono.Data.Sqlite/Makefile
-lib/Hyena/src/Hyena/Makefile
-lib/Hyena/src/Hyena.Data.Sqlite/Makefile
-lib/Hyena/src/Hyena.Gui/Makefile
+src/Hyena/Makefile
+src/Hyena/build/Makefile
+src/Hyena/build/m4/Makefile
+src/Hyena/Mono.Data.Sqlite/Makefile
+src/Hyena/Hyena/Makefile
+src/Hyena/Hyena.Data.Sqlite/Makefile
+src/Hyena/Hyena.Gui/Makefile
 
 src/Makefile
 src/AssemblyInfo.cs
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 79f8da7..e4770f3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,23 +16,6 @@ data/desktop-files/common.desktop.in
 libbanshee/banshee-bpmdetector.c
 libbanshee/banshee-ripper.c
 libbanshee/banshee-transcoder.c
-lib/Hyena/src/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs
-lib/Hyena/src/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs
-lib/Hyena/src/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs
-lib/Hyena/src/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs
-lib/Hyena/src/Hyena.Gui/Hyena.Query.Gui/DateQueryValueEntry.cs
-lib/Hyena/src/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs
-lib/Hyena/src/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs
-lib/Hyena/src/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs
-lib/Hyena/src/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs
-lib/Hyena/src/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs
-lib/Hyena/src/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs
-lib/Hyena/src/Hyena/Hyena.Query/DateQueryValue.cs
-lib/Hyena/src/Hyena/Hyena.Query/EnumQueryValue.cs
-lib/Hyena/src/Hyena/Hyena.Query/IntegerQueryValue.cs
-lib/Hyena/src/Hyena/Hyena.Query/NullQueryValue.cs
-lib/Hyena/src/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs
-lib/Hyena/src/Hyena/Hyena.Query/StringQueryValue.cs
 src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs
 src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeScreensaverManager.cs
 src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs
@@ -301,6 +284,23 @@ src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs
 src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs
 src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs
 src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs
+src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs
+src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs
+src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs
+src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs
+src/Hyena/Hyena.Gui/Hyena.Query.Gui/DateQueryValueEntry.cs
+src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs
+src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs
+src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs
+src/Hyena/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs
+src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs
+src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs
+src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs
+src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs
+src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs
+src/Hyena/Hyena/Hyena.Query/NullQueryValue.cs
+src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs
+src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs
 src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs
 src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs
 src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index f554fa6..4c6f840 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,5 @@
 data/audio-profiles/aac.xml.in
-lib/Hyena/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SR.Designer.cs
+src/Hyena/Mono.Data.Sqlite/Mono.Data.Sqlite/SR.Designer.cs
 src/Libraries/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs
 src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs
 src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs
diff --git a/src/Hyena b/src/Hyena
new file mode 160000
index 0000000..7d3743e
--- /dev/null
+++ b/src/Hyena
@@ -0,0 +1 @@
+Subproject commit 7d3743e9722fe124e3b2281c3fda458fb3c85ee5
diff --git a/src/Makefile.am b/src/Makefile.am
index 40b2614..1ddb835 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
+	Hyena \
 	Libraries \
 	Core \
 	Dap \