[Pkg-xfce-commits] r1811 - desktop/trunk/thunar/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-03-22 18:16:49 +0000 (Sat, 22 Mar 2008)
New Revision: 1811

Modified:
   desktop/trunk/thunar/debian/changelog
   desktop/trunk/thunar/debian/control
   desktop/trunk/thunar/debian/rules
   desktop/trunk/thunar/debian/thunar.install
Log:
change xfce4-panel Depends: to Recommends: in thunar for trash applet plugin


Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2008-03-18 20:12:52 UTC (rev 1810)
+++ desktop/trunk/thunar/debian/changelog	2008-03-22 18:16:49 UTC (rev 1811)
@@ -1,8 +1,16 @@
 thunar (0.9.0-6) UNRELEASED; urgency=low
 
-  * debian/control: add Homepage: field.
+  * debian/control: 
+    - add Homepage: field.
+    - add a note about the trash applet plugin.
+    - update conflict against thunar-data package for thunar-tpa.desktop
+  * debian/rules:
+    - add shlibdeps information for trash applet to thunar Recommends: instead
+      of Depends:.
+    - don't ship the thunar-tpa.desktop file in thunar-data.
+  * debian/thunar.install: ship thunar-tpa.desktop in thunar package.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 02 Mar 2008 16:22:20 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 Mar 2008 18:39:40 +0100
 
 thunar (0.9.0-5) unstable; urgency=low
 

Modified: desktop/trunk/thunar/debian/control
===================================================================
--- desktop/trunk/thunar/debian/control	2008-03-18 20:12:52 UTC (rev 1810)
+++ desktop/trunk/thunar/debian/control	2008-03-22 18:16:49 UTC (rev 1811)
@@ -31,15 +31,16 @@
 Package: thunar
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, shared-mime-info, thunar-data (= ${source:Version})
-Recommends: hal, dbus, gamin
-Conflicts: libthunar-vfs-1 (<= 0.2.0alpha-r19548-3), thunar-data (<= 0.9.0-3)
+Recommends: hal, dbus, gamin, ${shlibs:Recommends}
+Conflicts: libthunar-vfs-1 (<= 0.2.0alpha-r19548-3), thunar-data (<= 0.9.0-5)
 Replaces: libthunar-vfs-dev (<= 0.3.0beta1-2)
 Suggests: thunar-archive-plugin, thunar-media-tags-plugin, thunar-volman
 Description: File Manager for Xfce
  Thunar is the file manager designed to be the default file manager of Xfce 4.4
  It has been designed to be fast and easy to use.
-  .
-  Please read README.Debian for volume management stuff.
+ .
+ A Xfce plugin can manages the trash, if xfce4-panel is installed as well.
+ Please read README.Debian for volume management stuff.
 
 Package: thunar-data
 Architecture: all

Modified: desktop/trunk/thunar/debian/rules
===================================================================
--- desktop/trunk/thunar/debian/rules	2008-03-18 20:12:52 UTC (rev 1810)
+++ desktop/trunk/thunar/debian/rules	2008-03-22 18:16:49 UTC (rev 1811)
@@ -5,6 +5,9 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-final --disable-gnome-thumbnailers --enable-dbus --enable-startup-notification --enable-apr-plugin --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin
 
+DEB_DH_SHLIBDEPS_ARGS_thunar = -X debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -- -dRecommends debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -dDepends
+
+
 makebuilddir/thunar:: debian/compat
 	# Some systems don't have POSIX_MADV* but have MADV* defined with
 	# the same values anyway.
@@ -27,6 +30,7 @@
 
 binary-post-install/thunar-data::
 	rm -rf $(CURDIR)/debian/thunar-data/usr/share/applications
+	rm -rf $(CURDIR)/debian/thunar-data/usr/share/xfce4/
 
 # The symlinks below aren't enough for dpkg to replace a directory with a
 # symlink but they mean it's part of the package.

Modified: desktop/trunk/thunar/debian/thunar.install
===================================================================
--- desktop/trunk/thunar/debian/thunar.install	2008-03-18 20:12:52 UTC (rev 1810)
+++ desktop/trunk/thunar/debian/thunar.install	2008-03-22 18:16:49 UTC (rev 1811)
@@ -1,3 +1,4 @@
 debian/tmp/usr/bin/*
 debian/tmp/usr/lib/thunar/*
 debian/tmp/usr/share/applications/*
+debian/tmp/usr/share/xfce4/panel-plugins/thunar-tpa.desktop