Index: pkg/kev/main/libgnomekbd/trunk/debian/control
===================================================================
--- pkg/kev/main/libgnomekbd/trunk/debian/control	(revision 5099)
+++ pkg/kev/main/libgnomekbd/trunk/debian/control	(revision 5551)
@@ -2,57 +2,37 @@
 Priority: optional
 Maintainer: Loic Minier <lool@dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 5),
         autotools-dev,
         cdbs,
+        gnome-pkg-tools (>= 0.10),
+        dpkg-dev (>= 1.13.19),
+        quilt,
+        libglib2.0-dev (>= 2.16),
         libdbus-1-dev (>= 0.92),
         libdbus-glib-1-dev (>= 0.34),
-        libglib2.0-dev (>= 2.16),
         libgconf2-dev (>= 2.14.0),
         libgtk2.0-dev (>= 2.13),
+        libglade2-dev (>= 2.6.0),
         libxklavier12-dev (>= 3.2) | libxklavier-dev,
-        libglade2-dev (>= 2.6.0),
-        libxml-parser-perl,
-        gnome-pkg-tools (>= 0.10),
-        dpkg-dev (>= 1.13.19),
         intltool (>= 0.35)
-Standards-Version: 3.8.0.1
-Section: libs
+Standards-Version: 3.8.2
+Section: gnome
 
 Package: libgnomekbd-dev
 Section: libdevel
 Architecture: any
+Conflicts: libgnomekbdui-dev
+Replaces: libgnomekbdui-dev
+Provides: libgnomekbdui-dev
 Depends: libgnomekbd3 (= ${binary:Version}),
-        libglib2.0-dev (>= 2.6),
-        libgconf2-dev,
-        libx11-dev,
-        libgtk2.0-dev,
+        libglib2.0-dev (>= 2.16),
+        libgtk2.0-dev (>= 2.13),
+        libgconf2-dev (>= 2.14.0),
+        libxklavier12-dev (>= 3.2) | libxklavier-dev,
         libdbus-1-dev (>= 0.92),
         libdbus-glib-1-dev (>= 0.34),
-        libxklavier12-dev | libxklavier-dev,
+        libx11-dev
 Description: GNOME library to manage keyboard configuration - development files
- libgnomekbd offers an API to manage the keyboard in GNOME applications.
- .
- This package contains the development files.
-
-Package: libgnomekbd3
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-        ${misc:Depends},
-        libgnomekbd-common (= ${source:Version})
-Description: GNOME library to manage keyboard configuration - shared library
- libgnomekbd offers an API to manage the keyboard in GNOME applications.
- .
- This package contains the shared library.
-
-Package: libgnomekbdui-dev
-Section: libdevel
-Architecture: any
-Depends: libgnomekbdui3 (= ${binary:Version}),
-        libgnomekbd-dev,
-        libgnomecanvas2-dev,
-        libgnome-keyring-dev
-Description: User interface library for libgnomekbd - development files
  libgnomekbd offers an API to manage the keyboard in GNOME applications.
  .
@@ -62,10 +42,14 @@
  This package contains the development files.
 
-Package: libgnomekbdui3
+Package: libgnomekbd3
 Section: libs
 Architecture: any
+Conflicts: libgnomekbdui3
+Replaces: libgnomekbdui3
+Provides: libgnomekbdui3
 Depends: ${shlibs:Depends},
-        ${misc:Depends}
-Description: User interface library for libgnomekbd - shared library
+        ${misc:Depends},
+        libgnomekbd-common (>= ${source:Version})
+Description: GNOME library to manage keyboard configuration - shared library
  libgnomekbd offers an API to manage the keyboard in GNOME applications.
  .
@@ -84,4 +68,7 @@
  libgnomekbd offers an API to manage the keyboard in GNOME applications.
  .
+ libgnomekbdui offers an API to display a graphical user interface for
+ libgnomekbd operations. 
+ .
  This package contains files common to the various libgnomekbd packages.