From ae17ceeecc0d2fa266ba706f97470b28f56a3067 Mon Sep 17 00:00:00 2001
From: Etienne CHAMPETIER <etienne.champetier@fiducial.net>
Date: Thu, 19 Sep 2013 13:48:06 +0200
Subject: [Install] Add Compat.browser files for net_4_0 and net_4_5

Without that referencing browser 'Default' (parentID="Default")
in a .browser file make the app throw exceptions here
mcs/class/System.Web/System.Web.Configuration_2.0/nBrowser/Build.cs#L206

Signed-off-by: Etienne CHAMPETIER <etienne.champetier@fiducial.net>
---
 data/Browsers/.gitattributes         |  1 +
 data/Browsers/ChangeLog              |  6 ++++++
 data/Browsers/Compat.browser         | 42 ++++++++++++++++++++++++++++++++++++
 data/net_2_0/Browsers/.gitattributes |  1 -
 data/net_2_0/Browsers/ChangeLog      |  6 ------
 data/net_2_0/Browsers/Compat.browser | 42 ------------------------------------
 data/net_2_0/Browsers/Makefile.am    |  4 ++--
 data/net_4_0/Browsers/.gitignore     |  2 ++
 data/net_4_0/Browsers/Makefile.am    |  6 ++++++
 data/net_4_0/Makefile.am             |  2 +-
 data/net_4_5/Browsers/.gitignore     |  2 ++
 data/net_4_5/Browsers/Makefile.am    |  6 ++++++
 data/net_4_5/Makefile.am             |  2 +-
 13 files changed, 69 insertions(+), 53 deletions(-)
 create mode 100644 data/Browsers/.gitattributes
 create mode 100644 data/Browsers/ChangeLog
 create mode 100644 data/Browsers/Compat.browser
 delete mode 100644 data/net_2_0/Browsers/.gitattributes
 delete mode 100644 data/net_2_0/Browsers/ChangeLog
 delete mode 100644 data/net_2_0/Browsers/Compat.browser
 create mode 100644 data/net_4_0/Browsers/.gitignore
 create mode 100644 data/net_4_0/Browsers/Makefile.am
 create mode 100644 data/net_4_5/Browsers/.gitignore
 create mode 100644 data/net_4_5/Browsers/Makefile.am

(limited to 'data')

