[Pkg-xfce-commits] r4958 - desktop/branches/experimental/thunar/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-02-11 07:45:33 +0000 (Fri, 11 Feb 2011)
New Revision: 4958

Modified:
   desktop/branches/experimental/thunar/debian/changelog
   desktop/branches/experimental/thunar/debian/control
   desktop/branches/experimental/thunar/debian/rules
Log:
* debian/control:
  - add build-conflicts on debhelper 8.1.0.
* debian/rules:
  - revert to the use of --remaining-packages in override target since
    debhelper 8.1.1 supports that.

Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog	2011-02-11 07:39:21 UTC (rev 4957)
+++ desktop/branches/experimental/thunar/debian/changelog	2011-02-11 07:45:33 UTC (rev 4958)
@@ -1,3 +1,13 @@
+thunar (1.2.1-2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - add build-conflicts on debhelper 8.1.0.
+  * debian/rules:
+    - revert to the use of --remaining-packages in override target since
+      debhelper 8.1.1 supports that.
+ 
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 11 Feb 2011 08:40:23 +0100
+
 thunar (1.2.1-1) experimental; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/branches/experimental/thunar/debian/control	2011-02-11 07:39:21 UTC (rev 4957)
+++ desktop/branches/experimental/thunar/debian/control	2011-02-11 07:45:33 UTC (rev 4958)
@@ -9,6 +9,7 @@
  libpcre3-dev, libjpeg-dev, libstartup-notification0-dev (>= 0.4), intltool,
  libxfce4ui-1-dev (>= 4.8.0), libnotify-dev, libgudev-1.0-dev [linux-any],
  xfce4-panel-dev (>= 4.8.0), hardening-includes
+Build-Conflicts: debhelper (= 8.1.0)
 Standards-Version: 3.9.1
 Homepage: http://thunar.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/

Modified: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/branches/experimental/thunar/debian/rules	2011-02-11 07:39:21 UTC (rev 4957)
+++ desktop/branches/experimental/thunar/debian/rules	2011-02-11 07:45:33 UTC (rev 4958)
@@ -37,8 +37,7 @@
 
 override_dh_installdocs:
 	dh_installdocs -p libthunarx-2-dev -p libthunarx-2-0 -p thunar --link-doc=thunar-data
-	dh_installdocs -p thunar-dbg
-	dh_installdocs -p thunar-data
+	dh_installdocs --remaining-packages
 
 override_dh_strip:
 	dh_strip --dbg-package=thunar-dbg