[Pkg-mono-svn-commits] [xsp] 03/04: Include shim, add dllmap for libfpm-helper

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/3.8-0xamarin1
in repository xsp.

commit 409bcde5da328aaf5f8802246aef44bd96837c42
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Wed Sep 10 17:59:44 2014 +0100

    Include shim, add dllmap for libfpm-helper
---
 debian/control                         | 8 ++++----
 debian/fastcgi-mono-server2.exe.config | 4 ++++
 debian/fastcgi-mono-server4.exe.config | 4 ++++
 debian/libfpm-helper0.install          | 3 ++-
 debian/mono-fastcgi-server2.install    | 2 ++
 debian/mono-fastcgi-server2.links      | 1 +
 debian/mono-fastcgi-server4.install    | 1 +
 debian/mono-fastcgi-server4.links      | 1 +
 8 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 43d83b6..1d0113a 100644
--- a/debian/control
+++ b/debian/control
@@ -116,7 +116,7 @@ Description: ASP.NET backend for mod_mono Apache module - default version
 
 Package: mono-fpm-server
 Architecture: all
-Depends: libfpm-helper0 (= ${source:Version}), ${cli:Depends}, ${misc:Depends}
+Depends: libfpm-helper0 (= ${source:Version}), ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}
 Description: ASP.NET backend for FastCGI Process Manager
  mono-fpm-server contains the backend for FPM. It lets you run ASP.NET
  web applications via HTTP servers such as Lighttpd or Apache.
@@ -128,7 +128,7 @@ Description: ASP.NET backend for FastCGI Process Manager
 
 Package: libfpm-helper0
 Architecture: any
-Depends: ${shlib:Depends}, ${cli:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}
 Description: ASP.NET backend for FastCGI Process Manager - helper lib
  mono-fpm-server contains the backend for FPM. It lets you run ASP.NET
  web applications via HTTP servers such as Lighttpd or Apache.
@@ -140,7 +140,7 @@ Description: ASP.NET backend for FastCGI Process Manager - helper lib
 Package: mono-fastcgi-server4
 Architecture: all
 Replaces: mono-fastcgi-server1
-Depends: ${misc:Depends}, ${cli:Depends}, mono-xsp4-base (= ${source:Version}), perl-modules
+Depends: libfpm-helper0 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-xsp4-base (= ${source:Version}), perl-modules
 Description: ASP.NET 4.0 backend for FastCGI webservers
  mono-fastcgi-server contains the backend for FastCGI. It lets you run 
  ASP.NET web applications via HTTP servers such as Lighttpd or Apache. 
@@ -154,7 +154,7 @@ Package: mono-fastcgi-server2
 Architecture: all
 Conflicts: mono-server
 Replaces: mono-server
-Depends: ${misc:Depends}, ${cli:Depends}, mono-xsp2-base (= ${source:Version}), perl-modules
+Depends: libfpm-helper0 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-xsp2-base (= ${source:Version}), perl-modules
 Description: ASP.NET 2.0 backend for FastCGI webservers
  mono-fastcgi-server contains the backend for FastCGI. It lets you run
  ASP.NET web applications via HTTP servers such as Lighttpd or Apache.
diff --git a/debian/fastcgi-mono-server2.exe.config b/debian/fastcgi-mono-server2.exe.config
new file mode 100644
index 0000000..4824239
--- /dev/null
+++ b/debian/fastcgi-mono-server2.exe.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<dllmap dll="fpm_helper" target="libfpm_helper.so.0"/>
+</configuration>
diff --git a/debian/fastcgi-mono-server4.exe.config b/debian/fastcgi-mono-server4.exe.config
new file mode 100644
index 0000000..4824239
--- /dev/null
+++ b/debian/fastcgi-mono-server4.exe.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<dllmap dll="fpm_helper" target="libfpm_helper.so.0"/>
+</configuration>
diff --git a/debian/libfpm-helper0.install b/debian/libfpm-helper0.install
index aef7397..dc18b19 100644
--- a/debian/libfpm-helper0.install
+++ b/debian/libfpm-helper0.install
@@ -1 +1,2 @@
-usr/lib/libfpm_helper.so.0
+usr/lib/libfpm_helper.so.0*
+usr/bin/shim
diff --git a/debian/mono-fastcgi-server2.install b/debian/mono-fastcgi-server2.install
index 19b81ad..9175f68 100644
--- a/debian/mono-fastcgi-server2.install
+++ b/debian/mono-fastcgi-server2.install
@@ -1,3 +1,5 @@
 debian/tmp/usr/lib/mono/2.0/fastcgi-mono-server2.exe
 debian/tmp/usr/lib/mono/gac/fastcgi-mono-server2
 debian/tmp/usr/bin/fastcgi-mono-server2
+debian/fastcgi-mono-server2.exe.config			/usr/lib/mono/gac/fastcgi-mono-server2/3.8.0.0__0738eb9f132ed756/
+
diff --git a/debian/mono-fastcgi-server2.links b/debian/mono-fastcgi-server2.links
new file mode 100644
index 0000000..535ca29
--- /dev/null
+++ b/debian/mono-fastcgi-server2.links
@@ -0,0 +1 @@
+/usr/lib/mono/gac/fastcgi-mono-server2/3.8.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe.config	usr/lib/mono/2.0/fastcgi-mono-server2.exe.config
diff --git a/debian/mono-fastcgi-server4.install b/debian/mono-fastcgi-server4.install
index 699752a..76353eb 100644
--- a/debian/mono-fastcgi-server4.install
+++ b/debian/mono-fastcgi-server4.install
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/mono/4.5/fastcgi-mono-server4.exe
 debian/tmp/usr/lib/mono/gac/fastcgi-mono-server4
 debian/tmp/usr/bin/fastcgi-mono-server4
+debian/fastcgi-mono-server4.exe.config                  /usr/lib/mono/gac/fastcgi-mono-server4/3.8.0.0__0738eb9f132ed756/
diff --git a/debian/mono-fastcgi-server4.links b/debian/mono-fastcgi-server4.links
new file mode 100644
index 0000000..0ad6cc3
--- /dev/null
+++ b/debian/mono-fastcgi-server4.links
@@ -0,0 +1 @@
+/usr/lib/mono/gac/fastcgi-mono-server4/3.8.0.0__0738eb9f132ed756/fastcgi-mono-server4.exe.config	usr/lib/mono/4.5/fastcgi-mono-server2.exe.config

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/xsp.git