[Pkg-xfce-commits] r4957 - desktop/branches/experimental/exo/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-02-11 07:39:21 +0000 (Fri, 11 Feb 2011)
New Revision: 4957

Modified:
   desktop/branches/experimental/exo/debian/changelog
   desktop/branches/experimental/exo/debian/control
Log:
add debhelper 8.1.0 build-conflicts since we use --remaining-packages in
an override target.

Modified: desktop/branches/experimental/exo/debian/changelog
===================================================================
--- desktop/branches/experimental/exo/debian/changelog	2011-02-11 07:38:32 UTC (rev 4956)
+++ desktop/branches/experimental/exo/debian/changelog	2011-02-11 07:39:21 UTC (rev 4957)
@@ -2,8 +2,10 @@
 
   * debian/control:
     - update build-dependencies to Xfce 4.8.                    closes: #612395
+    - add debhelper 8.1.0 build-conflicts since we use --remaining-packages in
+      an override target.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 08 Feb 2011 11:32:31 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 11 Feb 2011 08:35:13 +0100
 
 exo (0.6.0-1) experimental; urgency=low
 

Modified: desktop/branches/experimental/exo/debian/control
===================================================================
--- desktop/branches/experimental/exo/debian/control	2011-02-11 07:38:32 UTC (rev 4956)
+++ desktop/branches/experimental/exo/debian/control	2011-02-11 07:39:21 UTC (rev 4957)
@@ -9,6 +9,7 @@
 Build-Depends: debhelper (>= 7.2.7), libxfce4util-dev (>= 4.8.0), 
  libxfce4ui-1-dev (>= 4.8.0), liburi-perl, chrpath, intltool, 
  hardening-includes, libglib2.0-dev (>= 2.27)
+Build-Conflicts: debhelper (= 8.1.0)
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/