[Pkg-xfce-commits] r6570 - in desktop/branches/experimental: . thunar thunar/debian thunar/debian/patches thunar/debian/source

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Sun Apr 1 12:04:22 UTC 2012


Author: mrpouit-guest
Date: 2012-04-01 12:04:22 +0000 (Sun, 01 Apr 2012)
New Revision: 6570

Added:
   desktop/branches/experimental/thunar/
   desktop/branches/experimental/thunar/debian/
   desktop/branches/experimental/thunar/debian/README.Debian
   desktop/branches/experimental/thunar/debian/bluetooth-sendto.desktop
   desktop/branches/experimental/thunar/debian/changelog
   desktop/branches/experimental/thunar/debian/compat
   desktop/branches/experimental/thunar/debian/control
   desktop/branches/experimental/thunar/debian/copyright
   desktop/branches/experimental/thunar/debian/gnome-obex-send.desktop
   desktop/branches/experimental/thunar/debian/libthunarx-2-0.install
   desktop/branches/experimental/thunar/debian/libthunarx-2-0.symbols
   desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install
   desktop/branches/experimental/thunar/debian/patches/
   desktop/branches/experimental/thunar/debian/patches/01_support-non-multiarch-modules.patch
   desktop/branches/experimental/thunar/debian/patches/02_fix-link-gmodule.patch
   desktop/branches/experimental/thunar/debian/patches/series
   desktop/branches/experimental/thunar/debian/rules
   desktop/branches/experimental/thunar/debian/source/
   desktop/branches/experimental/thunar/debian/source/format
   desktop/branches/experimental/thunar/debian/thunar-data.docs
   desktop/branches/experimental/thunar/debian/thunar-data.install
   desktop/branches/experimental/thunar/debian/thunar.1
   desktop/branches/experimental/thunar/debian/thunar.install
   desktop/branches/experimental/thunar/debian/thunar.manpages
   desktop/branches/experimental/thunar/debian/thunar.menu
   desktop/branches/experimental/thunar/debian/thunar.postinst
   desktop/branches/experimental/thunar/debian/watch
   desktop/branches/experimental/thunar/debian/xfprint.desktop
Log:
 branch from trunk


