2009-06-04 Jb Evain <jbevain@novell.com>

	* resources/SR.resx: adjust file names.
	* Mono.Data.Sqlite.dll.sources: rename from
		net_2_0_Mono.Data.Sqlite.dll.sources.
		Hopefully fixes the build.

svn path=/trunk/mcs/; revision=135395

diff --git a/mcs/class/Mono.Data.Sqlite/ChangeLog b/mcs/class/Mono.Data.Sqlite/ChangeLog
index 6a096a8a17d3cd739a37cf35f30ed711e857766f..f854a09629e569f2ec508c3470e8afcaaa8b0d71 100644 (file)
--- a/mcs/class/Mono.Data.Sqlite/ChangeLog
+++ b/mcs/class/Mono.Data.Sqlite/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-04  Jb Evain  <jbevain@novell.com>
+
+       * resources/SR.resx: adjust file names.
+       * Mono.Data.Sqlite.dll.sources: rename from
+               net_2_0_Mono.Data.Sqlite.dll.sources.
+               Hopefully fixes the build.
+
 2009-06-03  Marek Habersack  <mhabersack@novell.com>
        
        * Update SQLite.NET version to 1.0.61.0, applied Mono

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.dll.sources b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.dll.sources
new file mode 100644 (file)
index 0000000..7ee134b
--- /dev/null
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.dll.sources
@@ -0,0 +1,31 @@
+Assembly/AssemblyInfo.cs
+../../build/common/Consts.cs
+../../build/common/Locale.cs
+../../build/common/MonoTODOAttribute.cs
+Mono.Data.Sqlite_2.0/SQLite3.cs
+Mono.Data.Sqlite_2.0/SQLite3_UTF16.cs
+Mono.Data.Sqlite_2.0/SQLiteBase.cs
+Mono.Data.Sqlite_2.0/SQLiteCommandBuilder.cs
+Mono.Data.Sqlite_2.0/SQLiteCommand.cs
+Mono.Data.Sqlite_2.0/SQLiteConnection.cs
+Mono.Data.Sqlite_2.0/LINQ/SQLiteConnection_Linq.cs
+Mono.Data.Sqlite_2.0/SQLiteConnectionPool.cs
+Mono.Data.Sqlite_2.0/SQLiteConnectionStringBuilder.cs
+Mono.Data.Sqlite_2.0/SQLiteConvert.cs
+Mono.Data.Sqlite_2.0/SQLiteDataAdapter.cs
+Mono.Data.Sqlite_2.0/SQLiteDataReader.cs
+Mono.Data.Sqlite_2.0/SqliteDataSourceEnumerator.cs
+Mono.Data.Sqlite_2.0/SQLiteEnlistment.cs
+Mono.Data.Sqlite_2.0/SQLiteException.cs
+Mono.Data.Sqlite_2.0/SQLiteFactory.cs
+Mono.Data.Sqlite_2.0/LINQ/SQLiteFactory_Linq.cs
+Mono.Data.Sqlite_2.0/SQLiteFunctionAttribute.cs
+Mono.Data.Sqlite_2.0/SQLiteFunction.cs
+Mono.Data.Sqlite_2.0/SQLiteKeyReader.cs
+Mono.Data.Sqlite_2.0/SQLiteMetaDataCollectionNames.cs
+Mono.Data.Sqlite_2.0/SQLiteParameterCollection.cs
+Mono.Data.Sqlite_2.0/SQLiteParameter.cs
+Mono.Data.Sqlite_2.0/SQLiteStatement.cs
+Mono.Data.Sqlite_2.0/SQLiteTransaction.cs
+Mono.Data.Sqlite_2.0/SR.Designer.cs
+Mono.Data.Sqlite_2.0/UnsafeNativeMethods.cs

