[Pkg-cli-libs-commits] [SCM] gstreamer-sharp branch, master, updated. debian/0.9.2-1-5-g2c2bd70

[Iain Lane]

The following commit has been merged in the master branch:
commit 07f0e150ef33d4b758d18eb288bfd3266bb40065
Author: Iain Lane <laney at debian.org>
Date:   Thu Aug 25 11:52:41 2011 +0100

    Relax dep constrant from -dev to -cil to make package binNMUable
    
    Also run wrap-and-sort, as an aside.
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index f20212c..30952ff 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,19 @@ Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Chow Loong Jin <hyperair at ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~),
-               autotools-dev,
-               mono-devel (>= 2.4.3),
+Build-Depends: autotools-dev,
                cli-common-dev (>= 0.5.7),
-               monodoc-base (>= 1.1),
-               libglib2.0-dev (>= 2.18.1),
-               libgtk2.0-dev (>= 2.17.3),
-               libglib2.0-cil-dev (>= 2.12),
-               libgtk2.0-cil-dev (>= 2.12),
-               libgstreamer0.10-dev (>= 0.10.25),
-               libgstreamer-plugins-base0.10-dev (>= 0.10.25),
+               debhelper (>= 7.0.50~),
                gstreamer0.10-plugins-base,
                gstreamer0.10-plugins-good,
+               libglib2.0-cil-dev (>= 2.12),
+               libglib2.0-dev (>= 2.18.1),
+               libgstreamer-plugins-base0.10-dev (>= 0.10.25),
+               libgstreamer0.10-dev (>= 0.10.25),
+               libgtk2.0-cil-dev (>= 2.12),
+               libgtk2.0-dev (>= 2.17.3),
+               mono-devel (>= 2.4.3),
+               monodoc-base (>= 1.1),
                nunit-console
 Standards-Version: 3.9.2
 Homepage: http://gstreamer.freedesktop.org/modules/gstreamer-sharp.html
@@ -24,7 +24,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-cli-libs/packages/gstreamer-sharp.git;
 
 Package: libgstreamer0.9-cil
 Architecture: any
-Depends: ${cli:Depends}, ${shlibs:Depends}, ${misc:Depends}, libglib2.0-cil
+Depends: libglib2.0-cil, ${cli:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: CLI bindings to GStreamer
  GStreamer is a streaming media framework, based on graphs of filters
  which operate on media data.  Applications using this library can do
@@ -38,7 +38,10 @@ Description: CLI bindings to GStreamer
 
 Package: libgstreamer0.10-cil-dev
 Architecture: all
-Depends: ${cli:Depends}, ${misc:Depends}, libgstreamer0.9-cil (= ${binary:Version})
+Depends: libgstreamer0.9-cil (<< ${source:Upstream-Version}.1~),
+         libgstreamer0.9-cil (>= ${source:Upstream-Version}),
+         ${cli:Depends},
+         ${misc:Depends}
 Description: CLI bindings to GStreamer - development files
  GStreamer is a streaming media framework, based on graphs of filters
  which operate on media data.  Applications using this library can do
diff --git a/debian/libgstreamer0.10-cil-dev.install b/debian/libgstreamer0.10-cil-dev.install
index 85d7d5b..9aac69b 100644
--- a/debian/libgstreamer0.10-cil-dev.install
+++ b/debian/libgstreamer0.10-cil-dev.install
@@ -1,2 +1,2 @@
-/usr/share/gapi/
 /usr/lib/pkgconfig/
+/usr/share/gapi/
diff --git a/debian/libgstreamer0.9-cil.install b/debian/libgstreamer0.9-cil.install
index 81fa011..1840c6e 100644
--- a/debian/libgstreamer0.9-cil.install
+++ b/debian/libgstreamer0.9-cil.install
@@ -1,2 +1,2 @@
-/usr/lib/mono/gac/gstreamer-sharp/*/gstreamer-sharp.dll*    /usr/lib/cli/gstreamer-sharp-0.9/
 /usr/lib/libgstreamersharpglue-0.10.so                      /usr/lib/cli/gstreamer-sharp-0.9/
+/usr/lib/mono/gac/gstreamer-sharp/*/gstreamer-sharp.dll*    /usr/lib/cli/gstreamer-sharp-0.9/

-- 
gstreamer-sharp