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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-01-02 16:39:20 +0000 (Sun, 02 Jan 2011)
New Revision: 4772

Modified:
   desktop/branches/experimental/thunar/debian/changelog
   desktop/branches/experimental/thunar/debian/control
   desktop/branches/experimental/thunar/debian/rules
   desktop/branches/experimental/thunar/debian/thunar.install
Log:
  - bump xfce4-panel-dev b-dep to >= 4.7.7.
  - updated path to the panel plugin.

Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog	2011-01-02 16:31:41 UTC (rev 4771)
+++ desktop/branches/experimental/thunar/debian/changelog	2011-01-02 16:39:20 UTC (rev 4772)
@@ -12,7 +12,6 @@
   * debian/rules:
     - stop messing with POSIX_MADV since thunar-vfs is gone.
     - drop enable-final and disable-gnome-thumbnailers from configure flags.
-    - drop thunar trash applet (tpa) things for now.
     - configure *FLAGS using dpkg-buildflags.
     - link with --as-needed, -z,defs and -O1.
     - change thunarx libname to 2 in chrpath call.
@@ -33,12 +32,12 @@
     - rename libthunar-vfs package to libthunarx since thunar-vfs has been
       dropped.
     - add recommends on tumbler.
-    - temporarily drop xfce4-panel build-dep until we have a stable situation.
+    - bump xfce4-panel-dev b-dep to >= 4.7.7.
     - add build-dep on hardening-includes.
   * drop libthunar-vfs maintainer scripts and lintian overrides.
   * debian/watch updated.
   * debian/thunar.install:
-    - drop tpa for now.
+    - updated path to the panel plugin.
     - rename lib dir from thunar to Thunar
   * debian/README.Debian: update help snippet for device mounts, recommend
     thunar-volman.

Modified: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/branches/experimental/thunar/debian/control	2011-01-02 16:31:41 UTC (rev 4771)
+++ desktop/branches/experimental/thunar/debian/control	2011-01-02 16:39:20 UTC (rev 4772)
@@ -8,7 +8,7 @@
  libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1), chrpath,
  libpcre3-dev, libjpeg-dev, libstartup-notification0-dev (>= 0.4), intltool,
  libxfce4ui-1-dev (>= 4.7.1), libnotify-dev, libgudev-1.0-dev [linux-any],
- hardening-includes
+ xfce4-panel-dev (>= 4.7.7), hardening-includes
 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-01-02 16:31:41 UTC (rev 4771)
+++ desktop/branches/experimental/thunar/debian/rules	2011-01-02 16:39:20 UTC (rev 4772)
@@ -32,7 +32,7 @@
 		$(CURDIR)/debian/tmp/usr/lib/Thunar/thunar-* \
 		$(CURDIR)/debian/tmp/usr/lib/libthunar*.so.*0 \
 		$(CURDIR)/debian/tmp/usr/lib/thunarx-2/thunar-apr.so
-		#$(CURDIR)/debian/tmp/usr/lib/xfce4/panel/plugins/libthunar-tpa.so
+		$(CURDIR)/debian/tmp/usr/lib/xfce4/panel/plugins/libthunar-tpa.so
 	dh_install --fail-missing --sourcedir=debian/tmp -X usr/lib/xfce4/panel/plugins/libthunar-tpa.la
 
 override_dh_installdocs:
@@ -42,9 +42,9 @@
 override_dh_strip:
 	dh_strip --dbg-package=thunar-dbg
 
-#override_dh_shlibdeps:
-#	dh_shlibdeps -X debian/thunar/usr/lib/xfce4/panel/plugins/libthunar-tpa.so -- \
-#    -dRecommends debian/thunar/usr/lib/xfce4/panel/plugins/libthunar-tpa.so -dDepends
+override_dh_shlibdeps:
+	dh_shlibdeps -X debian/thunar/usr/lib/xfce4/panel/plugins/libthunar-tpa.so -- \
+    -dRecommends debian/thunar/usr/lib/xfce4/panel/plugins/libthunar-tpa.so -dDepends
 
 override_dh_makeshlibs:
 	dh_makeshlibs -p libthunarx-2-0 -X debian/libthunarx-2-0/usr/lib/thunarx-2

Modified: desktop/branches/experimental/thunar/debian/thunar.install
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar.install	2011-01-02 16:31:41 UTC (rev 4771)
+++ desktop/branches/experimental/thunar/debian/thunar.install	2011-01-02 16:39:20 UTC (rev 4772)
@@ -2,5 +2,5 @@
 usr/lib/Thunar/*
 usr/share/applications/*
 usr/share/man
-#usr/lib/xfce4/panel/plugins/libthunar-tpa.so
-#usr/share/xfce4/panel-plugins/thunar-tpa.desktop
+usr/lib/xfce4/panel/plugins/libthunar-tpa.so
+usr/share/xfce4/panel/plugins/thunar-tpa.desktop