Property changes on: desktop/branches/experimental/thunar/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: desktop/branches/experimental/thunar/debian/README.Debian
===================================================================
--- desktop/branches/experimental/thunar/debian/README.Debian	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/README.Debian	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,13 @@
+thunar for Debian
+-----------------
+
+In order to use volume management features (i.e. mounting external disks/USB
+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.
+
+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>

Added: desktop/branches/experimental/thunar/debian/bluetooth-sendto.desktop
===================================================================
--- desktop/branches/experimental/thunar/debian/bluetooth-sendto.desktop	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/bluetooth-sendto.desktop	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Bluetooth recipient
+Icon=stock_mailto
+Exec=bluetooth-sendto %F
+TryExec=bluetooth-sendto

Added: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/changelog	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,692 @@
+thunar (1.3.0-1) UNRELEASED; urgency=low
+
+  * New upstream development release.
+  * debian/patches: add missing DEP3 headers.
+  * debian/patches/02_fix-link-gmodule.patch: added, explicitly link with
+    gmodule, fix FTBFS.
+  * debian/control:
+    - switch to libxfce4util6-dev for the new api, and bump libxfce4ui-1-dev
+      b-dep to >= 4.9.0 for the new help api.
+    - b-dep on xfce4-dev-tools, libtool, automake, autoconf and
+      gtk-doc-tools, needed by xdt-autogen.
+  * debian/rules:
+    - pass -X .la to dh_install instead of deleting them manually.
+    - run xdt-autogen before configure, needed by the patch.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 20 Feb 2012 21:43:03 +0100
+
+thunar (1.2.3-3) unstable; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * 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).
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - debhelper build-dep bumped to 9.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 08 Feb 2012 07:25:01 +0100
+
+thunar (1.2.3-2) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - re-add -z,defs to LDFLAGS.
+  * debian/control:
+    - only recommends thunar-volman on linux arches.
+
+  [ Lionel Le Folgoc ]
+  * debian/patches/01_support-non-multiarch-modules.patch: support modules
+    installed in /usr/lib/$triplet and /usr/lib, to hopefully migrate smoothly
+    thunar plugins to multiarch path over time without breakage. Closes: #645015
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 14 Oct 2011 18:47:39 +0200
+
+thunar (1.2.3-1) unstable; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * New upstream release, including:
+    - Prevent falling back to an unexpected locale.                 lp: #557255
+    - Fix regression in 1.2.2 wrt SMB shares.      Closes: #633772, lp: #846907
+  * debian/patches:
+    - 01_retrieve-the-translated-desktop-file-name.patch,
+      04_fix-maxpathlen-hurd.patch: dropped, included upstream.
+
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - switch hardening to use dh9 mode
+  * debian/compat: use mode 9.
+  * debian/control:
+    - drop build-dep on hardening-includes
+    - bump debhelper build-dep to 8.9.4 for dh9 compat mode.
+    - add Pre-depends on ${misc:Pre-Depends}.
+  * debian/rules:
+    - use multi-arch path in various rules.
+  * debian/libthunarx-2-dev.install, debian/libthunarx-2-0.install,
+    thunar.install:
+    - use multi-arch path.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 29 Sep 2011 11:38:06 +0200
+
+thunar (1.2.2-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+    - load network stuff later to speed up start (Xfce #7373).  closes: #626200
+      lp: #775117
+    - fixed Dutch translation                                       lp: #781048
+  * debian/patches:
+    - 01_use-system-td dropped, included upstream.
+    - 02_thunar-icon-naming-spec-compliance dropped, don't replace stock icons
+      even if they aren't part of the spec.
+    - 03_Don-t-interpret-file-display-names-as-format-strings dropped,
+      included upstream.
+  * debian/control:
+    - drop build-dep on xfce4-dev-tools, libtool and gtk-doc-tools
+  * debian/rules:
+    - don't run xdt-autogen anymore.
+
+  [ Lionel Le Folgoc ]
+  * debian/patches:
+    - 01_retrieve-the-translated-desktop-file-name.patch: fixes untranslated
+      .desktop display name.
+    - series: refreshed.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 18 Jun 2011 23:23:52 +0200
+
+thunar (1.2.1-6) unstable; urgency=low
+
+  * debian/patches:
+    - 04_fix-maxpathlen-hurd added, tentative patch to fix build failure on
+      GNU/Hurd.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 22 Apr 2011 08:15:46 +0200
+
+thunar (1.2.1-5) unstable; urgency=low
+
+  * Upload to unstable.
+  * debian/control:
+    - drop Emanuele and Simon from uploaders, thanks to them.
+    - update standards version to 3.9.2.
+  * debian/watch:
+    - only pick stable versions.
+  * debian/patches:
+    - 03_Don-t-interpret-file-display-names-as-format-strings.patch
+      added, fix format string error, fix CVE-2011-1588.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 19 Apr 2011 16:54:10 +0200
+
+thunar (1.2.1-4) experimental; urgency=low
+
+  * debian/control:
+    - drop debhelper build-conflict, not supported for that purpose and 8.1.0
+      isn't available anywhere anymore anyway.
+    - add build-dep on libxfce4util 4.8.                        closes: #616734
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 07 Mar 2011 07:31:56 +0100
+
+thunar (1.2.1-3) experimental; urgency=low
+
+  * debian/patches: this time really add the 01_system-tdb patch.
+  * debian/rules:
+    - run xdt-autogen since we touch Makefile.am.
+    - cleanup generated files. 
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 19 Feb 2011 23:05:51 +0100
+
+thunar (1.2.1-2) experimental; urgency=low
+
+  * debian/control:
+    - add build-conflicts on debhelper 8.1.0.
+    - add build-dep on libtdb-dev.
+  * debian/rules:
+    - revert to the use of --remaining-packages in override target since
+      debhelper 8.1.1 supports that.
+  * debian/patches:
+    - 01_system-tdb added, use system tdb and remove embedded one.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 15 Feb 2011 23:14:27 +0100
+
+thunar (1.2.1-1) experimental; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.                                       Closes: #576090
+    - add support for GIO.                         lp: #530160, Closes: #552128
+    - trash applet for panel does not scale font                     lp: #58549
+    - add support for audio cd 'mount'.                             lp: #159627
+    - add support for smb://, ftp:// uris.                 lp: #277206, #601321
+    - i/o errors on slow filesystems.                               lp: #504806
+    - .ogg files are presented as video files                       lp: #512864
+    - thunar doesn't recognize *.doc mimetype      lp: #510583, Closes: #547623
+  * debian/rules:
+    - stop messing with POSIX_MADV since thunar-vfs is gone.
+    - drop enable-final and disable-gnome-thumbnailers from configure flags.
+    - configure *FLAGS using dpkg-buildflags.
+    - link with --as-needed, -z,defs and -O1.
+    - change thunarx libname to 2 in chrpath call.
+    - rename lib dir from thunar to Thunar.
+    - ignore thunarx plugins in dh_makeshlibs.
+    - add hardening flags to {C,LD}FLAGS.
+    - don't call --remaining-packages in dh_installdocs since it won't work in
+      override rules.
+  * debian/patches:
+    - 01_thunar-help-directory dropped, not useful anymore.
+    - 02_thunar-icon-naming-spec-compliance refreshed.
+    - 03_thunar-window-maximize dropped, useless as well.
+    - 05_fix-crash-drag-gdk-none.patch: dropped also.
+    - 06_fix-sidepane-width.patch: dropped, included upstream.
+    - 07_update-cursor-on-delete.patch: dropped.
+    - 08_refilter-tree-hidden-dir.patch: dropped.
+  * debian/control:
+    - bump build-dep on exo (0.5.1).
+    - add build-dep on libxfce4ui (4.7.1).
+    - rename libthunar-vfs package to libthunarx since thunar-vfs has been
+      dropped.
+    - add recommends on tumbler.
+    - bump xfce4-panel-dev b-dep to >= 4.7.0.
+    - add build-dep on hardening-includes.
+    - drop thunar recommends on gamin, add recommends on gvfs.
+  * drop libthunar-vfs maintainer scripts and lintian overrides.
+  * debian/watch updated.
+  * debian/thunar.install:
+    - rename lib dir from thunar to Thunar
+  * debian/README.Debian: update help snippet for device mounts, recommend
+    thunar-volman.
+
+  [ Lionel Le Folgoc ]
+  * New upstream bugfix release.
+  * debian/control:
+    - update libthunarx-2-dev dep on libexo-0.3-dev to libexo-1-dev
+    - drop obsolete hal build and binary deps (this version uses GIO now)
+    - drop libfam-dev build-deps and libgamin-dev build-conflicts
+    - libthunarx-2-dev: drop dep on libexo-1-dev
+    - build-depends on libnotify-dev and libgudev-1.0-dev, drop libcairo2-dev
+    - bump xfce4-panel-dev build-dep to >= 4.7.0
+    - bump Standards-Version to 3.9.1, no change required.
+  * debian/copyright: refreshed.
+  * debian/source/format: switch to 3.0 (quilt).
+  * debian/rules: drop simple-patchsys.mk include.
+  * debian/patches:
+    - 02_thunar-icon-naming-spec-compliance.patch: refreshed to apply cleanly
+    - series: added, include the patch above.
+  * debian/thunar.postinst: explicitly set -e.
+  * Convert to dh7 + overrides:
+    - debian/control: bump dh to >= 7.4.2~ and drop cdbs build-deps
+    - debian/*.install: drop leading debian/tmp
+    - debian/rules:
+      + adapt it to dh7
+      + pass --docdir=\$${prefix}/share/doc/thunar-data instead of moving
+        the dir manually as it breaks some docs
+      + override dh_installdocs with --link-doc=thunar-data instead of making
+        the symlinks manually.
+  * debian/libthunarx-2-0.symbols: added.
+  * debian/libthunarx-2-0.shlib: dropped.
+  * debian/thunar.install, debian/rules: update paths to thunar-tpa.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 06 Feb 2011 19:56:45 +0100
+
+thunar (1.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/04_fix-umask-handling.patch: dropped, included upstream.
+  * debian/control: build-dep on libstartup-notification0-dev (>= 0.4) as
+    startup notification support is enabled in debian/rules.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 23 May 2010 14:12:33 +0200
+
+thunar (1.0.1-4) unstable; urgency=low
+
+  * debian/patches/05_fix-crash-drag-gdk-none.patch: backport patch from
+    upstream git to fix crash when dragging non-file data over a window
+    (thanks Daniel Gibson for the hint).                        closes: #575665
+  * debian/patches: import some patches from lucid to fix several minor
+    issues (also fixed in upstream git master):
+    - 06_fix-sidepane-width.patch: use g_utf8_strlen to calculate the
+      sidepane width, prevents it from being too large with chinese or
+      cyrillic locales.                                         lp: #501211
+    - 07_update-cursor-on-delete.patch: properly update the cursor when
+      a row is deleted in, fixes weird cursor behaviors (Xfce #5361).
+    - 08_refilter-tree-hidden-dir.patch: refilter tree model view when
+      entering/leaving an hidden directory, prevents hidden dir/files
+      from being wrongly displayed.                             lp: #484220
+  * debian/control: add myself to uploaders.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 24 Apr 2010 14:00:31 +0200
+
+thunar (1.0.1-3) unstable; urgency=low
+
+  * debian/control:
+    - drop strict versioned dependency on thunar-data for libthunarvfs
+      packages, only Thunar really needs it.
+    - switch libjpeg62-dev build-dep to libjpeg-dev.
+    - update standards version to 3.8.4.
+  * debian/watch updated.                                       closes: #570793
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 21 Feb 2010 16:24:34 +0100
+
+thunar (1.0.1-2) unstable; urgency=low
+
+  * debian/control:
+    - correct typo.                                             closes: #531448
+    - update standards version to 3.8.3
+  * debian/patches:
+    - 04_fix-umask-handling.patch added.                        closes: #549282
+  * debian/rules:
+    - dh_desktop is deprecated, remove it.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 06 Oct 2009 07:55:50 +0200
+
+thunar (1.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - move lib to libs section and -dev to libdevel.
+  * debian/*postinst:
+    - stop messing with the thunar-data symlink, and try removing it if it
+      exists.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 19 Apr 2009 18:42:36 +0200
+
+thunar (1.0.0-2) unstable; urgency=low
+
+  * Upload to unstable, and mark fixed bugs as such:
+    - show a confirmation dialog before deleting an action.     closes: #500652
+  * debian/patches:
+    - refresh 02_thunar-icon-naming-spec-compliance, more replacement.
+    - 03_thunar-window-maximize added, keep maximized state.    closes: #508184
+  * debian/control:
+    - move to xfce section.
+    - remove useless conflicts/replaces.
+    - update standards version to 3.8.1.
+    - update debhelper build-dep to 7.
+  * debian/compat bumped to 7.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 04 Apr 2009 01:43:06 +0200
+
+thunar (1.0.0-1) experimental; urgency=low
+
+  [ Xfce 4.6 Alpha “Pinkie” ]
+  * new upstream alpha release.
+  * debian/control:
+    - update standards version to 3.8.0. No change needed.
+    - updade build-deps for Xfce 4.6 Alpha.
+    - move thunar-volman from suggests to recommends.
+    - add recommends on xdg-user-dirs for Thunar to handle XDG user dirs.
+  * debian/patches:
+    - 02_thunar-vfs-volume-hal_missing-audio-cds-for-volman dropped, merged
+      upstream.
+    - 03_use-eject-where-necessary as well.
+    - 04_es-l10n-typo.patch too. 
+    - 05_thunar-vfs-nozombies finally.
+  * debian/rules:
+    - fail if dh_install misses files.
+
+  [ Xfce 4.6 Beta 1 “Fuzzy”]
+  * new upstream beta release.
+  * debian/control:
+    - update build-deps for Fuzzy.
+
+  [ Xfce 4.6 Beta 2 “Hopper”]
+  * new upstream beta release.
+  * debian/control:
+    - update build-deps for Hopper.
+  * debian/libthunar-vfs-1-2.shlibs
+    - bump shlibs for Hopper.
+  * debian/patches:
+    - 02_fix-fam-closing-treeview added, fix file monitoring in treeview.
+    - 03_eject-handling added, display eject if and only if
+      is_ejectable=true. (Xfce r28895, #3978)
+    - 04_fix-listview-focus-deleted added, fix focus problem when deleting
+      a file in detailed list view. (Xfce r28902, #3884)
+
+  [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+  * new upstream beta release.
+    - correctly close folders in treeview.                      closes: #478566 
+    - display “eject” if and only if device has is_ejectable.   closes: #500561
+    - fix focus problem when deleting in detailed list view.    closes: #446810
+  * debian/control:
+    - update build-deps for “Tuco-Tuco”.
+    - add build-dep on intltool.
+    - add ${misc:Depends} to various Depends: line.
+    - add dep on libglib2.0-dev (for thunar-vfs) and libgtk2.0-dev (for
+      thunarx) to -dev package.
+  * debian/libthunar-vfs-1-2.shlibs: bump shlibs.
+  * debian/patches:
+    - 02_fix-fam-closing-treeview dropped, merged upstream.
+    - 03_eject-handling as well.
+    - 04_fix-listview-focus-deleted finally.
+  * rename lintian override file so it's taken by dh_lintian.
+  * debian/rules:
+    - don't install lintian override, it's done by dh_lintian.
+    - call dh_desktop in binary-install.
+
+  [ Xfce 4.6 RC1 “Capybara” ]
+  * new upstream release candidate.
+  * debian/control:
+    - update build-deps for “Capybara”.
+  * debian/libthunar-vfs-1-2.shlibs:
+    - bump shlibs to 0.9.99.1.
+
+  [ Xfce 4.6 ]
+  * new upstream release.
+  * debian/control:
+    - update build-deps for 4.6.0.
+    - add ${misc:Depends} to -dev depends.
+  * debian/libthunar-vfs-1-2.shlibs:
+    - bump shlibs to 1.0.0.
+  * debian/patches:
+    - 02_thunar-icon-naming-spec-compliance added, make Thunar
+      xdg-compliant wrt. icon naming.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 28 Feb 2009 14:30:19 +0100
+
+thunar (0.9.0-10) unstable; urgency=low
+
+  * -dev package doesn't need to depend on exo-utils, thunar does.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 02 Jun 2008 22:52:35 +0200
+
+thunar (0.9.0-9) unstable; urgency=low
+
+  * debian/control: 
+    - don't build-conflict against gamin on hurd, where fam is not available.
+    - remove Rudy Godoy and Martin Loschwitz from Uploaders.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 17 May 2008 18:45:16 +0200
+
+thunar (0.9.0-8) unstable; urgency=low
+
+  * debian/control:
+    - move Recommends from dbus to dbus-x11 to make sure there is a session bus
+      available if user wants dbus.
+    - drop now useless conflicts/replaces.
+  * debian/rules:
+    - install .desktop files to sendto folder.
+  * debian/(bluetooth-sendto,gnome-obex-send,xfprint).desktop added, to 
+    improve Thunar “sendto” menu. Thanks Evgeni Golov.          closes: #473410
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Apr 2008 16:35:45 +0200
+
+thunar (0.9.0-7) unstable; urgency=low
+
+  * upload to unstable.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 06 Apr 2008 16:59:07 +0200
+
+thunar (0.9.0-6) experimental; urgency=low
+
+  * upload to experimental due to experimental changes…
+  * 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>  Tue, 25 Mar 2008 12:13:11 +0100
+
+thunar (0.9.0-5) unstable; urgency=low
+
+  * debian/compat: bump debhelper compatibility to 5.
+  * debian/control:
+    - bump debhelper build-dep accordingly.
+    - add a new -dbg package containing debugging symbols.
+  * debian/libthunar-vfs-1-dev.install:
+    - there's no .a or .la generated, so no need to try to ship them.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 02 Mar 2008 01:06:27 +0100
+
+thunar (0.9.0-4) unstable; urgency=low
+
+  * debian/patches:
+    - 04_es-l10n-typo added.                                    closes: #434002
+    - 05_thunar-vfs-nozombies added, prevents thunar and xfdesktop to spawn
+      zombies. Thanks Jeremy Lal.                               closes: #465803
+  * debian/thunar.install: install .desktop files in thunar package.
+  * debian/rules: remove .desktop files from thunar-data package.
+  * debian/control: add proper conflicts against previous thunar-data.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 01 Mar 2008 13:29:40 +0100
+
+thunar (0.9.0-3) unstable; urgency=low
+
+  * loose dependency in shlibs file by removing debian part.
+  * debian/control: add dependency on exo-utils since thunar call exo-eject and
+    exo-desktop-item-edit.
+  * debian/rules: correct lintian file installation.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 28 Jan 2008 08:13:37 +0100
+
+thunar (0.9.0-2) unstable; urgency=low
+
+  * debian/control:
+    - explicitely enable options for ./configure.
+    - update standard versions.
+  * debian/patches:
+    - 03_use-eject-where-necessary added, taken from upstream. closes:  #455866
+  * debian/copyright: remove complete GFDL text and add a link to
+    common-licenses.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 12 Dec 2007 23:55:13 +0100
+
+thunar (0.9.0-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * new upstream release.
+    - ogg files now correctly detected as audio files.          closes: #446369
+    - date format is now configurable.                          closes: #392079
+  * debian/thunar.menu: switch to new menu policy.
+  * debian/control:
+    - bump build-dep to Xfce 4.4.2.
+    - add build-dep on libjpeg62-dev to build thumbnails correctly even for
+      larges images.                                            closes: #444070
+  * debian/patches:
+    - added 02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.
+  * debian/copyright: updated download url.
+
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
+  * Make libthunar-vfs-1-2 and -dev depend on thunar-data so their doc
+    symlinks work.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 04 Dec 2007 13:05:14 +0100
+
+thunar (0.8.0-6) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+  * debian/control: build against libpcre3-dev to enable regexp in thunar mass
+    renamer.                                                    closes: #434230
+  (Simon Huggins)
+  * Fix doc symlinks in packages.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 07 Aug 2007 12:33:14 +0100
+
+thunar (0.8.0-5) unstable; urgency=low
+
+  * Upload to unstable now it's through NEW.
+
+ -- Simon Huggins <huggie at earth.li>  Wed, 27 Jun 2007 12:41:14 +0100
+
+thunar (0.8.0-4) experimental; urgency=low
+
+  * Split out the architecture independent files.
+  * Use ${binary:Version} so that we can be binNMU'd safely.
+
+ -- Simon Huggins <huggie at earth.li>  Fri, 25 May 2007 16:06:19 +0100
+
+thunar (0.8.0-3) unstable; urgency=low
+
+  * debian/control: Suggests thunar-volman
+  * debian/control: Ship README.Debian again                    closes: #415487
+
+ -- Simon Huggins <huggie at earth.li>  Tue, 22 May 2007 14:19:39 +0100
+
+thunar (0.8.0-2) unstable; urgency=low
+
+  * debian/copyright: updated copyright holders and license for documentation. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+thunar (0.8.0-1) experimental; urgency=low
+  
+  (Yves-Alexis Perez)
+  * New upstream release.
+    - zn_CH translation updated.				closes: #406634
+  * debian/control:
+    - updated build-deps against Xfce 4.4.
+    - recommends dbus.						closes: #402419
+    - recommends gamin
+    - drop recommends on pmount as mount is now managed trough hal.
+    - build-dep against libfam-dev instead of libgamin-dev so users can then
+    choose.
+  * remove Thunar.1 from package as it's now shipped upstream. Provide a
+    symbolic link from thunar.1 to Thunar.1.
+  * debian/thunar.install: ship everything in /usr/share/
+
+  (Emanuele Rocca)
+  * Added versioned build-dep on libgtk2.0-dev (>= 2.10.1).
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 28 Jan 2007 15:50:35 +0100
+
+thunar (0.5.0rc2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: 
+    - updated build-deps against Xfce 4.4RC2 (4.3.99.2).
+    - updated description as we don't ship a svn snapshot anymore.
+  * thunar-uca now uses terminal configured in exo-preferred-applications.
+  * ship thunar-sendto-email correctly. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 27 Nov 2006 15:24:13 +0100
+
+thunar (0.4.0rc1-2) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+  * debian/control: allow building on non-linux arche by removing hal
+    build-dep on those archs (thanks Cyril Brulebois).          Closes: #389082
+  (Simon Huggins)
+  * Replace POSIX_MADV* with MADV* on archs with dodgy bits/mman.h
+                                                                Closes: #389414
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Fri, 29 Sep 2006 12:53:30 +0100
+
+thunar (0.4.0rc1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1).
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 23 Sep 2006 13:45:58 +0100
+
+thunar (0.3.2beta2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch from Terminal to xfce4-terminal in the example UCA.	Closes: #374103
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun,  9 Jul 2006 22:01:38 +0200
+
+thunar (0.3.0beta1-3) unstable; urgency=low
+
+  * Fixed menu file and manpages being in libthunar-vfs-1-dev instead of
+    thunar.
+  * Updated manpage using help2man.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 17 Jun 2006 12:36:29 +0100
+
+thunar (0.3.0beta1-2) unstable; urgency=high
+
+  (Yves-Alexis Perez)
+   * Added shared-mime-info as dependency to have correct mime types detection 
+  (Simon Huggins)
+   * Move the packages around in debian/control so the lib is built first and
+     the shlibs file gets taken into account and we get a proper versioned
+     libthunar-vfs-1-2 dep.  urgency=high to fix the stupid amd64 dependency
+     bug pbuilder left us.                                      closes: #373724
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon,  5 Jun 2006 17:26:39 +0200
+
+thunar (0.3.0beta1-1) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+   * New upstream release
+   * Updated help path so help page (F1) is opened correctly    closes: #362491
+  (Simon Huggins)
+   * Remove .la files all together from this package - we ship a .pc file
+     which should be sufficient for things building against it.
+   * Add dependency on libexo-dev to libthunar-vfs-1-dev.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 03 May 2006 18:35:05 +0100
+
+thunar (0.2.2alpha2-r20235-2) unstable; urgency=low
+
+  * Explicitly build without gconf dependency
+ 
+ -- Yves-Alexis Perez <corsac at corsac.net>  Fri, 17 Mar 2006 18:09:01 +0100
+
+thunar (0.2.2alpha2-r20235-1) unstable; urgency=low
+  
+  (Yves-Alexis Perez)
+   * New upstream (alpha2) release
+   * debian/control
+     - Build-depend on libhal-storage-dev and libdbus-glib-1-dev to enable
+     volume management in thunar (see /usr/share/doc/thunar/README.volumes)
+     - Build-depend on libgamin so thunar is informed of changes by gam
+     - Depend on desktop-file-utils so thunar can use update-desktop-database
+   * bump soname in lib package name
+   * debian/libthunar-vfs-1-2.shlibs
+     - bump soname
+   * debian/thunar.install
+     - Included thunar-uca (User Customisable Actions) in thunar package
+     - Moved locales from libthunarvfs-1 to thunar package
+     - Added html doc files
+   * debian/libthunar-vfs-1-dev.install
+     - Included gtk-doc in the dev package
+   * debian/docs
+     - Added FAQ and HACKING in the docs
+  (Simon Huggins)
+   * Don't ship the thunar-uca.la.
+ 
+ -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 14 Mar 2006 09:50:28 +0000
+ 
+thunar (0.2.0alpha-r19548-3) unstable; urgency=low
+  
+  * Fixed versioned dependancy on libthunarvfs-1
+  * Updated exo version dependancy 				Closes: #349829
+ 
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 28 Jan 2006 16:53:33 +0000
+ 
+thunar (0.2.0alpha-r19548-2) unstable; urgency=low
+  
+  * Added pixmaps and icons to thunar package			Closes: #349758
+ 
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 25 Jan 2006 10:19:32 +0000
+ 
+thunar (0.2.0alpha-r19548-1) unstable; urgency=low
+  
+  * New Upstream (alpha) release
+ 
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 22 Jan 2006 22:26:21 +0100
+ 
+thunar (0.1.4svn+r18850-3) unstable; urgency=low
+  
+  * Added a little patch so thunar doesnt FTBFS on some arches	Closes: #345817
+ 
+ -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 03 Jan 2006 16:09:49 +0100
+ 
+thunar (0.1.4svn+r18850-2) unstable; urgency=low
+  
+  * Added a build-dependancy on libxml-parser-perl so thunar builds in pbuilder
+  * Changed the dependancy for libthunar-vfs-1-dev to libthunar-vfs-1
+ 
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 02 Jan 2006 23:42:32 +0100
+ 
+thunar (0.1.4svn+r18850-1) unstable; urgency=low
+
+  * Initial release 						Closes: #344321
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Fri, 30 Dec 2005 18:06:29 +0100

Added: desktop/branches/experimental/thunar/debian/compat
===================================================================
--- desktop/branches/experimental/thunar/debian/compat	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/compat	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1 @@
+9

Added: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/branches/experimental/thunar/debian/control	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/control	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,66 @@
+Source: thunar
+Section: xfce
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
+ Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 9), libexo-1-dev (>= 0.5.1), libxml-parser-perl,
+ libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1), chrpath,
+ libpcre3-dev, libjpeg-dev, libstartup-notification0-dev (>= 0.4), intltool,
+ libxfce4util6-dev, libxfce4ui-1-dev (>= 4.9.0), libnotify-dev, 
+ libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.8.0), libtdb-dev,
+ xfce4-dev-tools, libtool, automake, autoconf, gtk-doc-tools
+Standards-Version: 3.9.2
+Homepage: http://thunar.xfce.org
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/
+
+Package: libthunarx-2-dev
+Section: libdevel
+Architecture: any
+Depends: libthunarx-2-0 (= ${binary:Version}), ${misc:Depends},
+ thunar-data (=${source:Version}), libglib2.0-dev, libgtk2.0-dev
+Description: Development files for libthunarx
+ This package contains the headers and the static library for libthunarx,
+ the extension library used by thunar
+
+Package: libthunarx-2-0
+Section: libs
+Architecture: any
+Pre-depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, thunar-data (= ${source:Version}), ${misc:Depends}
+Description: extension library for thunar
+ This package contains the Thunar extension library which permits adding new
+ features to the Thunar file manager.
+
+Package: thunar
+Section: xfce
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, shared-mime-info, thunar-data (= ${source:Version}), exo-utils
+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.
+ .
+ An Xfce plugin can manages the trash, if xfce4-panel is installed as well.
+ Please read README.Debian for volume management stuff.
+
+Package: thunar-data
+Section: xfce
+Architecture: all
+Depends: ${misc:Depends}
+Description: Provides thunar documentation, icons and translations
+ This package contains architecture-independent files for thunar.
+
+Package: thunar-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends}, thunar (= ${binary:Version}), ${misc:Depends}
+Description: debugging informations for thunar
+ This package contains debugging symbols for thunar and libthunarx, the file
+ manager and file management libraries for Xfce Desktop Environment.

Added: desktop/branches/experimental/thunar/debian/copyright
===================================================================
--- desktop/branches/experimental/thunar/debian/copyright	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/copyright	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,58 @@
+This package was debianized by Yves-Alexis Perez <corsac at corsac.net> on
+Thu, 17 Nov 2005 13:48:54 +0100.
+
+It was downloaded from http://thunar.xfce.org/
+
+Copyright Holders:
+==================
+
+© 2004-2007 Benedikt Meurer <benny at xfce.org>
+© 2005      Jeffs Franks <jcfranks at xfce.org>
+© 2005-2006 Christian Hammond
+© 2006 Matt McClinch <mattmcclinch at gmail.com>
+© 2009-2010 Jannis Pohlmann <jannis at xfce.org>
+
+Plugins are copyrighted:
+
+© 2005-2007 Benedikt Meurer <benny at xfce.org>
+© 2008      Stephan Arts <stephan at xfce.org>
+© 2008-2009 Mike Massonnet <mmassonnet at xfce.org>
+© 2009      Jannis Pohlmann <jannis at xfce.org>
+© 2007-2010 Nick Schermer <nick at xfce.org>
+
+thunarx is copyrighted:
+
+© 2004      The GLib Development Team.
+© 2005-2006 Benedikt Meurer <benny at xfce.org>
+© 2009      Jannis Pohlmann <jannis at xfce.org>
+
+tdb (trivial database system) is copyrighted:
+
+© 2001      Anton Blanchard <anton at samba.org>
+© 2005      Benedikt Meurer <benny at xfce.org>
+© 1999-2004 Andrew Tridgell <tridge at linuxcare.com>
+© 2000      Paul `Rusty' Russel <rusty at linuxcare.com>
+© 2000-2003 Jeremy Allison <jeremy at valinux.com>
+© 2001      Andrew Esh
+
+Licenses:
+=========
+
+GNU/LGPL for files under thunarx and tdb folders
+GNU/GPL for the others
+
+GNU/FDL v1.1 or later for documentation, with no invariant sections, using the 
+following statement:
+
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU Free Documentation License, Version 1.1 or
+  any later version published by the Free Software Foundation; with no
+  Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+  Texts.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL'
+The complete text of the GNU Library General Public License can be
+found in the file `/usr/share/common-licenses/LGPL'
+The complete text of the GFDL (version 1.2) can be found in the file
+`/usr/share/common-licenses/GFDL-1.2'

Added: desktop/branches/experimental/thunar/debian/gnome-obex-send.desktop
===================================================================
--- desktop/branches/experimental/thunar/debian/gnome-obex-send.desktop	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/gnome-obex-send.desktop	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Gnome Bluetooth OBEX Recipient
+Icon=stock_mailto
+Exec=gnome-obex-send %F
+TryExec=gnome-obex-send

Added: desktop/branches/experimental/thunar/debian/libthunarx-2-0.install
===================================================================
--- desktop/branches/experimental/thunar/debian/libthunarx-2-0.install	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/libthunarx-2-0.install	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,2 @@
+usr/lib/*/lib*.so.*
+usr/lib/*/thunarx-2/*

Added: desktop/branches/experimental/thunar/debian/libthunarx-2-0.symbols
===================================================================
--- desktop/branches/experimental/thunar/debian/libthunarx-2-0.symbols	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/libthunarx-2-0.symbols	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,58 @@
+libthunarx-2.so.0 libthunarx-2-0 #MINVER#
+ thunarx_check_version at Base 1.1.0
+ thunarx_file_info_changed at Base 1.1.0
+ thunarx_file_info_get_file_info at Base 1.1.0
+ thunarx_file_info_get_filesystem_info at Base 1.1.0
+ thunarx_file_info_get_location at Base 1.1.0
+ thunarx_file_info_get_mime_type at Base 1.1.0
+ thunarx_file_info_get_name at Base 1.1.0
+ thunarx_file_info_get_parent_uri at Base 1.1.0
+ thunarx_file_info_get_type at Base 1.1.0
+ thunarx_file_info_get_uri at Base 1.1.0
+ thunarx_file_info_get_uri_scheme at Base 1.1.0
+ thunarx_file_info_has_mime_type at Base 1.1.0
+ thunarx_file_info_is_directory at Base 1.1.0
+ thunarx_file_info_list_copy at Base 1.1.0
+ thunarx_file_info_list_free at Base 1.1.0
+ thunarx_file_info_list_get_type at Base 1.1.0
+ thunarx_file_info_renamed at Base 1.1.0
+ thunarx_major_version at Base 1.1.0
+ thunarx_menu_provider_get_dnd_actions at Base 1.1.0
+ thunarx_menu_provider_get_file_actions at Base 1.1.0
+ thunarx_menu_provider_get_folder_actions at Base 1.1.0
+ thunarx_menu_provider_get_type at Base 1.1.0
+ thunarx_micro_version at Base 1.1.0
+ thunarx_minor_version at Base 1.1.0
+ thunarx_preferences_provider_get_actions at Base 1.1.0
+ thunarx_preferences_provider_get_type at Base 1.1.0
+ thunarx_property_page_get_label at Base 1.1.0
+ thunarx_property_page_get_label_widget at Base 1.1.0
+ thunarx_property_page_get_type at Base 1.1.0
+ thunarx_property_page_new at Base 1.1.0
+ thunarx_property_page_new_with_label_widget at Base 1.1.0
+ thunarx_property_page_provider_get_pages at Base 1.1.0
+ thunarx_property_page_provider_get_type at Base 1.1.0
+ thunarx_property_page_set_label at Base 1.1.0
+ thunarx_property_page_set_label_widget at Base 1.1.0
+ thunarx_provider_factory_get_default at Base 1.1.0
+ thunarx_provider_factory_get_type at Base 1.1.0
+ thunarx_provider_factory_list_providers at Base 1.1.0
+ thunarx_provider_plugin_add_interface at Base 1.1.0
+ thunarx_provider_plugin_get_resident at Base 1.1.0
+ thunarx_provider_plugin_get_type at Base 1.1.0
+ thunarx_provider_plugin_register_enum at Base 1.1.0
+ thunarx_provider_plugin_register_flags at Base 1.1.0
+ thunarx_provider_plugin_register_type at Base 1.1.0
+ thunarx_provider_plugin_set_resident at Base 1.1.0
+ thunarx_renamer_changed at Base 1.1.0
+ thunarx_renamer_get_actions at Base 1.1.0
+ thunarx_renamer_get_help_url at Base 1.1.0
+ thunarx_renamer_get_name at Base 1.1.0
+ thunarx_renamer_get_type at Base 1.1.0
+ thunarx_renamer_load at Base 1.1.0
+ thunarx_renamer_process at Base 1.1.0
+ thunarx_renamer_provider_get_renamers at Base 1.1.0
+ thunarx_renamer_provider_get_type at Base 1.1.0
+ thunarx_renamer_save at Base 1.1.0
+ thunarx_renamer_set_help_url at Base 1.1.0
+ thunarx_renamer_set_name at Base 1.1.0

Added: desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install
===================================================================
--- desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*

Added: desktop/branches/experimental/thunar/debian/patches/01_support-non-multiarch-modules.patch
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/01_support-non-multiarch-modules.patch	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/patches/01_support-non-multiarch-modules.patch	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,65 @@
+From 6376360bd33778c751d878a1c722fcaedbe69512 Mon Sep 17 00:00:00 2001
+From: Lionel Le Folgoc <lionel at lefolgoc.net>
+Date: Tue, 11 Oct 2011 21:30:17 +0200
+Subject: Look for plugins in {non-,}multiarch THUNARX_DIRECTORY
+
+This will let a multiarch enabled libthunarx find plugins built against a
+non-multiarch thunar (load plugins from both /usr/lib/$triplet and /usr/lib).
+
+Forwarded: not-needed
+---
+ thunarx/thunarx-provider-factory.c |   12 +++++++++++-
+ thunarx/thunarx-provider-module.c  |    6 ++++++
+ 2 files changed, 17 insertions(+), 1 deletions(-)
+
+diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c
+index f2588eb..cbcf642 100644
+--- a/thunarx/thunarx-provider-factory.c
++++ b/thunarx/thunarx-provider-factory.c
+@@ -145,8 +145,17 @@ thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory)
+   GList                 *modules = NULL;
+   GList                 *lp;
+   GDir                  *dp;
++  gsize                  i;
++  const gchar           *thunarx_dirs[] =
++                          {
++                            THUNARX_DIRECTORY,
++                            "/usr/lib/thunarx-2"
++                          };
+ 
+-  dp = g_dir_open (THUNARX_DIRECTORY, 0, NULL);
++  /* Search both multiarch and non-multiarch THUNARX_DIRECTORYs */
++  for (i = 0; i < G_N_ELEMENTS (thunarx_dirs); ++i)
++  {
++  dp = g_dir_open (thunarx_dirs[i], 0, NULL);
+   if (G_LIKELY (dp != NULL))
+     {
+       /* determine the types for all existing plugins */
+@@ -192,6 +201,7 @@ thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory)
+ 
+       g_dir_close (dp);
+     }
++  }
+ 
+   return modules;
+ }
+diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c
+index 4f96ffd..dbb693b 100644
+--- a/thunarx/thunarx-provider-module.c
++++ b/thunarx/thunarx-provider-module.c
+@@ -178,6 +178,12 @@ thunarx_provider_module_load (GTypeModule *type_module)
+ 
+   /* load the module using the runtime link editor */
+   path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL);
++  if (!g_file_test (path, G_FILE_TEST_EXISTS))
++    {
++      /* if it doesn't exist in the default dir, try non-multiarch THUNARX_DIRECTORY */
++      g_free (path);
++      path = g_build_filename ("/usr/lib/thunarx-2", type_module->name, NULL);
++    }
+   module->library = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+   g_free (path);
+ 
+-- 
+1.7.7
+