diff --git a/mcs/class/Mono.Data.Sqlite/net_2_0_Mono.Data.Sqlite.dll.sources b/mcs/class/Mono.Data.Sqlite/net_2_0_Mono.Data.Sqlite.dll.sources
deleted file mode 100644 (file)
index 7ee134b..0000000
--- a/mcs/class/Mono.Data.Sqlite/net_2_0_Mono.Data.Sqlite.dll.sources
+++ /dev/null
@@ -1,31 +0,0 @@
-Assembly/AssemblyInfo.cs
-../../build/common/Consts.cs
-../../build/common/Locale.cs
-../../build/common/MonoTODOAttribute.cs
-Mono.Data.Sqlite_2.0/SQLite3.cs
-Mono.Data.Sqlite_2.0/SQLite3_UTF16.cs
-Mono.Data.Sqlite_2.0/SQLiteBase.cs
-Mono.Data.Sqlite_2.0/SQLiteCommandBuilder.cs
-Mono.Data.Sqlite_2.0/SQLiteCommand.cs
-Mono.Data.Sqlite_2.0/SQLiteConnection.cs
-Mono.Data.Sqlite_2.0/LINQ/SQLiteConnection_Linq.cs
-Mono.Data.Sqlite_2.0/SQLiteConnectionPool.cs
-Mono.Data.Sqlite_2.0/SQLiteConnectionStringBuilder.cs
-Mono.Data.Sqlite_2.0/SQLiteConvert.cs
-Mono.Data.Sqlite_2.0/SQLiteDataAdapter.cs
-Mono.Data.Sqlite_2.0/SQLiteDataReader.cs
-Mono.Data.Sqlite_2.0/SqliteDataSourceEnumerator.cs
-Mono.Data.Sqlite_2.0/SQLiteEnlistment.cs
-Mono.Data.Sqlite_2.0/SQLiteException.cs
-Mono.Data.Sqlite_2.0/SQLiteFactory.cs
-Mono.Data.Sqlite_2.0/LINQ/SQLiteFactory_Linq.cs
-Mono.Data.Sqlite_2.0/SQLiteFunctionAttribute.cs
-Mono.Data.Sqlite_2.0/SQLiteFunction.cs
-Mono.Data.Sqlite_2.0/SQLiteKeyReader.cs
-Mono.Data.Sqlite_2.0/SQLiteMetaDataCollectionNames.cs
-Mono.Data.Sqlite_2.0/SQLiteParameterCollection.cs
-Mono.Data.Sqlite_2.0/SQLiteParameter.cs
-Mono.Data.Sqlite_2.0/SQLiteStatement.cs
-Mono.Data.Sqlite_2.0/SQLiteTransaction.cs
-Mono.Data.Sqlite_2.0/SR.Designer.cs
-Mono.Data.Sqlite_2.0/UnsafeNativeMethods.cs

diff --git a/mcs/class/Mono.Data.Sqlite/resources/SR.resx b/mcs/class/Mono.Data.Sqlite/resources/SR.resx
index 054892995fe66abc5d811d454cf600326999c6bd..9851beb1a81637581419d04c1504ba9e619ff1de 100644 (file)
--- a/mcs/class/Mono.Data.Sqlite/resources/SR.resx
+++ b/mcs/class/Mono.Data.Sqlite/resources/SR.resx
@@ -119,12 +119,12 @@
   </resheader>\r
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
   <data name="DataTypes" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>datatypes.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>\r
+    <value>resources/DataTypes.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>\r
   </data>\r
   <data name="Keywords" xml:space="preserve">\r
     <value>ALL,ALTER,AND,AS,AUTOINCREMENT,BETWEEN,BY,CASE,CHECK,COLLATE,COMMIT,CONSTRAINT,CREATE,CROSS,DEFAULT,DEFERRABLE,DELETE,DISTINCT,DROP,ELSE,ESCAPE,EXCEPT,FOREIGN,FROM,FULL,GROUP,HAVING,IN,INDEX,INNER,INSERT,INTERSECT,INTO,IS,ISNULL,JOIN,LEFT,LIMIT,NATURAL,NOT,NOTNULL,NULL,ON,OR,ORDER,OUTER,PRIMARY,REFERENCES,RIGHT,ROLLBACK,SELECT,SET,TABLE,THEN,TO,TRANSACTION,UNION,UNIQUE,UPDATE,USING,VALUES,WHEN,WHERE</value>\r
   </data>\r
   <data name="MetaDataCollections" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>metadatacollections.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>\r
+    <value>resources/MetaDataCollections.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>\r
   </data>\r
 </root>
\ No newline at end of file