[Pkg-xfce-commits] r4956 - desktop/branches/experimental/xfconf/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-02-11 07:38:32 +0000 (Fri, 11 Feb 2011)
New Revision: 4956

Modified:
   desktop/branches/experimental/xfconf/debian/changelog
   desktop/branches/experimental/xfconf/debian/control
Log:
add debhelper build-conflicts to avoid 8.1.0 because we use

Modified: desktop/branches/experimental/xfconf/debian/changelog
===================================================================
--- desktop/branches/experimental/xfconf/debian/changelog	2011-02-11 07:36:18 UTC (rev 4955)
+++ desktop/branches/experimental/xfconf/debian/changelog	2011-02-11 07:38:32 UTC (rev 4956)
@@ -1,10 +1,10 @@
 xfconf (4.8.0-2) UNRELEASED; urgency=low
 
   * debian/control:
-    - update debhelper build-dep to avoid 8.1.0 because we use
+    - add debhelper build-conflicts to avoid 8.1.0 because we use
       --remaining-packages in overrides rules.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 11 Feb 2011 08:07:45 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 11 Feb 2011 08:34:16 +0100
 
 xfconf (4.8.0-1) experimental; urgency=low
 

Modified: desktop/branches/experimental/xfconf/debian/control
===================================================================
--- desktop/branches/experimental/xfconf/debian/control	2011-02-11 07:36:18 UTC (rev 4955)
+++ desktop/branches/experimental/xfconf/debian/control	2011-02-11 07:38:32 UTC (rev 4956)
@@ -5,10 +5,10 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>,
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>> 8.1.0) | debhelper (<< 8.1.0), 
- libxfce4util-dev (>= 4.8.0), libdbus-1-dev, libdbus-glib-1-dev, 
- libextutils-pkgconfig-perl, libextutils-depends-perl, libglib-perl, intltool, 
- hardening-includes
+Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.8.0), 
+ libdbus-1-dev, libdbus-glib-1-dev, libextutils-pkgconfig-perl, 
+ libextutils-depends-perl, libglib-perl, intltool, hardening-includes
+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/xfconf