Added: desktop/branches/experimental/thunar/debian/patches/02_fix-link-gmodule.patch
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/02_fix-link-gmodule.patch	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/patches/02_fix-link-gmodule.patch	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,32 @@
+Description: Explicitly link with gmodule
+Author; Lionel Le Folgoc <mrpouit at ubuntu.com>
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8467
+
+--- thunar-1.2.3.orig/configure.in
++++ thunar-1.2.3/configure.in
+@@ -150,6 +150,7 @@ dnl ***********************************
+ XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
+ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0])
+ XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0])
++XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.10.0])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
+ XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14.0])
+--- thunar-1.2.3.orig/thunarx/Makefile.am
++++ thunar-1.2.3/thunarx/Makefile.am
+@@ -49,6 +49,7 @@ libthunarx_2_la_SOURCES =						\
+ libthunarx_2_la_CFLAGS =						\
+ 	$(GLIB_CFLAGS)							\
+ 	$(GIO_CFLAGS)							\
++	$(GMODULE_CFLAGS)						\
+ 	$(GTK_CFLAGS)							\
+ 	$(PLATFORM_CFLAGS)
+ 
+@@ -61,6 +62,7 @@ libthunarx_2_la_LDFLAGS =						\
+ libthunarx_2_la_LIBADD =						\
+ 	$(GLIB_LIBS)							\
+ 	$(GIO_LIBS)							\
++	$(GMODULE_LIBS)							\
+ 	$(GTK_LIBS)
+ 
+ pkgconfigdir = $(libdir)/pkgconfig

