[Pkg-xfce-commits] r4379 - desktop/branches/experimental/xfwm4/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-04 09:29:22 +0000 (Thu, 04 Nov 2010)
New Revision: 4379

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

Modified: desktop/branches/experimental/xfwm4/debian/changelog
===================================================================
--- desktop/branches/experimental/xfwm4/debian/changelog	2010-11-04 09:25:05 UTC (rev 4378)
+++ desktop/branches/experimental/xfwm4/debian/changelog	2010-11-04 09:29:22 UTC (rev 4379)
@@ -4,10 +4,12 @@
   * debian/control:
     - update standards version to 3.9.1.
     - refresh build-deps for Xfce 4.7.
+    - build-conflicts against libxfcegui4-dev to be sure to pick kbd headers
+      from libxfce4ui-dev.
   * debian/rules:
     - pick {C,LD}FLAGS from dpkg-buildflags.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 16:08:18 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 10:23:10 +0100
 
 xfwm4 (4.6.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfwm4/debian/control
===================================================================
--- desktop/branches/experimental/xfwm4/debian/control	2010-11-04 09:25:05 UTC (rev 4378)
+++ desktop/branches/experimental/xfwm4/debian/control	2010-11-04 09:29:22 UTC (rev 4379)
@@ -7,6 +7,7 @@
  libxft-dev, libxdamage-dev, libxrender-dev, libxcomposite-dev,
  libxfixes-dev, chrpath, libglade2-dev, libxfce4util-dev (>= 4.7.0),
  libxfce4ui-1-dev (>= 4.7.0), libxfconf-0-dev, libwnck-dev, intltool
+Build-Conflicts: libxfcegui4-dev
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfwm4/