[Pkg-cli-apps-commits] [SCM] fsharp branch, master, updated. debian/3.0.26-1-25-g24f18f9

[Christopher James Halse Rogers]

The following commit has been merged in the master branch:
commit 2cc6782f3965419efb1dd6a7632996fd566deb8e
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Fri Apr 26 16:24:49 2013 +1000

    Remove libfsharp-core-cil-dev package, folding it into fsharp and fsharp-console.
    
    fsc.exe and fsi.exe are already installed into /usr/lib/mono/4.0, and they need to load
    matching FSharp.Core and FSharp.Compiler.Interactive.Settings assemblies.
    
    In the unlikely event that we want to provide a 2.0-profile F# compiler package, that
    will need its own symlinks

diff --git a/debian/control b/debian/control
index 1773394..5d0fbd6 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Vcs-Browser: http://anongit.debian.org/?p=pkg-cli-apps/packages/fsharp.git;a=sum
 Package: fsharp
 Architecture: all
 Depends:
+  libfsharp-core4.3-cil (= ${binary:Version}),
   ${cli:Depends},
   ${shlibs:Depends},
   ${misc:Depends}
@@ -26,6 +27,8 @@ Description: functional-first programming language - compiler for the CLI
 Package: fsharp-console
 Architecture: all
 Depends:
+  fsharp,
+  libfsharp-compiler-interactive-settings4.3-cil (= ${binary:Version}),
   ${cli:Depends},
   ${shlibs:Depends},
   ${misc:Depends}
@@ -53,7 +56,6 @@ Depends:
   ${cli:Depends},
   ${shlibs:Depends},
   ${misc:Depends},
-  libfsharp-core-cil-dev,
 Description: functional-first programming language - compiler library
  F# is a multi-paradigm programming language, supporting functional,
  imperative, and object-oriented structures.
@@ -99,18 +101,6 @@ Description: functional-first programming language - core runtime library
  .
  This package contains the core runtime library for F# binaries.
 
-Package: libfsharp-core-cil-dev
-Architecture: all
-Depends:
-  libfsharp-core4.3-cil (= ${binary:Version}),
-  ${misc:Depends}
-Description: functional-first programming language - development files
- F# is a multi-paradigm programming language, supporting functional,
- imperative, and object-oriented structures.
- .
- This package contains the development symlinks required for building
- F# code.
-
 Package: libfsharp-data-typeproviders4.3-cil
 Architecture: all
 Depends:
diff --git a/debian/fsharp-console.install b/debian/fsharp-console.install
index bdebca0..7f8a381 100644
--- a/debian/fsharp-console.install
+++ b/debian/fsharp-console.install
@@ -1,3 +1,4 @@
 usr/bin/fsharpi
 usr/lib/mono/gac/fsi
 usr/lib/mono/4.0/fsi.*
+usr/lib/mono/4.0/FSharp.Compiler.Interactive.Settings.*
diff --git a/debian/fsharp.install b/debian/fsharp.install
index 37bdbe8..515dfb3 100644
--- a/debian/fsharp.install
+++ b/debian/fsharp.install
@@ -1,3 +1,4 @@
 usr/bin/fsharpc
 usr/lib/mono/gac/fsc
 usr/lib/mono/4.0/fsc.*
+usr/lib/mono/4.0/FSharp.Core.*
diff --git a/debian/libfsharp-core-cil-dev.install b/debian/libfsharp-core-cil-dev.install
deleted file mode 100644
index 759f83a..0000000
--- a/debian/libfsharp-core-cil-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/mono/4.0/FSharp.Core.dll
-usr/lib/mono/4.0/FSharp.Core.optdata
-usr/lib/mono/4.0/FSharp.Core.sigdata
-

-- 
fsharp