Added: desktop/branches/experimental/thunar/debian/patches/series
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/series	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/patches/series	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,2 @@
+01_support-non-multiarch-modules.patch
+02_fix-link-gmodule.patch

Added: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/branches/experimental/thunar/debian/rules	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/rules	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,40 @@
+#!/usr/bin/make -f
+
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
+	dh_auto_configure -- --enable-dbus --enable-startup-notification --enable-apr-plugin \
+    --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin \
+    --docdir=\$${prefix}/share/doc/thunar-data
+
+override_dh_auto_test:
+
+override_dh_install:
+	# 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 -X .la
+
+override_dh_installdocs:
+	dh_installdocs -p libthunarx-2-dev -p libthunarx-2-0 -p thunar --link-doc=thunar-data
+	dh_installdocs --remaining-packages
+
+override_dh_strip:
+	dh_strip --dbg-package=thunar-dbg
+
+override_dh_shlibdeps:
+	dh_shlibdeps -X debian/thunar/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.so -- \
+    -dRecommends debian/thunar/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.so -dDepends
+
+override_dh_makeshlibs:
+	dh_makeshlibs -p libthunarx-2-0 -X debian/libthunarx-2-0/usr/lib/$(DEB_HOST_MULTIARCH)/thunarx-2


Property changes on: desktop/branches/experimental/thunar/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: desktop/branches/experimental/thunar/debian/source/format
===================================================================
--- desktop/branches/experimental/thunar/debian/source/format	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/source/format	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1 @@
+3.0 (quilt)

