[libwnck] 36/38: debian/control: various breaks/conflicts fixes, also multi-arch field typo and section fix

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository libwnck.

commit e1845832b4bafafe27c74eee550a91a165537839
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 8 15:16:44 2016 +0100

    debian/control: various breaks/conflicts fixes, also multi-arch field typo and section fix
---
 debian/control | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index d799839..95cace3 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,6 @@ Build-Depends: debhelper (>= 9),
                libx11-dev,
                libxres-dev,
                libxt-dev,
-               libxres-dev,
                intltool (>= 0.40.0),
                libglib2.0-dev (>= 2.16.0),
                gobject-introspection,
@@ -28,11 +27,13 @@ Vcs-Git: git://anonscm.debian.org/pkg-mate/libwnck.git
 Homepage: https://developer.gnome.org/libwnck/2.30/
 
 Package: libwnck22
-Multiarch: same
+Multi-Arch: same
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libwnck-common
+Conflicts: libwnck-1,
+Replaces: libwnck-1,
 Description: Window Navigator Construction Kit - runtime files
  A library to use for writing pagers and task lists. This variant
  of libwnck provides WNCK for GTK-2 based applications.
@@ -40,7 +41,7 @@ Description: Window Navigator Construction Kit - runtime files
  This package contains runtime files.
 
 Package: libwnck-dev
-Multiarch: same
+Multi-Arch: same
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
@@ -51,7 +52,6 @@ Depends: ${misc:Depends},
          libgtk2.0-dev (>= 2.19.7),
          libstartup-notification0-dev (>= 0.7-1),
          libcairo2-dev,
-         libxres-dev,
          ${shlibs:Depends}
 Replaces: gir-repository-dev (<< 0.6.5-7)
 Description: Window Navigator Construction Kit - development files
@@ -61,11 +61,10 @@ Description: Window Navigator Construction Kit - development files
  This package contains development files (include headers).
 
 Package: libwnck-common
-Multiarch: foreign
+Multi-Arch: foreign
 Architecture: all
-Depends: ${misc:Depends}
-Replaces: libwnck-1 (<= 0.10-1)
-Conflicts: libwnck-1 (<= 0.10-1)
+Depends: ${misc:Depends},
+Conflicts: libwnck-1,
 Description: Window Navigator Construction Kit - common files
  A library to use for writing pagers and task lists. This version
  of libwnck provides WNCK for GTK-2 based applications.
@@ -73,8 +72,9 @@ Description: Window Navigator Construction Kit - common files
  This package contains internationalization files.
 
 Package: libwnck-dbg
+Priority: extra
 Section: debug
-Multiarch: same
+Multi-Arch: same
 Architecture: any
 Depends: ${misc:Depends},
          libwnck22 (= ${binary:Version}),
@@ -87,10 +87,11 @@ Description: Window Navigator Construction Kit - debugging symbols
  gdb.
 
 Package: libwnck-doc
-Multiarch: doc
+Section: doc
 Architecture: all
 Depends: ${misc:Depends},
 Breaks: libwnck-dev (<< 2.30.7-3~),
+Conflicts: libwnck-1,
 Description: Window Navigator Construction Kit - documentation files
  A library to use for writing pagers and task lists. This variant
  of libwnck provides WNCK for GTK-2 based applications.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/libwnck.git