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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-01-30 21:13:59 +0000 (Mon, 30 Jan 2012)
New Revision: 6362

Modified:
   desktop/trunk/thunar/debian/changelog
   desktop/trunk/thunar/debian/control
   desktop/trunk/thunar/debian/rules
   desktop/trunk/thunar/debian/thunar-data.install
   desktop/trunk/thunar/debian/thunar.install
Log:
* debian/rules, debian/thunar.install, debian/thunar-data.install: move
  thunar-sendto-email.desktop from thunar-data to thunar, as the path
  generated for the thunar-sendto-email binary is architecture-dependent.
                                                              Closes: #657807
* debian/control: thunar breaks and replaces thunar-data (<< 1.2.3-3).

Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2012-01-28 12:21:36 UTC (rev 6361)
+++ desktop/trunk/thunar/debian/changelog	2012-01-30 21:13:59 UTC (rev 6362)
@@ -1,3 +1,13 @@
+thunar (1.2.3-3) UNRELEASED; urgency=low
+
+  * debian/rules, debian/thunar.install, debian/thunar-data.install: move
+    thunar-sendto-email.desktop from thunar-data to thunar, as the path
+    generated for the thunar-sendto-email binary is architecture-dependent.
+                                                                Closes: #657807
+  * debian/control: thunar breaks and replaces thunar-data (<< 1.2.3-3).
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 29 Jan 2012 13:18:36 +0100
+
 thunar (1.2.3-2) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: desktop/trunk/thunar/debian/control
===================================================================
--- desktop/trunk/thunar/debian/control	2012-01-28 12:21:36 UTC (rev 6361)
+++ desktop/trunk/thunar/debian/control	2012-01-30 21:13:59 UTC (rev 6362)
@@ -39,6 +39,8 @@
 Recommends: dbus-x11, ${shlibs:Recommends}, thunar-volman [linux-any], tumbler,
  xdg-user-dirs, gvfs
 Suggests: thunar-archive-plugin, thunar-media-tags-plugin
+Breaks: thunar-data (<< 1.2.3-3)
+Replaces: thunar-data (<< 1.2.3-3)
 Description: File Manager for Xfce
  Thunar is the file manager designed to be the default file manager of Xfce 4.6
  It has been designed to be fast and easy to use.

Modified: desktop/trunk/thunar/debian/rules
===================================================================
--- desktop/trunk/thunar/debian/rules	2012-01-28 12:21:36 UTC (rev 6361)
+++ desktop/trunk/thunar/debian/rules	2012-01-30 21:13:59 UTC (rev 6362)
@@ -18,17 +18,13 @@
 override_dh_install:
 	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*/*.la
-	# install sendto stuff
-	install -m 0644 $(CURDIR)/debian/bluetooth-sendto.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
-	install -m 0644 $(CURDIR)/debian/gnome-obex-send.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
-	install -m 0644 $(CURDIR)/debian/xfprint.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
 	# rpath
 	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \
 		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/Thunar/thunar-* \
 		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libthunar*.so.*0 \
 		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/thunarx-2/thunar-apr.so \
 		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.so
-	dh_install --fail-missing --sourcedir=debian/tmp -X usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.la
+	dh_install --fail-missing -X usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.la
 
 override_dh_installdocs:
 	dh_installdocs -p libthunarx-2-dev -p libthunarx-2-0 -p thunar --link-doc=thunar-data

Modified: desktop/trunk/thunar/debian/thunar-data.install
===================================================================
--- desktop/trunk/thunar/debian/thunar-data.install	2012-01-28 12:21:36 UTC (rev 6361)
+++ desktop/trunk/thunar/debian/thunar-data.install	2012-01-30 21:13:59 UTC (rev 6362)
@@ -5,4 +5,6 @@
 usr/share/icons
 usr/share/locale
 usr/share/pixmaps
-usr/share/Thunar
+debian/bluetooth-sendto.desktop usr/share/Thunar/sendto
+debian/gnome-obex-send.desktop usr/share/Thunar/sendto
+debian/xfprint.desktop usr/share/Thunar/sendto

Modified: desktop/trunk/thunar/debian/thunar.install
===================================================================
--- desktop/trunk/thunar/debian/thunar.install	2012-01-28 12:21:36 UTC (rev 6361)
+++ desktop/trunk/thunar/debian/thunar.install	2012-01-30 21:13:59 UTC (rev 6362)
@@ -4,3 +4,4 @@
 usr/share/man
 usr/lib/*/xfce4/panel/plugins/libthunar-tpa.so
 usr/share/xfce4/panel-plugins/thunar-tpa.desktop
+usr/share/Thunar/sendto/thunar-sendto-email.desktop