Added: desktop/branches/experimental/thunar/debian/thunar-data.docs
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar-data.docs	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/thunar-data.docs	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,8 @@
+debian/README.Debian
+FAQ
+HACKING
+AUTHORS
+NEWS
+README
+THANKS
+TODO

Added: desktop/branches/experimental/thunar/debian/thunar-data.install
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar-data.install	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/thunar-data.install	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,10 @@
+etc/*
+usr/share/dbus-1
+usr/share/doc
+usr/share/gtk-doc
+usr/share/icons
+usr/share/locale
+usr/share/pixmaps
+debian/bluetooth-sendto.desktop usr/share/Thunar/sendto
+debian/gnome-obex-send.desktop usr/share/Thunar/sendto
+debian/xfprint.desktop usr/share/Thunar/sendto

Added: desktop/branches/experimental/thunar/debian/thunar.1
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar.1	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/thunar.1	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1 @@
+.so man1/Thunar.1

Added: desktop/branches/experimental/thunar/debian/thunar.install
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar.install	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/thunar.install	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,7 @@
+usr/bin/*
+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/share/Thunar/sendto/thunar-sendto-email.desktop

Added: desktop/branches/experimental/thunar/debian/thunar.manpages
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar.manpages	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/thunar.manpages	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1 @@
+debian/thunar.1

Added: desktop/branches/experimental/thunar/debian/thunar.menu
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar.menu	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/thunar.menu	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,2 @@
+?package(thunar):needs="X11" section="Applications/File Management"\
+  title="Thunar" longtitle="Xfce4 File Manager" hints="File manager" command="/usr/bin/thunar"

Added: desktop/branches/experimental/thunar/debian/thunar.postinst
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar.postinst	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/thunar.postinst	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" eq "1.0.0-2";
+then
+  cd /usr/share/doc/thunar && rm -f thunar-data
+fi
+
+#DEBHELPER#
+
+exit 0


Property changes on: desktop/branches/experimental/thunar/debian/thunar.postinst
___________________________________________________________________
Added: svn:executable
   + *

Added: desktop/branches/experimental/thunar/debian/watch
===================================================================
--- desktop/branches/experimental/thunar/debian/watch	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/watch	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,3 @@
+version=3
+http://archive.xfce.org/src/xfce/thunar/([\d\.]+[02468])/ \
+	Thunar-([\d\.]+)\.tar\.(?:gz|bz2)

Added: desktop/branches/experimental/thunar/debian/xfprint.desktop
===================================================================
--- desktop/branches/experimental/thunar/debian/xfprint.desktop	                        (rev 0)
+++ desktop/branches/experimental/thunar/debian/xfprint.desktop	2012-04-01 12:04:22 UTC (rev 6570)
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Printer
+Exec=xfprint4 %f
+Icon=printer
+TryExec=xfprint4




More information about the Pkg-xfce-commits mailing list