diff --git a/data/Browsers/.gitattributes b/data/Browsers/.gitattributes
new file mode 100644
index 00000000000..6b8861b0555
--- /dev/null
+++ b/data/Browsers/.gitattributes
@@ -0,0 +1 @@
+/Compat.browser -crlf
diff --git a/data/Browsers/ChangeLog b/data/Browsers/ChangeLog
new file mode 100644
index 00000000000..26785e377c4
--- /dev/null
+++ b/data/Browsers/ChangeLog
@@ -0,0 +1,6 @@
+2008-03-23  Dean Brettle  <dean@brettle.com>
+
+	* Compat.browser: added.  Provides browser definitions with
+	compatible IDs.
+
+
diff --git a/data/Browsers/Compat.browser b/data/Browsers/Compat.browser
new file mode 100644
index 00000000000..9950c71c5f0
--- /dev/null
+++ b/data/Browsers/Compat.browser
@@ -0,0 +1,42 @@
+<!--
+    This file defines some of the browsers that Microsoft's implementation provides in
+    <windir>\Microsoft.NET\Framework\<ver>\CONFIG\Browsers\*.browser
+	
+	It is not derived from any file distributed with Microsoft's implementation.  Since
+	we can't distribute MS's browser files, we use browscap.ini to determine 
+	browser capabilities.  Then, if and only if the application contains App_Browser/*.browser
+	files and we are using .NET 2.0 or higher, we supplement the capabilities with the 
+	information in those files and the files in this directory.  The primary goal of this file
+	is provide browser definitions that might be referenced in App_Browser/*.browser files.
+-->
+<browsers>
+  <defaultBrowser id="Default">
+  </defaultBrowser>
+  <browser id="Default">
+    <identification>
+    	<userAgent match="." />
+    </identification>
+  </browser>
+  <browser id="IE6to9" parentID="Default">
+    <identification>
+      <capability name="majorver" match="^[6-9]" />
+      <capability name="browser" match="^(IE|AOL)$" />
+    </identification>
+  </browser>
+  <browser id="Opera8to9" parentID="Default">
+    <identification>
+      <capability name="majorver" match="^[8-9]" />
+      <capability name="browser" match="^Opera$" />
+    </identification>
+  </browser>
+  <browser id="Safari" parentID="Default">
+    <identification>
+      <capability name="browser" match="^Safari$" />
+    </identification>
+  </browser>
+  <browser id="Mozilla" parentID="Default">
+    <identification>
+      <capability name="browser" match="^Mozilla" />
+    </identification>
+  </browser>
+</browsers>
\ No newline at end of file
diff --git a/data/net_2_0/Browsers/.gitattributes b/data/net_2_0/Browsers/.gitattributes
deleted file mode 100644
index 6b8861b0555..00000000000
--- a/data/net_2_0/Browsers/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-/Compat.browser -crlf
diff --git a/data/net_2_0/Browsers/ChangeLog b/data/net_2_0/Browsers/ChangeLog
deleted file mode 100644
index 26785e377c4..00000000000
--- a/data/net_2_0/Browsers/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2008-03-23  Dean Brettle  <dean@brettle.com>
-
-	* Compat.browser: added.  Provides browser definitions with
-	compatible IDs.
-
-
diff --git a/data/net_2_0/Browsers/Compat.browser b/data/net_2_0/Browsers/Compat.browser
deleted file mode 100644
index 9950c71c5f0..00000000000
--- a/data/net_2_0/Browsers/Compat.browser
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-    This file defines some of the browsers that Microsoft's implementation provides in
-    <windir>\Microsoft.NET\Framework\<ver>\CONFIG\Browsers\*.browser
-	
-	It is not derived from any file distributed with Microsoft's implementation.  Since
-	we can't distribute MS's browser files, we use browscap.ini to determine 
-	browser capabilities.  Then, if and only if the application contains App_Browser/*.browser
-	files and we are using .NET 2.0 or higher, we supplement the capabilities with the 
-	information in those files and the files in this directory.  The primary goal of this file
-	is provide browser definitions that might be referenced in App_Browser/*.browser files.
--->
-<browsers>
-  <defaultBrowser id="Default">
-  </defaultBrowser>
-  <browser id="Default">
-    <identification>
-    	<userAgent match="." />
-    </identification>
-  </browser>
-  <browser id="IE6to9" parentID="Default">
-    <identification>
-      <capability name="majorver" match="^[6-9]" />
-      <capability name="browser" match="^(IE|AOL)$" />
-    </identification>
-  </browser>
-  <browser id="Opera8to9" parentID="Default">
-    <identification>
-      <capability name="majorver" match="^[8-9]" />
-      <capability name="browser" match="^Opera$" />
-    </identification>
-  </browser>
-  <browser id="Safari" parentID="Default">
-    <identification>
-      <capability name="browser" match="^Safari$" />
-    </identification>
-  </browser>
-  <browser id="Mozilla" parentID="Default">
-    <identification>
-      <capability name="browser" match="^Mozilla" />
-    </identification>
-  </browser>
-</browsers>
\ No newline at end of file
diff --git a/data/net_2_0/Browsers/Makefile.am b/data/net_2_0/Browsers/Makefile.am
index 4d5b8c9c56b..ed00678b164 100644
--- a/data/net_2_0/Browsers/Makefile.am
+++ b/data/net_2_0/Browsers/Makefile.am
@@ -1,6 +1,6 @@
 monodir = $(sysconfdir)/mono/2.0/Browsers
 
-EXTRA_DIST =  Compat.browser
+EXTRA_DIST =  ../../Browsers/Compat.browser
 
-mono_DATA =  Compat.browser
+mono_DATA =  ../../Browsers/Compat.browser
 
diff --git a/data/net_4_0/Browsers/.gitignore b/data/net_4_0/Browsers/.gitignore
new file mode 100644
index 00000000000..b336cc7cec9
--- /dev/null
+++ b/data/net_4_0/Browsers/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/data/net_4_0/Browsers/Makefile.am b/data/net_4_0/Browsers/Makefile.am
new file mode 100644
index 00000000000..0940002cb62
--- /dev/null
+++ b/data/net_4_0/Browsers/Makefile.am
@@ -0,0 +1,6 @@
+monodir = $(sysconfdir)/mono/4.0/Browsers
+
+EXTRA_DIST =  ../../Browsers/Compat.browser
+
+mono_DATA =  ../../Browsers/Compat.browser
+
diff --git a/data/net_4_0/Makefile.am b/data/net_4_0/Makefile.am
index 9ca4996f8b2..31727c5910b 100644
--- a/data/net_4_0/Makefile.am
+++ b/data/net_4_0/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS =
+SUBDIRS = Browsers
 
 monodir = $(sysconfdir)/mono/4.0
 
diff --git a/data/net_4_5/Browsers/.gitignore b/data/net_4_5/Browsers/.gitignore
new file mode 100644
index 00000000000..b336cc7cec9
--- /dev/null
+++ b/data/net_4_5/Browsers/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/data/net_4_5/Browsers/Makefile.am b/data/net_4_5/Browsers/Makefile.am
new file mode 100644
index 00000000000..a2348293401
--- /dev/null
+++ b/data/net_4_5/Browsers/Makefile.am
@@ -0,0 +1,6 @@
+monodir = $(sysconfdir)/mono/4.5/Browsers
+
+EXTRA_DIST =  ../../Browsers/Compat.browser
+
+mono_DATA =  ../../Browsers/Compat.browser
+
diff --git a/data/net_4_5/Makefile.am b/data/net_4_5/Makefile.am
index c45989c15e0..bfe4ac6a7b4 100644
--- a/data/net_4_5/Makefile.am
+++ b/data/net_4_5/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS =
+SUBDIRS = Browsers
 
 monodir = $(sysconfdir)/mono/4.5
 
-- 
cgit v1.2.3