[Pkg-xfce-commits] r4341 - in desktop/branches/experimental: . thunar-vfs/debian thunar-vfs/debian/patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Tue Nov 2 10:39:04 UTC 2010
Author: mrpouit-guest
Date: 2010-11-02 22:39:00 +0000 (Tue, 02 Nov 2010)
New Revision: 4341
Added:
desktop/branches/experimental/thunar-vfs/
desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-common.docs
desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-common.install
Modified:
desktop/branches/experimental/thunar-vfs/debian/changelog
desktop/branches/experimental/thunar-vfs/debian/control
desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-2.install
desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-2.shlibs
desktop/branches/experimental/thunar-vfs/debian/patches/02_thunar-icon-naming-spec-compliance.patch
desktop/branches/experimental/thunar-vfs/debian/rules
Log:
* New upstream git snapshot, split from thunar to allow goodies not ported
to gio to still work.
* Renamed source package to thunar-vfs, dropped thunar binary package,
renamed thunar-data to libthunar-vfs-1-common.
* debian/{*.desktop,thunar*,libthunar-vfs-1-2.lintian-overrides}: dropped,
useless now.
* debian/libthunar-vfs-1-2.shlibs: drop thunarx-1.
* debian/control:
- bumped Standards-Version to 3.9.1
- updated Vcs-* fields
- drop build-deps on xfce4-panel-dev, only useful with thunar (not -vfs)
- rewrote descriptions.
* debian/*.{docs,install}: drop files shipped only in thunar.
* Clean patches targetting thunar and not thunar-vfs:
- debian/patches/01_thunar-help-directory.patch: dropped
- debian/patches/02_thunar-icon-naming-spec-compliance.patch: drop the
thunar and thunar-tpa bits
- debian/patches/03_thunar-window-maximize.patch: dropped
- debian/patches/05_fix-crash-drag-gdk-none.patch: dropped
- debian/patches/06_fix-sidepane-width.patch: dropped
- debian/patches/07_update-cursor-on-delete.patch: dropped
- debian/patches/08_refilter-tree-hidden-dir.patch: dropped.
* debian/rules: temporarily disable temporarily volume management (hal
support dropped from exo-1), should be back for 4.8pre1.
Modified: desktop/branches/experimental/thunar-vfs/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog 2010-11-02 19:51:21 UTC (rev 4340)
+++ desktop/branches/experimental/thunar-vfs/debian/changelog 2010-11-02 22:39:00 UTC (rev 4341)
@@ -1,5 +1,34 @@
-thunar (1.0.2-1) unstable; urgency=low
+thunar-vfs (1.0.2+git20101019.55cbe617-1) UNRELEASED; urgency=low
+ * New upstream git snapshot, split from thunar to allow goodies not ported
+ to gio to still work.
+ * Renamed source package to thunar-vfs, dropped thunar binary package,
+ renamed thunar-data to libthunar-vfs-1-common.
+ * debian/{*.desktop,thunar*,libthunar-vfs-1-2.lintian-overrides}: dropped,
+ useless now.
+ * debian/libthunar-vfs-1-2.shlibs: drop thunarx-1.
+ * debian/control:
+ - bumped Standards-Version to 3.9.1
+ - updated Vcs-* fields
+ - drop build-deps on xfce4-panel-dev, only useful with thunar (not -vfs)
+ - rewrote descriptions.
+ * debian/*.{docs,install}: drop files shipped only in thunar.
+ * Clean patches targetting thunar and not thunar-vfs:
+ - debian/patches/01_thunar-help-directory.patch: dropped
+ - debian/patches/02_thunar-icon-naming-spec-compliance.patch: drop the
+ thunar and thunar-tpa bits
+ - debian/patches/03_thunar-window-maximize.patch: dropped
+ - debian/patches/05_fix-crash-drag-gdk-none.patch: dropped
+ - debian/patches/06_fix-sidepane-width.patch: dropped
+ - debian/patches/07_update-cursor-on-delete.patch: dropped
+ - debian/patches/08_refilter-tree-hidden-dir.patch: dropped.
+ * debian/rules: temporarily disable temporarily volume management (hal
+ support dropped from exo-1), should be back for 4.8pre1.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 31 Oct 2010 22:58:31 +0100
+
+thunar-vfs (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
@@ -7,7 +36,7 @@
-- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 23 May 2010 14:12:33 +0200
-thunar (1.0.1-4) unstable; urgency=low
+thunar-vfs (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
@@ -26,7 +55,7 @@
-- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 24 Apr 2010 14:00:31 +0200
-thunar (1.0.1-3) unstable; urgency=low
+thunar-vfs (1.0.1-3) unstable; urgency=low
* debian/control:
- drop strict versioned dependency on thunar-data for libthunarvfs
@@ -37,7 +66,7 @@
-- Yves-Alexis Perez <corsac at debian.org> Sun, 21 Feb 2010 16:24:34 +0100
-thunar (1.0.1-2) unstable; urgency=low
+thunar-vfs (1.0.1-2) unstable; urgency=low
* debian/control:
- correct typo. closes: #531448
@@ -49,7 +78,7 @@
-- Yves-Alexis Perez <corsac at debian.org> Tue, 06 Oct 2009 07:55:50 +0200
-thunar (1.0.1-1) unstable; urgency=low
+thunar-vfs (1.0.1-1) unstable; urgency=low
* New upstream release.
* debian/control:
@@ -60,7 +89,7 @@
-- Yves-Alexis Perez <corsac at debian.org> Sun, 19 Apr 2009 18:42:36 +0200
-thunar (1.0.0-2) unstable; urgency=low
+thunar-vfs (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
@@ -76,7 +105,7 @@
-- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Apr 2009 01:43:06 +0200
-thunar (1.0.0-1) experimental; urgency=low
+thunar-vfs (1.0.0-1) experimental; urgency=low
[ Xfce 4.6 Alpha “Pinkie” ]
* new upstream alpha release.
@@ -153,13 +182,13 @@
-- Yves-Alexis Perez <corsac at debian.org> Sat, 28 Feb 2009 14:30:19 +0100
-thunar (0.9.0-10) unstable; urgency=low
+thunar-vfs (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
+thunar-vfs (0.9.0-9) unstable; urgency=low
* debian/control:
- don't build-conflict against gamin on hurd, where fam is not available.
@@ -167,7 +196,7 @@
-- Yves-Alexis Perez <corsac at debian.org> Sat, 17 May 2008 18:45:16 +0200
-thunar (0.9.0-8) unstable; urgency=low
+thunar-vfs (0.9.0-8) unstable; urgency=low
* debian/control:
- move Recommends from dbus to dbus-x11 to make sure there is a session bus
@@ -180,13 +209,13 @@
-- Yves-Alexis Perez <corsac at debian.org> Sun, 27 Apr 2008 16:35:45 +0200
-thunar (0.9.0-7) unstable; urgency=low
+thunar-vfs (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
+thunar-vfs (0.9.0-6) experimental; urgency=low
* upload to experimental due to experimental changes…
* debian/control:
@@ -201,7 +230,7 @@
-- Yves-Alexis Perez <corsac at debian.org> Tue, 25 Mar 2008 12:13:11 +0100
-thunar (0.9.0-5) unstable; urgency=low
+thunar-vfs (0.9.0-5) unstable; urgency=low
* debian/compat: bump debhelper compatibility to 5.
* debian/control:
@@ -212,7 +241,7 @@
-- Yves-Alexis Perez <corsac at debian.org> Sun, 02 Mar 2008 01:06:27 +0100
-thunar (0.9.0-4) unstable; urgency=low
+thunar-vfs (0.9.0-4) unstable; urgency=low
* debian/patches:
- 04_es-l10n-typo added. closes: #434002
@@ -224,7 +253,7 @@
-- Yves-Alexis Perez <corsac at debian.org> Sat, 01 Mar 2008 13:29:40 +0100
-thunar (0.9.0-3) unstable; urgency=low
+thunar-vfs (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
@@ -233,7 +262,7 @@
-- Yves-Alexis Perez <corsac at debian.org> Mon, 28 Jan 2008 08:13:37 +0100
-thunar (0.9.0-2) unstable; urgency=low
+thunar-vfs (0.9.0-2) unstable; urgency=low
* debian/control:
- explicitely enable options for ./configure.
@@ -245,7 +274,7 @@
-- Yves-Alexis Perez <corsac at debian.org> Wed, 12 Dec 2007 23:55:13 +0100
-thunar (0.9.0-1) unstable; urgency=low
+thunar-vfs (0.9.0-1) unstable; urgency=low
[ Yves-Alexis Perez ]
* new upstream release.
@@ -267,7 +296,7 @@
-- Yves-Alexis Perez <corsac at corsac.net> Tue, 04 Dec 2007 13:05:14 +0100
-thunar (0.8.0-6) unstable; urgency=low
+thunar-vfs (0.8.0-6) unstable; urgency=low
(Yves-Alexis Perez)
* debian/control: build against libpcre3-dev to enable regexp in thunar mass
@@ -277,33 +306,33 @@
-- Yves-Alexis Perez <corsac at corsac.net> Tue, 07 Aug 2007 12:33:14 +0100
-thunar (0.8.0-5) unstable; urgency=low
+thunar-vfs (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
+thunar-vfs (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
+thunar-vfs (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
+thunar-vfs (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
+thunar-vfs (0.8.0-1) experimental; urgency=low
(Yves-Alexis Perez)
* New upstream release.
@@ -324,7 +353,7 @@
-- Yves-Alexis Perez <corsac at corsac.net> Sun, 28 Jan 2007 15:50:35 +0100
-thunar (0.5.0rc2-1) unstable; urgency=low
+thunar-vfs (0.5.0rc2-1) unstable; urgency=low
* New upstream release.
* debian/control:
@@ -335,7 +364,7 @@
-- Yves-Alexis Perez <corsac at corsac.net> Mon, 27 Nov 2006 15:24:13 +0100
-thunar (0.4.0rc1-2) unstable; urgency=low
+thunar-vfs (0.4.0rc1-2) unstable; urgency=low
(Yves-Alexis Perez)
* debian/control: allow building on non-linux arche by removing hal
@@ -346,21 +375,21 @@
-- Yves-Alexis Perez <corsac at corsac.net> Fri, 29 Sep 2006 12:53:30 +0100
-thunar (0.4.0rc1-1) unstable; urgency=low
+thunar-vfs (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
+thunar-vfs (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
+thunar-vfs (0.3.0beta1-3) unstable; urgency=low
* Fixed menu file and manpages being in libthunar-vfs-1-dev instead of
thunar.
@@ -368,7 +397,7 @@
-- Yves-Alexis Perez <corsac at corsac.net> Sat, 17 Jun 2006 12:36:29 +0100
-thunar (0.3.0beta1-2) unstable; urgency=high
+thunar-vfs (0.3.0beta1-2) unstable; urgency=high
(Yves-Alexis Perez)
* Added shared-mime-info as dependency to have correct mime types detection
@@ -380,7 +409,7 @@
-- Yves-Alexis Perez <corsac at corsac.net> Mon, 5 Jun 2006 17:26:39 +0200
-thunar (0.3.0beta1-1) unstable; urgency=low
+thunar-vfs (0.3.0beta1-1) unstable; urgency=low
(Yves-Alexis Perez)
* New upstream release
@@ -392,13 +421,13 @@
-- Yves-Alexis Perez <corsac at corsac.net> Wed, 03 May 2006 18:35:05 +0100
-thunar (0.2.2alpha2-r20235-2) unstable; urgency=low
+thunar-vfs (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
+thunar-vfs (0.2.2alpha2-r20235-1) unstable; urgency=low
(Yves-Alexis Perez)
* New upstream (alpha2) release
@@ -423,39 +452,39 @@
-- Yves-Alexis Perez <corsac at corsac.net> Tue, 14 Mar 2006 09:50:28 +0000
-thunar (0.2.0alpha-r19548-3) unstable; urgency=low
+thunar-vfs (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
+thunar-vfs (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
+thunar-vfs (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
+thunar-vfs (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
+thunar-vfs (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
+thunar-vfs (0.1.4svn+r18850-1) unstable; urgency=low
* Initial release Closes: #344321
Modified: desktop/branches/experimental/thunar-vfs/debian/control
===================================================================
--- desktop/trunk/thunar/debian/control 2010-11-02 19:51:21 UTC (rev 4340)
+++ desktop/branches/experimental/thunar-vfs/debian/control 2010-11-02 22:39:00 UTC (rev 4341)
@@ -1,66 +1,51 @@
-Source: thunar
+Source: thunar-vfs
Section: xfce
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 7), libcairo2-dev,
- libexo-0.3-dev (>= 0.3.100), cdbs, libxml-parser-perl, libfam-dev,
+ libexo-1-dev, cdbs, libxml-parser-perl, libfam-dev,
libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
- xfce4-panel-dev (>= 4.6.0), chrpath, libpcre3-dev, libjpeg-dev,
+ chrpath, libpcre3-dev, libjpeg-dev,
libstartup-notification0-dev (>= 0.4), intltool
Build-Conflicts: libgamin-dev [!hurd-i386]
-Standards-Version: 3.8.4
-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/
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar-vfs/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar-vfs/
Package: libthunar-vfs-1-dev
Section: libdevel
Architecture: any
Depends: libthunar-vfs-1-2 (= ${binary:Version}), ${misc:Depends},
- libexo-0.3-dev (>= 0.3.100), thunar-data, libglib2.0-dev, libgtk2.0-dev
-Description: Development files for libthunar-vfs
- This package contains the headers and the static library for libthunar-vfs,
- the virtual file system abstraction used by thunar
+ libexo-1-dev, libthunar-vfs-1-common, libglib2.0-dev, libgtk2.0-dev
+Description: Development files for thunar-vfs
+ This package contains the headers and the static library for libthunar-vfs,
+ the legacy virtual file system abstraction used by Xfce.
Package: libthunar-vfs-1-2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, thunar-data, ${misc:Depends}
-Description: VFS abstraction used in thunar
- This package contains a library for virtual file system abstraction. It's
- used by thunar, the file manager of Xfce 4.6
+Depends: ${shlibs:Depends}, libthunar-vfs-1-common, ${misc:Depends}
+Description: Legacy VFS abstraction used in Xfce
+ This package contains a library for virtual file system abstraction. It was
+ used by thunar, the file manager of Xfce 4.6, but is now provided for legacy
+ compatibility.
-Package: thunar
+Package: libthunar-vfs-1-common
Section: xfce
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils,
- shared-mime-info, thunar-data (= ${source:Version}), exo-utils
-Recommends: hal, dbus-x11, gamin, ${shlibs:Recommends}, thunar-volman,
- xdg-user-dirs
-Suggests: thunar-archive-plugin, thunar-media-tags-plugin
-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.
+Replaces: thunar-data (<< 1.1.0)
+Description: Provides thunar-vfs documentation, icons and translations
+ This package contains architecture-independent files for thunar-vfs.
-Package: thunar-dbg
+Package: libthunar-vfs-1-2-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, libthunar-vfs and
- libthunar-x, the file manager and file management libraries for Xfce Desktop
- Environment.
+Depends: ${shlibs:Depends}, libthunar-vfs-1-2 (= ${binary:Version}), ${misc:Depends}
+Description: debugging informations for thunar-vfs
+ This package contains debugging symbols for libthunar-vfs, the legacy file
+ management library for Xfce Desktop Environment.
Modified: desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-2.install
===================================================================
--- desktop/trunk/thunar/debian/libthunar-vfs-1-2.install 2010-11-02 19:51:21 UTC (rev 4340)
+++ desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-2.install 2010-11-02 22:39:00 UTC (rev 4341)
@@ -1,2 +1 @@
debian/tmp/usr/lib/lib*.so.*
-debian/tmp/usr/lib/thunarx-1/*
Modified: desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-2.shlibs
===================================================================
--- desktop/trunk/thunar/debian/libthunar-vfs-1-2.shlibs 2010-11-02 19:51:21 UTC (rev 4340)
+++ desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-2.shlibs 2010-11-02 22:39:00 UTC (rev 4341)
@@ -1,2 +1 @@
libthunar-vfs-1 2 libthunar-vfs-1-2 (>= 1.0.0)
-libthunarx-1 2 libthunar-vfs-1-2 (>= 1.0.0)
Added: desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-common.docs
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-common.docs (rev 0)
+++ desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-common.docs 2010-11-02 22:39:00 UTC (rev 4341)
@@ -0,0 +1,2 @@
+debian/README.Debian
+HACKING
Added: desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-common.install
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-common.install (rev 0)
+++ desktop/branches/experimental/thunar-vfs/debian/libthunar-vfs-1-common.install 2010-11-02 22:39:00 UTC (rev 4341)
@@ -0,0 +1 @@
+debian/tmp/usr/share/*
Modified: desktop/branches/experimental/thunar-vfs/debian/patches/02_thunar-icon-naming-spec-compliance.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch 2010-11-02 19:51:21 UTC (rev 4340)
+++ desktop/branches/experimental/thunar-vfs/debian/patches/02_thunar-icon-naming-spec-compliance.patch 2010-11-02 22:39:00 UTC (rev 4341)
@@ -1,37 +1,3 @@
-diff --git a/plugins/thunar-tpa/thunar-tpa-icon.c b/plugins/thunar-tpa/thunar-tpa-icon.c
-index da38304..740000a 100644
---- a/plugins/thunar-tpa/thunar-tpa-icon.c
-+++ b/plugins/thunar-tpa/thunar-tpa-icon.c
-@@ -175,7 +175,7 @@ thunar_tpa_icon_init (ThunarTpaIcon *icon)
- gtk_widget_show (icon->button);
-
- /* setup the image for the trash icon */
-- icon->image = gtk_image_new_from_icon_name ("gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON);
-+ icon->image = gtk_image_new_from_icon_name ("user-trash", GTK_ICON_SIZE_BUTTON);
- gtk_container_add (GTK_CONTAINER (icon->button), icon->image);
- gtk_widget_show (icon->image);
-
-@@ -287,7 +287,7 @@ thunar_tpa_icon_state (ThunarTpaIcon *icon,
- gtk_tooltips_set_tip (icon->tooltips, icon->button, full ? _("Trash contains files") : _("Trash is empty"), NULL);
-
- /* setup the appropriate icon */
-- gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), full ? "gnome-fs-trash-full" : "gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON);
-+ gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), full ? "user-trash-full" : "user-trash", GTK_ICON_SIZE_BUTTON);
-
- /* apply the new state */
- icon->full = full;
-diff --git a/plugins/thunar-tpa/thunar-tpa.desktop.in.in b/plugins/thunar-tpa/thunar-tpa.desktop.in.in
-index 6d848f6..f647521 100644
---- a/plugins/thunar-tpa/thunar-tpa.desktop.in.in
-+++ b/plugins/thunar-tpa/thunar-tpa.desktop.in.in
-@@ -3,6 +3,6 @@ Type=X-XFCE-PanelPlugin
- Encoding=UTF-8
- _Name=Trash Applet
- _Comment=Display the trash can
--Icon=gnome-fs-trash-empty
-+Icon=user-trash
- X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/thunar-tpa
-
diff --git a/thunar-vfs/thunar-vfs-io-local.c b/thunar-vfs/thunar-vfs-io-local.c
index 615a36c..e2d75e7 100644
--- a/thunar-vfs/thunar-vfs-io-local.c
@@ -229,213 +195,3 @@
break;
default:
-diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
-index c30d43a..80c9784 100644
---- a/thunar/thunar-application.c
-+++ b/thunar/thunar-application.c
-@@ -1166,7 +1166,7 @@ thunar_application_copy_to (ThunarApplication *application,
- _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
-
- /* launch the operation */
-- thunar_application_launch (application, parent, "stock_folder-copy",
-+ thunar_application_launch (application, parent, "gtk-copy",
- _("Copying files..."), thunar_vfs_copy_files,
- source_path_list, target_path_list, new_files_closure);
- }
-@@ -1199,7 +1199,7 @@ thunar_application_copy_into (ThunarApplication *application,
- _thunar_return_if_fail (target_path != NULL);
-
- /* collect the target paths and launch the job */
-- thunar_application_collect_and_launch (application, parent, "stock_folder-copy",
-+ thunar_application_collect_and_launch (application, parent, "gtk-copy",
- _("Copying files..."), thunar_vfs_copy_files,
- source_path_list, target_path, new_files_closure);
- }
-@@ -1233,7 +1233,7 @@ thunar_application_link_into (ThunarApplication *application,
- _thunar_return_if_fail (target_path != NULL);
-
- /* collect the target paths and launch the job */
-- thunar_application_collect_and_launch (application, parent, "stock_link",
-+ thunar_application_collect_and_launch (application, parent, "insert-link",
- _("Creating symbolic links..."),
- thunar_vfs_link_files, source_path_list,
- target_path, new_files_closure);
-@@ -1273,12 +1273,15 @@ thunar_application_move_into (ThunarApplication *application,
- /* determine the appropriate message text and the icon based on the target_path */
- if (thunar_vfs_path_get_scheme (target_path) == THUNAR_VFS_PATH_SCHEME_TRASH)
- {
-- icon = "gnome-fs-trash-full";
-+ icon = "user-trash-full";
- text = _("Moving files into the trash...");
- }
- else
- {
-- icon = "stock_folder-move";
-+ /* What kind of icon-name should we use according to the
-+ * icon-naming-spec?
-+ */
-+ icon = "folder-move";
- text = _("Moving files...");
- }
-
-@@ -1393,7 +1396,7 @@ thunar_application_unlink_files (ThunarApplication *application,
- if (G_LIKELY (response == GTK_RESPONSE_YES))
- {
- /* launch the "Delete" operation */
-- thunar_application_launch (application, parent, "stock_delete",
-+ thunar_application_launch (application, parent, "edit-delete",
- _("Deleting files..."), unlink_stub,
- path_list, path_list, NULL);
- }
-@@ -1445,7 +1448,7 @@ thunar_application_creat (ThunarApplication *application,
- _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
-
- /* launch the operation */
-- thunar_application_launch (application, parent, "stock_new",
-+ thunar_application_launch (application, parent, "document-new",
- _("Creating files..."), creat_stub,
- path_list, path_list, new_files_closure);
- }
-@@ -1485,7 +1488,7 @@ thunar_application_mkdir (ThunarApplication *application,
- _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
-
- /* launch the operation */
-- thunar_application_launch (application, parent, "stock_folder",
-+ thunar_application_launch (application, parent, "folder-new",
- _("Creating directories..."), mkdir_stub,
- path_list, path_list, new_files_closure);
- }
-@@ -1549,7 +1552,7 @@ thunar_application_empty_trash (ThunarApplication *application,
- path_list.prev = NULL;
-
- /* launch the operation */
-- thunar_application_launch (application, parent, "gnome-fs-trash-empty",
-+ thunar_application_launch (application, parent, "user-trash",
- _("Emptying the Trash..."),
- unlink_stub, &path_list, NULL, NULL);
-
-@@ -1685,7 +1688,7 @@ thunar_application_restore_files (ThunarApplication *application,
- else if (G_LIKELY (response == GTK_RESPONSE_YES))
- {
- /* launch the operation */
-- thunar_application_launch (application, parent, "stock_folder-move",
-+ thunar_application_launch (application, parent, "folder-move",
- _("Restoring files..."), thunar_vfs_move_files,
- source_path_list, target_path_list, new_files_closure);
- }
-diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
-index 0e36ee3..570efbe 100644
---- a/thunar/thunar-dialogs.c
-+++ b/thunar/thunar-dialogs.c
-@@ -602,7 +602,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0);
- gtk_widget_show (table);
-
-- image = gtk_image_new_from_icon_name ("stock_folder-copy", GTK_ICON_SIZE_BUTTON);
-+ image = gtk_image_new_from_icon_name ("gtk-copy", GTK_ICON_SIZE_BUTTON);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
- gtk_misc_set_padding (GTK_MISC (image), 6, 6);
- gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-diff --git a/thunar/thunar-dnd.c b/thunar/thunar-dnd.c
-index 4fb278c..ddf0a64 100644
---- a/thunar/thunar-dnd.c
-+++ b/thunar/thunar-dnd.c
-@@ -68,7 +68,7 @@ thunar_dnd_ask (GtkWidget *widget,
- {
- static const GdkDragAction dnd_action_items[] = { GDK_ACTION_COPY, GDK_ACTION_MOVE, GDK_ACTION_LINK };
- static const gchar *dnd_action_names[] = { N_ ("_Copy here"), N_ ("_Move here"), N_ ("_Link here") };
-- static const gchar *dnd_action_icons[] = { "stock_folder-copy", "stock_folder-move", NULL };
-+ static const gchar *dnd_action_icons[] = { "gtk-copy", "folder-move", NULL };
-
- ThunarxProviderFactory *factory;
- GdkDragAction dnd_action = 0;
-diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
-index c049213..45063fe 100644
---- a/thunar/thunar-file.c
-+++ b/thunar/thunar-file.c
-@@ -1619,16 +1619,16 @@ thunar_file_get_icon_name (const ThunarFile *file,
-
- /* special icon for the home node */
- if (G_UNLIKELY (thunar_file_is_home (file))
-- && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-home"))
-+ && gtk_icon_theme_has_icon (icon_theme, "user-home"))
- {
-- return "gnome-fs-home";
-+ return "user-home";
- }
-
- /* special icon for the desktop node */
- if (G_UNLIKELY (thunar_file_is_desktop (file))
-- && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-desktop"))
-+ && gtk_icon_theme_has_icon (icon_theme, "user-desktop"))
- {
-- return "gnome-fs-desktop";
-+ return "user-desktop";
- }
-
- /* try to be smart when determining icons for executable files
-@@ -1648,10 +1648,10 @@ thunar_file_get_icon_name (const ThunarFile *file,
-
- /* check if we have an accept icon for the icon we found */
- if ((icon_state == THUNAR_FILE_ICON_STATE_DROP || icon_state == THUNAR_FILE_ICON_STATE_OPEN)
-- && strcmp (icon_name, "gnome-fs-directory") == 0
-- && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-directory-accept"))
-+ && strcmp (icon_name, "folder") == 0
-+ && gtk_icon_theme_has_icon (icon_theme, "folder-drag-accept"))
- {
-- return "gnome-fs-directory-accept";
-+ return "folder-drag-accept";
- }
-
- return icon_name;
-diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
-index 0cdbe03..22630cd 100644
---- a/thunar/thunar-icon-factory.c
-+++ b/thunar/thunar-icon-factory.c
-@@ -1036,7 +1036,7 @@ again:
- if (G_UNLIKELY (thumb_state == THUNAR_FILE_THUMB_STATE_LOADING))
- {
- /* check if the icon theme supports the loading icon */
-- icon = thunar_icon_factory_lookup_icon (factory, "gnome-fs-loading-icon", icon_size, FALSE);
-+ icon = thunar_icon_factory_lookup_icon (factory, "image-loading", icon_size, FALSE);
- if (G_LIKELY (icon != NULL))
- return icon;
- }
-diff --git a/thunar/thunar-stock.c b/thunar/thunar-stock.c
-index 9586ed1..c777b5f 100644
---- a/thunar/thunar-stock.c
-+++ b/thunar/thunar-stock.c
-@@ -45,12 +45,12 @@ typedef struct
- /* keep in sync with thunar-stock.h */
- static const ThunarStockIcon thunar_stock_icons[] =
- {
-- { THUNAR_STOCK_DESKTOP, "gnome-fs-desktop", },
-- { THUNAR_STOCK_HOME, "gnome-fs-home", },
-+ { THUNAR_STOCK_DESKTOP, "user-desktop", },
-+ { THUNAR_STOCK_HOME, "user-home", },
- { THUNAR_STOCK_SHORTCUTS, "stock_thunar-shortcuts", },
-- { THUNAR_STOCK_TEMPLATES, "stock_thunar-templates", },
-- { THUNAR_STOCK_TRASH_EMPTY, "gnome-fs-trash-empty", },
-- { THUNAR_STOCK_TRASH_FULL, "gnome-fs-trash-full", },
-+ { THUNAR_STOCK_TEMPLATES, "text-x-generic-template", },
-+ { THUNAR_STOCK_TRASH_EMPTY, "user-trash", },
-+ { THUNAR_STOCK_TRASH_FULL, "user-trash-full", },
- { THUNAR_STOCK_DOWNLOADS, "emblem-downloads", },
- { THUNAR_STOCK_DOCUMENTS, "emblem-documents", },
- { THUNAR_STOCK_MUSIC, "audio-x-generic", },
-diff --git a/thunar/thunar-stock.h b/thunar/thunar-stock.h
-index 775b3e0..3f0b937 100644
---- a/thunar/thunar-stock.h
-+++ b/thunar/thunar-stock.h
-@@ -26,9 +26,9 @@ G_BEGIN_DECLS;
- #define THUNAR_STOCK_HOME "thunar-home" /* see ThunarWindow */
- #define THUNAR_STOCK_SHORTCUTS "thunar-shortcuts" /* see ThunarShortcutsPane */
- #define THUNAR_STOCK_TEMPLATES "thunar-templates" /* see ThunarWindow */
--#define THUNAR_STOCK_TRASH_EMPTY "thunar-trash-empty" /* see ThunarTrashAction */
-+#define THUNAR_STOCK_TRASH_EMPTY "thunar-trash" /* see ThunarTrashAction */
- #define THUNAR_STOCK_TRASH_FULL "thunar-trash-full" /* see ThunarTrashAction */
--#define THUNAR_STOCK_DIRECTORY "gnome-fs-directory"
-+#define THUNAR_STOCK_DIRECTORY "gtk-directory"
- #define THUNAR_STOCK_DOWNLOADS "thunar-downloads"
- #define THUNAR_STOCK_DOCUMENTS "thunar-documents"
- #define THUNAR_STOCK_MUSIC "thunar-music"
Modified: desktop/branches/experimental/thunar-vfs/debian/rules
===================================================================
--- desktop/trunk/thunar/debian/rules 2010-11-02 19:51:21 UTC (rev 4340)
+++ desktop/branches/experimental/thunar-vfs/debian/rules 2010-11-02 22:39:00 UTC (rev 4341)
@@ -3,52 +3,17 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/autotools.mk
-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_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 --with-volume-manager=none
-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.
- grep -q POSIX_MADV foo || sed -i -e 's/POSIX_MADV/MADV/' \
- $(CURDIR)/thunar-vfs/*.c
-
-
-install/thunar::
- rm -f $(CURDIR)/debian/tmp/usr/lib/*.la
- rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.la
- chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \
- $(CURDIR)/debian/tmp/usr/lib/thunar/thunar-* \
- $(CURDIR)/debian/tmp/usr/lib/libthunar*.so.*2 \
- $(CURDIR)/debian/tmp/usr/lib/thunarx-1/thunar-apr.so \
- $(CURDIR)/debian/tmp/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa
-
-install/thunar-data::
- cd $(CURDIR)/debian/tmp/usr/share/doc/ && mv Thunar thunar-data
- rm -rf $(CURDIR)/debian/tmp/usr/share/man
- # 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/
-
-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.
-binary-post-install/thunar::
- rm -rf $(CURDIR)/debian/thunar/usr/share/doc/thunar
- cd $(CURDIR)/debian/thunar/usr/share/doc/ && \
- rm -rf thunar && ln -sf thunar-data thunar
-
binary-post-install/libthunar-vfs-1-2::
cd $(CURDIR)/debian/libthunar-vfs-1-2/usr/share/doc/ && \
rm -rf libthunar-vfs-1-2 && \
- ln -sf thunar-data libthunar-vfs-1-2
+ ln -sf libthunar-vfs-1-common libthunar-vfs-1-2
binary-post-install/libthunar-vfs-1-dev::
cd $(CURDIR)/debian/libthunar-vfs-1-dev/usr/share/doc/ && \
rm -rf libthunar-vfs-1-dev && \
- ln -sf thunar-data libthunar-vfs-1-dev
+ ln -sf libthunar-vfs-1-common libthunar-vfs-1-dev
More information about the Pkg-xfce-commits
mailing list