[Pkg-xfce-commits] r4378 - desktop/branches/experimental/xfce4-settings/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-04 09:25:05 +0000 (Thu, 04 Nov 2010)
New Revision: 4378

Modified:
   desktop/branches/experimental/xfce4-settings/debian/changelog
   desktop/branches/experimental/xfce4-settings/debian/control
Log:
build-conflicts with libxfcegui4-dev to be sure to pick kbd headers from
libxfce4ui-dev.

Modified: desktop/branches/experimental/xfce4-settings/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/changelog	2010-11-04 09:06:02 UTC (rev 4377)
+++ desktop/branches/experimental/xfce4-settings/debian/changelog	2010-11-04 09:25:05 UTC (rev 4378)
@@ -8,6 +8,8 @@
   * debian/control:
     - bump exo build-dep to exo-1 0.5.1.
     - switch libxfcegui4 build-dep to libxfce4ui.
+    - build-conflicts with libxfcegui4-dev to be sure to pick kbd headers from
+      libxfce4ui-dev.
 
   [ Lionel Le Folgoc ]
   * debian/control:
@@ -17,7 +19,7 @@
     - call dpkg-buildflags
     - link with --as-needed.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 15:35:02 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 10:24:32 +0100
 
 xfce4-settings (4.6.4-2) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-settings/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/control	2010-11-04 09:06:02 UTC (rev 4377)
+++ desktop/branches/experimental/xfce4-settings/debian/control	2010-11-04 09:25:05 UTC (rev 4378)
@@ -8,6 +8,7 @@
  libxfce4ui-1-dev (>= 4.7.0), libexo-1-dev (>= 0.5.0),
  libxfconf-0-dev, libwnck-dev, libxklavier-dev (>= 5.0), libnotify-dev,
  intltool (>= 0.31)
+Build-Conflicts: libxfcegui4-dev
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-settings