r52804 - in /desktop/experimental/mutter/debian: changelog control control.in

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Tue Aug 15 13:21:36 2017
New Revision: 52804

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52804
Log:
Add Conflicts: libmutter-0-dev to libmutter-1-dev both ship the same include/ file names

Modified:
    desktop/experimental/mutter/debian/changelog
    desktop/experimental/mutter/debian/control
    desktop/experimental/mutter/debian/control.in

Modified: desktop/experimental/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/changelog?rev=52804&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog	[utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog	[utf-8] Tue Aug 15 13:21:36 2017
@@ -11,6 +11,8 @@
     - Loosen dependency on -common package
     - Don't recommend gnome-session | x-session-manager (LP: #1703685)
     - Build-depend on xauth and xfvb for build tests
+    - Add Conflicts: libmutter-0-dev to libmutter-1-dev since
+      both ship the same development header file names
   * debian/rules:
     - Build with --enable-egl-device (LP: #1666664)
       This enables experimental support for using NVIDIA proprietary

Modified: desktop/experimental/mutter/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/control?rev=52804&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/control	[utf-8] (original)
+++ desktop/experimental/mutter/debian/control	[utf-8] Tue Aug 15 13:21:36 2017
@@ -148,6 +148,7 @@
          libxfixes-dev,
          libxrandr-dev,
          libx11-dev
+Conflicts: libmutter-0-dev
 Description: Development files for the Mutter window manager
  Mutter is a small window manager, using GTK+ and Clutter to do
  everything.

Modified: desktop/experimental/mutter/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/control.in?rev=52804&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/control.in	[utf-8] (original)
+++ desktop/experimental/mutter/debian/control.in	[utf-8] Tue Aug 15 13:21:36 2017
@@ -144,6 +144,7 @@
          libxfixes-dev,
          libxrandr-dev,
          libx11-dev
+Conflicts: libmutter-0-dev
 Description: Development files for the Mutter window manager
  Mutter is a small window manager, using GTK+ and Clutter to do
  everything.