[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.2.3+dfsg-3-16-g14c2435

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 14c24354ff6abad7ba242f843f8cc8256d5fa8e2
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Dec 13 02:57:28 2009 +0100

    Moved all pkg-config files for CLI libs to libmono-cil-dev.

diff --git a/debian/changelog b/debian/changelog
index 673e4c7..bf5b2f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,10 +35,12 @@ mono (2.4.3+dfsg-1~pre1) UNRELEASED; urgency=medium
   * debian/patches/fix_gridview_r146128_r146133.dpatch:
     + Dropped, already applied upstream.
   * debian/control:
-    + Added new libmono-cil-dev package which ships all pkg-config files and
-      depends on all Mono CLI library packages.
+    debian/libmono-cil-dev.install
+    debian/*.install:
+    + Added new libmono-cil-dev package which ships now all pkg-config files
+      and depends on all Mono CLI library packages.
 
- -- Mirco Bauer <meebey at debian.org>  Sun, 13 Dec 2009 02:43:19 +0100
+ -- Mirco Bauer <meebey at debian.org>  Sun, 13 Dec 2009 02:55:56 +0100
 
 mono (2.4.2.3+dfsg-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 112fbb1..efa8b72 100644
--- a/debian/control
+++ b/debian/control
@@ -175,6 +175,13 @@ Description: Mono profiler libraries
 
 Package: libmono-cil-dev
 Architecture: all
+Replaces: libmono-nunit2.4-cil (<< 2.4.3),
+          libmono-cairo2.0-cil (<< 2.4.3),
+          libmono-cecil-private-cil (<< 2.4.3),
+          libmono-system-web2.0-cil (<< 2.4.3),
+          libmono-wcf3.0-cil (<< 2.4.3),
+          libmono2.0-cil (<< 2.4.3),
+          mono-devel (<< 2.4.3)
 Recommends: libmono-firebirdsql1.7-cil (= ${source:Version})
 Depends: libmono1.0-cil (= ${source:Version}),
          libmono2.0-cil (= ${source:Version}),
@@ -1423,7 +1430,8 @@ Replaces: mono-1.0-devel (<< 2.0),
 Recommends: mono-csharp-shell
 Depends: ${cli:Depends},
          mono-2.0-devel (= ${source:Version}),
-         mono-gac (= ${source:Version})
+         mono-gac (= ${source:Version}),
+         libmono-cil-dev (= ${source:Version})
 Description: Mono development tools
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
diff --git a/debian/libmono-cairo2.0-cil.install b/debian/libmono-cairo2.0-cil.install
index 3e4f8c9..ac82bf0 100644
--- a/debian/libmono-cairo2.0-cil.install
+++ b/debian/libmono-cairo2.0-cil.install
@@ -1,3 +1,2 @@
 debian/tmp/usr/lib/mono/gac/Mono.Cairo/2.0.*/
 debian/tmp/usr/lib/mono/2.0/Mono.Cairo.dll
-debian/tmp/usr/lib/pkgconfig/mono-cairo.pc
diff --git a/debian/libmono-cecil-private-cil.install b/debian/libmono-cecil-private-cil.install
index 541db50..1ac3a85 100644
--- a/debian/libmono-cecil-private-cil.install
+++ b/debian/libmono-cecil-private-cil.install
@@ -1,2 +1 @@
 /usr/lib/mono/gac/Mono.Cecil/
-/usr/lib/pkgconfig/cecil.pc
diff --git a/debian/libmono-cil-dev.install b/debian/libmono-cil-dev.install
new file mode 100644
index 0000000..5e75d7d
--- /dev/null
+++ b/debian/libmono-cil-dev.install
@@ -0,0 +1,8 @@
+/usr/lib/pkgconfig/mono-cairo.pc
+/usr/lib/pkgconfig/cecil.pc
+/usr/lib/pkgconfig/system.web.extensions_1.0.pc
+/usr/lib/pkgconfig/system.web.extensions.design_1.0.pc
+/usr/lib/pkgconfig/wcf.pc
+/usr/lib/pkgconfig/mono.web.pc
+/usr/lib/pkgconfig/dotnet.pc
+/usr/lib/pkgconfig/dotnet35.pc
diff --git a/debian/libmono-nunit2.4-cil.links b/debian/libmono-cil-dev.links
similarity index 100%
rename from debian/libmono-nunit2.4-cil.links
rename to debian/libmono-cil-dev.links
diff --git a/debian/libmono-system-web2.0-cil.install b/debian/libmono-system-web2.0-cil.install
index b60daab..fbb2bc6 100644
--- a/debian/libmono-system-web2.0-cil.install
+++ b/debian/libmono-system-web2.0-cil.install
@@ -16,5 +16,3 @@ debian/tmp/usr/lib/mono/2.0/System.ComponentModel.DataAnnotations.dll
 debian/tmp/usr/lib/mono/2.0/System.Web.Abstractions.dll
 debian/tmp/usr/lib/mono/2.0/System.Web.DynamicData.dll
 debian/tmp/usr/lib/mono/2.0/System.Web.Routing.dll
-debian/tmp/usr/lib/pkgconfig/system.web.extensions_1.0.pc
-debian/tmp/usr/lib/pkgconfig/system.web.extensions.design_1.0.pc
diff --git a/debian/libmono-wcf3.0-cil.install b/debian/libmono-wcf3.0-cil.install
index 98855c0..e96a083 100644
--- a/debian/libmono-wcf3.0-cil.install
+++ b/debian/libmono-wcf3.0-cil.install
@@ -8,4 +8,3 @@
 /usr/lib/mono/2.0/System.Runtime.Serialization.dll
 /usr/lib/mono/2.0/System.ServiceModel.Web.dll
 /usr/lib/mono/2.0/System.ServiceModel.dll
-/usr/lib/pkgconfig/wcf.pc
diff --git a/debian/libmono2.0-cil.install b/debian/libmono2.0-cil.install
index 4b9f9b4..5fa517c 100644
--- a/debian/libmono2.0-cil.install
+++ b/debian/libmono2.0-cil.install
@@ -7,4 +7,3 @@ debian/tmp/usr/lib/mono/gac/Mono.Http/2.0.0.0__*/
 debian/tmp/usr/lib/mono/gac/Mono.Web/2.0.0.0__*/
 debian/tmp/usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/
 debian/tmp/usr/lib/mono/gac/mono-service/2.0.0.0__*/
-debian/tmp/usr/lib/pkgconfig/mono.web.pc
diff --git a/debian/mono-devel.install b/debian/mono-devel.install
index e5749ea..1273fb3 100644
--- a/debian/mono-devel.install
+++ b/debian/mono-devel.install
@@ -58,8 +58,6 @@ debian/tmp/usr/lib/mono/2.0/mono-shlib-cop.exe*
 debian/tmp/usr/lib/mono/2.0/sqlsharp.exe
 debian/tmp/usr/lib/mono-source-libs/getline.cs
 debian/tmp/usr/lib/mono-source-libs/Options.cs
-debian/tmp/usr/lib/pkgconfig/dotnet.pc
-debian/tmp/usr/lib/pkgconfig/dotnet35.pc
 debian/tmp/usr/lib/pkgconfig/mono-lineeditor.pc
 debian/tmp/usr/lib/pkgconfig/mono-options.pc
 debian/tmp/usr/share/locale/*/LC_MESSAGES/mcs.mo

-- 
mono