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

Tue Jul 27 06:11:05 UTC 2010

Author: corsac
Date: 2010-07-27 06:10:46 +0000 (Tue, 27 Jul 2010)
New Revision: 4189

Modified:
   desktop/branches/experimental/thunar/debian/README.Debian
   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:
  - drop thunar trash applet (tpa) things for now.
  - configure *FLAGS using dpkg-buildflags.
  - temporarily drop xfce4-panel build-dep until we have a stable situation.
* debian/thunar.install:
  - drop tpa for now.
* debian/README.Debian: update help snippet for device mounts, recommend
  thunar-volman.

Modified: desktop/branches/experimental/thunar/debian/README.Debian
===================================================================

--- desktop/branches/experimental/thunar/debian/README.Debian	2010-07-27 05:31:47 UTC (rev 4188)
+++ desktop/branches/experimental/thunar/debian/README.Debian	2010-07-27 06:10:46 UTC (rev 4189)
@@ -2,9 +2,12 @@
 -----------------
 
 In order to use volume management features (i.e. mounting external disks/USB
-sticks/cameras etc) you should install hal and dbus.
+sticks/cameras etc) you should install Gvfs and should have a working
+PolicyKit/ConsoleKit setup. Instructions for doing so can be found in relevant
+packages documentation and in xfce4-session README.Debian.
 
-You also need to add yourself to the plugdev group and you may need to
-restart dbus after doing so if it is already running.
+Interested people can install the thunar-volman package to have automatic setup
+of removable device, including automounting mass storage devices, configuration
+of input devices, photo import from camera etc.
 
  -- Xfce Packagers <pkg-xfce-devel at lists.alioth.debian.org>

Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog	2010-07-27 05:31:47 UTC (rev 4188)
+++ desktop/branches/experimental/thunar/debian/changelog	2010-07-27 06:10:46 UTC (rev 4189)
@@ -8,6 +8,8 @@
   * 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.
   * debian/patches:
     - 01_thunar-help-directory dropped, not useful anymore.
     - 02_thunar-icon-naming-spec-compliance refreshed.
@@ -22,11 +24,16 @@
     - 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.
   * debian/rules:
     - change thunarx libname to 2 in chrpath call.
     - ignore thunarx plugins in dh_makeshlibs.
   * drop libthunar-vfs maintainer scripts and lintian overrides.
   * debian/watch updated.
+  * debian/thunar.install:
+    - drop tpa for now.
+  * debian/README.Debian: update help snippet for device mounts, recommend
+    thunar-volman.
 
   [ Lionel Le Folgoc ]
   * debian/control:
@@ -51,7 +58,7 @@
       + pass --docdir=\$${prefix}/share/doc/thunar-data instead of moving
         the dir manually as it breaks some docs.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 21 Feb 2010 15:37:20 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 27 Jul 2010 08:07:49 +0200
 
 thunar (1.0.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/branches/experimental/thunar/debian/control	2010-07-27 05:31:47 UTC (rev 4188)
+++ desktop/branches/experimental/thunar/debian/control	2010-07-27 06:10:46 UTC (rev 4189)
@@ -6,7 +6,7 @@
  Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), libexo-1-dev (>= 0.5.1), libxml-parser-perl,
  libfam-dev, libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
- xfce4-panel-dev (>= 4.7.0), chrpath, libpcre3-dev, libjpeg-dev,
+ chrpath, libpcre3-dev, libjpeg-dev,
  libstartup-notification0-dev (>= 0.4), intltool, libxfce4ui-1-dev (>= 4.7.1),
  libnotify-dev, libgudev-1.0-dev
 Build-Conflicts: libgamin-dev [!hurd-i386]

Modified: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/branches/experimental/thunar/debian/rules	2010-07-27 05:31:47 UTC (rev 4188)
+++ desktop/branches/experimental/thunar/debian/rules	2010-07-27 06:10:46 UTC (rev 4189)
@@ -1,11 +1,8 @@
 #!/usr/bin/make -f
 
 #LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 
 %:
 	dh $@
@@ -28,8 +25,8 @@
 	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \
 		$(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/thunar/xfce4/panel-plugins/thunar-tpa
+		$(CURDIR)/debian/tmp/usr/lib/thunarx-2/thunar-apr.so
+		#$(CURDIR)/debian/tmp/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa
 	dh_install --fail-missing --sourcedir=debian/tmp
 
 override_dh_link:
@@ -42,9 +39,9 @@
 override_dh_strip:
 	dh_strip --dbg-package=thunar-dbg
 
-override_dh_shlibdeps:
-	dh_shlibdeps -X debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -- \
-    -dRecommends debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -dDepends
+#override_dh_shlibdeps:
+#	dh_shlibdeps -X debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -- \
+#    -dRecommends debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -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	2010-07-27 05:31:47 UTC (rev 4188)
+++ desktop/branches/experimental/thunar/debian/thunar.install	2010-07-27 06:10:46 UTC (rev 4189)
@@ -2,4 +2,4 @@
 usr/lib/thunar/*
 usr/share/applications/*
 usr/share/man
-usr/share/xfce4/panel-plugins/thunar-tpa.desktop
+#usr/share/xfce4/panel-plugins/thunar-tpa.desktop


