Changeset 2019


Ignore:
Timestamp:
09/19/07 07:28:47 (6 years ago)
Author:
alanbach-guest
Message:

Updated gnome-vfs2, 2.20.0, sync'd with debian, refreshed ltmain patch

Location:
pkg/main/gnome-vfs2/trunk/debian
Files:
10 added
20 edited

Legend:

Unmodified
Added
Removed

  • pkg/main/gnome-vfs2/trunk/debian/changelog

    r1575 r2019  
    1 gnome-vfs2 (1:2.18.1-parsix2) barry; urgency=low 
    2  
    3   * Biarch build 
    4  
    5  -- Alan Baghumian <alan@technotux.org>  Sat, 30 Jun 2007 14:05:47 +0330 
    6  
    7 gnome-vfs2 (1:2.18.1-parsix1) barry; urgency=low 
    8  
    9   * New upstream release 
    10  
    11  -- Alan Baghumian <alan@technotux.org>  Wed, 11 Apr 2007 10:14:03 +0330 
    12  
    13 gnome-vfs2 (1:2.18.0.1-parsix1) barry; urgency=low 
    14  
    15   * Parsix build.  
    16  
    17  -- Alan Baghumian <alan@technotux.org>  Mon,  2 Apr 2007 21:57:38 +0330 
     1gnome-vfs2 (1:2.20.0-parsix1) unstable; urgency=low 
     2 
     3  * New upstream stable release, Sync'd with Debian 
     4 
     5 -- Alan Baghumian <alan@technotux.org>  Wed, 19 Sep 2007 05:23:58 +0000 
     6 
     7gnome-vfs2 (1:2.19.91-2) experimental; urgency=low 
     8 
     9  * Merge 1:2.18.3-5: 
     10    + debian/patches/24_gnome_vfs_home_dir.patch: 
     11      - Include stdlib.h for getenv(). Otherwise it will segfault on amd64 at 
     12        least. Thanks to Andreas Henriksson for debugging. 
     13 
     14 -- Sebastian Dröge <slomo@debian.org>  Mon, 10 Sep 2007 11:07:04 +0200 
     15 
     16gnome-vfs2 (1:2.19.91-1) experimental; urgency=low 
     17 
     18  * New upstream release - no ABI and API changes. 
     19  * Merge 1:2.18.3-4: 
     20    + debian/patches/24_gnome_vfs_home_dir.patch: 
     21      - Add a new environment variable GNOME_VFS_HOME to specify the home 
     22        directory that GnomeVFS should use. Currently it only uses the value 
     23        from g_get_home_dir() which can be changed easily. 
     24        Setting this environment variable to a writable directory is necessary 
     25        to use GnomeVFS in the buildd chroots. 
     26 
     27 -- Sebastian Dröge <slomo@debian.org>  Sun, 09 Sep 2007 08:51:33 +0200 
     28 
     29gnome-vfs2 (1:2.19.3-1) experimental; urgency=low 
     30 
     31  [ Loic Minier ] 
     32  * Build-dep on linux-libc-dev instead of linux-kernel-headers; keep the 
     33    version intact. 
     34 
     35  [ Marc 'HE' Brockschmidt ] 
     36  * New upstream release - no ABI and API changes. 
     37  * debian/patches synced a bit with the Ubuntu tree: 
     38    + 14_app_cdda.patch: Register sound-juicer as default application 
     39      for cdda URLs 
     40    + 15_uuid_mount.patch: Look at disk UUIDs to not display dupes of 
     41      the same disks. 
     42    + 16_no_extra_dbus_messages.patch: Turn off some annoying warnings 
     43      when dbus isn't running. 
     44 
     45 -- Marc 'HE' Brockschmidt <he@debian.org>  Fri, 03 Aug 2007 17:22:58 +0200 
     46 
     47gnome-vfs2 (1:2.18.1-5) unstable; urgency=low 
     48 
     49  [ Loic Minier ] 
     50  * Drop the linux-libc-dev build-dep altogether. 
     51 
     52  [ Sebastian Dröge ] 
     53  * debian/patches/24_gnome_vfs_home_dir.patch: 
     54    + Include stdlib.h for getenv(). Otherwise it will segfault on amd64 at 
     55      least. Thanks to Andreas Henriksson for debugging. 
     56 
     57 -- Sebastian Dröge <slomo@debian.org>  Mon, 10 Sep 2007 10:49:36 +0200 
     58 
     59gnome-vfs2 (1:2.18.1-4) unstable; urgency=low 
     60 
     61  [ Loic Minier ] 
     62  * Build-dep on linux-libc-dev instead of linux-kernel-headers; keep the 
     63    version intact (Closes: #439097). 
     64 
     65  [ Sebastian Dröge ] 
     66  * debian/patches/24_gnome_vfs_home_dir.patch: 
     67    + Add a new environment variable GNOME_VFS_HOME to specify the home 
     68      directory that GnomeVFS should use. Currently it only uses the value 
     69      from g_get_home_dir() which can be changed easily. 
     70      Setting this environment variable to a writable directory is necessary 
     71      to use GnomeVFS in the buildd chroots. 
     72 
     73 -- Sebastian Dröge <slomo@debian.org>  Fri, 07 Sep 2007 15:10:37 +0200 
     74 
     75gnome-vfs2 (1:2.18.1-3) unstable; urgency=low 
     76 
     77  [ Josselin Mouette ] 
     78  * libgnomevfs2-common.preinst, libgnomevfs2-extra.preinst: use 
     79    dpkg-query instead of parsing the status file directly. 
     80  * 99_ltmain_as-needed.patch: get --as-needed back to work. 
     81 
     82  [ Otavio Salvador ] 
     83  * 23_improve_volume_labels.patch: Improve volume labels. Thanks to 
     84    Luis Gustavo S. Barreto <gustavo@ossystems.com.br> for the patch. 
     85  * 06_blacklist-directories.patch: Modified to blacklist /live/cow and 
     86    /live/image that are being use by live-initramfs while booting and 
     87    hence completely useless for end-users. 
     88 
     89  [ Josselin Mouette ] 
     90  * 23_improve_volume_labels.patch: we are rich: display both mount 
     91    point and volume size. Also fix a leak with size_str. 
     92 
     93 -- Josselin Mouette <joss@debian.org>  Wed, 27 Jun 2007 22:49:33 +0200 
     94 
     95gnome-vfs2 (1:2.18.1-2) unstable; urgency=low 
     96 
     97  [ Loic Minier ] 
     98  * Wrap build-deps and deps. 
     99  * Drop libc6-dev dep. 
     100  * Make the build-dep on libdbus-glib-1-dev unconditional; thanks 
     101    Michael Banck; closes: #419860. 
     102 
     103  [ Josselin Mouette ] 
     104  * Convert to quilt for patch handling, build-depend on quilt. 
     105  * Convert all patches to -p1 and refresh them. 
     106  * 06_blacklist-directories.patch: add a few commonly found  
     107    non-toplevel FHS direcories to the mountpoint blacklist. 
     108    Closes: #365670. 
     109 
     110 -- Josselin Mouette <joss@debian.org>  Thu, 03 May 2007 23:14:05 +0200 
     111 
     112gnome-vfs2 (1:2.18.1-1) unstable; urgency=low 
     113 
     114  [ Josselin Mouette ] 
     115  * 22_ignore_inaccessible_volumes.patch: patch from Ubuntu to ignore 
     116    volumes on which the current user doesn't have permissions. 
     117    Closes: #416692. 
     118  * Update patch 30_nfs4 to also update the do_is_local() method; thanks 
     119    John Goerzen; closes: #413993. 
     120  * defaults.list: updated using the lists in the latest available 
     121    .desktop files. 
     122 
     123  [ Sebastian Dröge ] 
     124  * New upstream release. 
     125  * Upload to unstable, drop the check-dist include. 
     126  * Build depend on gnome-pkg-tools >= 0.11.3 to get me into Uploaders. 
     127  * Update watch file with the new location. 
     128  * 20_dont_register_keys_for_gaim.patch: patch from Ubuntu to not register 
     129    URL handlers for gaim as gaim already registers them itself. 
     130  * 30_nfs4.patch: Updated for new upstream version. 
     131 
     132 -- Sebastian Dröge <slomo@debian.org>  Mon, 16 Apr 2007 11:43:21 +0200 
    18133 
    19134gnome-vfs2 (1:2.18.0.1-1) experimental; urgency=low 

  • pkg/main/gnome-vfs2/trunk/debian/control

    r1576 r2019  
    33Priority: optional 
    44Maintainer: Josselin Mouette <joss@debian.org> 
    5 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org> 
    6 Build-Depends: cdbs, type-handling, gtk-doc-tools (>= 1.0), libglib2.0-dev (>= 2.9.3), libgconf2-dev (>= 2.8.0-1), libxml2-dev (>= 2.6.0), libbz2-dev, libfam-dev (>= 2.6.9-4) [!hurd-i386], libsmbclient-dev [!hurd-i386], gettext, debhelper (>= 5.0.13), zlib1g-dev, intltool (>= 0.35.0), gnome-mime-data, libgnutls-dev (>= 1.0.4-3), gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), libdbus-glib-1-dev (>= 0.70) [!hurd-i386], libhal-dev (>= 0.5.7) | not+linux-gnu, libhal-storage-dev (>= 0.5.7) | not+linux-gnu, libavahi-client-dev (>= 0.6) [!hurd-i386], libavahi-glib-dev (>= 0.6) [!hurd-i386], libselinux1-dev | not+linux-gnu, libkrb5-dev, libacl1-dev, libattr1-dev, linux-kernel-headers (>= 2.6.13) | not+linux-gnu 
     5Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Marc 'HE' Brockschmidt <he@debian.org>, Sebastian Dröge <slomo@debian.org> 
     6Build-Depends: cdbs, 
     7               quilt, 
     8               type-handling, 
     9               gtk-doc-tools (>= 1.0), 
     10               libglib2.0-dev (>= 2.9.3), 
     11               libgconf2-dev (>= 2.8.0-1), 
     12               libxml2-dev (>= 2.6.0), 
     13               libbz2-dev, 
     14               libfam-dev (>= 2.6.9-4) [!hurd-i386], 
     15               libsmbclient-dev [!hurd-i386], 
     16               gettext, 
     17               debhelper (>= 5.0.13), 
     18               zlib1g-dev, 
     19               intltool (>= 0.35.0), 
     20               gnome-mime-data, 
     21               libgnutls-dev (>= 1.0.4-3), 
     22               gnome-pkg-tools (>= 0.11.3), 
     23               dpkg-dev (>= 1.13.19), 
     24               libdbus-glib-1-dev (>= 0.70), 
     25               libhal-dev (>= 0.5.7) | not+linux-gnu, 
     26               libhal-storage-dev (>= 0.5.7) | not+linux-gnu, 
     27               libavahi-client-dev (>= 0.6) [!hurd-i386], 
     28               libavahi-glib-dev (>= 0.6) [!hurd-i386], 
     29               libselinux1-dev | not+linux-gnu, 
     30               libkrb5-dev, 
     31               libacl1-dev, 
     32               libattr1-dev, 
     33               linux-libc-dev (>= 2.6.13) | not+linux-gnu 
    734Standards-Version: 3.7.2 
    835 
    … …  
    1037Section: libs 
    1138Architecture: all 
    12 Depends: ${misc:Depends}, gnome-mime-data, shared-mime-info 
    13 Conflicts: gnome-panel (<< 2.10.0), libgnomevfs2-0 (<< 2.12.2-4), libgnomevfs2-extra (<< 1:2.16.3-6) 
     39Depends: ${misc:Depends}, 
     40         gnome-mime-data, 
     41         shared-mime-info 
     42Conflicts: gnome-panel (<< 2.10.0), 
     43           libgnomevfs2-0 (<< 2.12.2-4), 
     44           libgnomevfs2-extra (<< 1:2.16.3-6) 
    1445Description: GNOME Virtual File System (common files) 
    1546 GNOME VFS is the GNOME virtual file system.  It is the foundation of the 
    … …  
    2354Package: libgnomevfs2-0 
    2455Architecture: any 
    25 Depends: ${shlibs:Depends}, dbus (>= 0.90), libgnomevfs2-common (>= ${gnome:Version}), libgnomevfs2-common (<< ${gnome:NextVersion}) 
     56Depends: ${shlibs:Depends}, 
     57         dbus (>= 0.90), 
     58         libgnomevfs2-common (>= ${gnome:Version}), 
     59         libgnomevfs2-common (<< ${gnome:NextVersion}) 
    2660Recommends: libgnomevfs2-extra, fam, gnome-mount 
    2761Suggests: libgnomevfs2-bin 
    … …  
    5488Package: libgnomevfs2-extra 
    5589Architecture: any 
    56 Depends: ${shlibs:Depends}, libgnomevfs2-common (>= ${gnome:Version}), libgnomevfs2-common (<< ${gnome:NextVersion}) 
    57 Conflicts: libgnomevfs2-common (<< 2.12.2-7), libgnomevfs2-0 (<< 1:2.16.0-1) 
     90Depends: ${shlibs:Depends}, 
     91         libgnomevfs2-common (>= ${gnome:Version}), 
     92         libgnomevfs2-common (<< ${gnome:NextVersion}) 
     93Conflicts: libgnomevfs2-common (<< 2.12.2-7), 
     94           libgnomevfs2-0 (<< 1:2.16.0-1) 
    5895Description: GNOME Virtual File System (extra modules) 
    5996 GNOME VFS is the GNOME virtual file system.  It is the foundation of the 
    … …  
    90127Architecture: any 
    91128Section: libdevel 
    92 Depends: libgnomevfs2-0 (= ${binary:Version}), libc6-dev, libgconf2-dev (>= 2.8.0-1), libgnutls-dev, libxml2-dev, libavahi-client-dev (>= 0.6) | hurd, libavahi-glib-dev (>= 0.6) | hurd, libdbus-1-dev | hurd, libselinux1-dev | not+linux-gnu 
     129Depends: libgnomevfs2-0 (= ${binary:Version}), 
     130         libgconf2-dev (>= 2.8.0-1), 
     131         libgnutls-dev, 
     132         libxml2-dev, 
     133         libavahi-client-dev (>= 0.6) | hurd, 
     134         libavahi-glib-dev (>= 0.6) | hurd, 
     135         libdbus-1-dev | hurd, 
     136         libselinux1-dev | not+linux-gnu 
    93137Description: GNOME Virtual File System library (development files) 
    94138 GNOME VFS is the GNOME virtual file system.  It is the foundation of the 

  • pkg/main/gnome-vfs2/trunk/debian/control.in

    r471 r2019  
    44Maintainer: Josselin Mouette <joss@debian.org> 
    55Uploaders: @GNOME_TEAM@ 
    6 Build-Depends: cdbs, type-handling, gtk-doc-tools (>= 1.0), libglib2.0-dev (>= 2.9.3), libgconf2-dev (>= 2.8.0-1), libxml2-dev (>= 2.6.0), libbz2-dev, libfam-dev (>= 2.6.9-4) [!hurd-i386], libsmbclient-dev [!hurd-i386], gettext, debhelper (>= 5.0.13), zlib1g-dev, intltool (>= 0.35.0), gnome-mime-data, libgnutls-dev (>= 1.0.4-3), gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), libdbus-glib-1-dev (>= 0.70) [!hurd-i386], libhal-dev (>= 0.5.7) | not+linux-gnu, libhal-storage-dev (>= 0.5.7) | not+linux-gnu, libavahi-client-dev (>= 0.6) [!hurd-i386], libavahi-glib-dev (>= 0.6) [!hurd-i386], libselinux1-dev | not+linux-gnu, libkrb5-dev, libacl1-dev, libattr1-dev, linux-kernel-headers (>= 2.6.13) | not+linux-gnu 
     6Build-Depends: cdbs, 
     7               quilt, 
     8               type-handling, 
     9               gtk-doc-tools (>= 1.0), 
     10               libglib2.0-dev (>= 2.9.3), 
     11               libgconf2-dev (>= 2.8.0-1), 
     12               libxml2-dev (>= 2.6.0), 
     13               libbz2-dev, 
     14               libfam-dev (>= 2.6.9-4) [!hurd-i386], 
     15               libsmbclient-dev [!hurd-i386], 
     16               gettext, 
     17               debhelper (>= 5.0.13), 
     18               zlib1g-dev, 
     19               intltool (>= 0.35.0), 
     20               gnome-mime-data, 
     21               libgnutls-dev (>= 1.0.4-3), 
     22               gnome-pkg-tools (>= 0.11.3), 
     23               dpkg-dev (>= 1.13.19), 
     24               libdbus-glib-1-dev (>= 0.70), 
     25               libhal-dev (>= 0.5.7) | not+linux-gnu, 
     26               libhal-storage-dev (>= 0.5.7) | not+linux-gnu, 
     27               libavahi-client-dev (>= 0.6) [!hurd-i386], 
     28               libavahi-glib-dev (>= 0.6) [!hurd-i386], 
     29               libselinux1-dev | not+linux-gnu, 
     30               libkrb5-dev, 
     31               libacl1-dev, 
     32               libattr1-dev, 
     33               linux-libc-dev (>= 2.6.13) | not+linux-gnu 
    734Standards-Version: 3.7.2 
    835 
    … …  
    1037Section: libs 
    1138Architecture: all 
    12 Depends: ${misc:Depends}, gnome-mime-data, shared-mime-info 
    13 Conflicts: gnome-panel (<< 2.10.0), libgnomevfs2-0 (<< 2.12.2-4), libgnomevfs2-extra (<< 1:2.16.3-6) 
     39Depends: ${misc:Depends}, 
     40         gnome-mime-data, 
     41         shared-mime-info 
     42Conflicts: gnome-panel (<< 2.10.0), 
     43           libgnomevfs2-0 (<< 2.12.2-4), 
     44           libgnomevfs2-extra (<< 1:2.16.3-6) 
    1445Description: GNOME Virtual File System (common files) 
    1546 GNOME VFS is the GNOME virtual file system.  It is the foundation of the 
    … …  
    2354Package: libgnomevfs2-0 
    2455Architecture: any 
    25 Depends: ${shlibs:Depends}, dbus (>= 0.90), libgnomevfs2-common (>= ${gnome:Version}), libgnomevfs2-common (<< ${gnome:NextVersion}) 
     56Depends: ${shlibs:Depends}, 
     57         dbus (>= 0.90), 
     58         libgnomevfs2-common (>= ${gnome:Version}), 
     59         libgnomevfs2-common (<< ${gnome:NextVersion}) 
    2660Recommends: libgnomevfs2-extra, fam, gnome-mount 
    2761Suggests: libgnomevfs2-bin 
    … …  
    5488Package: libgnomevfs2-extra 
    5589Architecture: any 
    56 Depends: ${shlibs:Depends}, libgnomevfs2-common (>= ${gnome:Version}), libgnomevfs2-common (<< ${gnome:NextVersion}) 
    57 Conflicts: libgnomevfs2-common (<< 2.12.2-7), libgnomevfs2-0 (<< 1:2.16.0-1) 
     90Depends: ${shlibs:Depends}, 
     91         libgnomevfs2-common (>= ${gnome:Version}), 
     92         libgnomevfs2-common (<< ${gnome:NextVersion}) 
     93Conflicts: libgnomevfs2-common (<< 2.12.2-7), 
     94           libgnomevfs2-0 (<< 1:2.16.0-1) 
    5895Description: GNOME Virtual File System (extra modules) 
    5996 GNOME VFS is the GNOME virtual file system.  It is the foundation of the 
    … …  
    90127Architecture: any 
    91128Section: libdevel 
    92 Depends: libgnomevfs2-0 (= ${binary:Version}), libc6-dev, libgconf2-dev (>= 2.8.0-1), libgnutls-dev, libxml2-dev, libavahi-client-dev (>= 0.6) | hurd, libavahi-glib-dev (>= 0.6) | hurd, libdbus-1-dev | hurd, libselinux1-dev | not+linux-gnu 
     129Depends: libgnomevfs2-0 (= ${binary:Version}), 
     130         libgconf2-dev (>= 2.8.0-1), 
     131         libgnutls-dev, 
     132         libxml2-dev, 
     133         libavahi-client-dev (>= 0.6) | hurd, 
     134         libavahi-glib-dev (>= 0.6) | hurd, 
     135         libdbus-1-dev | hurd, 
     136         libselinux1-dev | not+linux-gnu 
    93137Description: GNOME Virtual File System library (development files) 
    94138 GNOME VFS is the GNOME virtual file system.  It is the foundation of the 

  • pkg/main/gnome-vfs2/trunk/debian/defaults.list

    r241 r2019  
    33application/rtf=abiword.desktop 
    44application/vnd.ms-word=abiword.desktop 
    5 application/vnd.palm=abiword.desktop 
    6 application/wordperfect5.1=abiword.desktop 
    75application/x-abiword=abiword.desktop 
    8 application/x-applix-word=abiword.desktop 
    9 application/x-palm-database=abiword.desktop 
    106text/abiword=abiword.desktop 
    117text/richtext=abiword.desktop 
    128text/rtf=abiword.desktop 
     9application/x-devhelp=devhelp.desktop 
     10application/x-dia-diagram=dia.desktop 
    1311image/bmp=eog.desktop 
    1412image/gif=eog.desktop 
    … …  
    2927image/x-portable-graymap=eog.desktop 
    3028image/x-portable-pixmap=eog.desktop 
    31 image/x-psd=eog.desktop 
    3229image/x-xbitmap=eog.desktop 
    3330image/x-xpixmap=eog.desktop 
     31image/g3fax=gimp.desktop 
     32image/x-compressed-xcf=gimp.desktop 
     33image/x-fits=gimp.desktop 
     34image/x-psd=gimp.desktop 
     35image/x-sgi=gimp.desktop 
     36image/x-sun-raster=gimp.desktop 
     37image/x-tga=gimp.desktop 
     38image/x-xcf=gimp.desktop 
     39image/x-xwindowdump=gimp.desktop 
    3440application/xhtml+xml=epiphany.desktop 
    3541text/html=epiphany.desktop 
    3642text/xml=epiphany.desktop 
    3743application/pdf=evince.desktop 
     44application/x-bzpdf=evince.desktop 
     45application/x-gzpdf=evince.desktop 
    3846application/postscript=evince.desktop 
     47application/x-bzpostscript=evince.desktop 
     48application/x-gzpostscript=evince.desktop 
     49image/x-eps=evince.desktop 
     50image/x-bzeps=evince.desktop 
     51image/x-gzeps=evince.desktop 
    3952application/x-dvi=evince.desktop 
    40 application/x-gzpostscript=evince.desktop 
    4153image/vnd.djvu=evince.desktop 
     54application/x-cbr=evince.desktop 
     55application/x-cbz=evince.desktop 
    4256application/x-7z-compressed=file-roller.desktop 
    43 application/x-7zip=file-roller.desktop 
    4457application/x-ar=file-roller.desktop 
    4558application/x-arj=file-roller.desktop 
    … …  
    101114text/x-comma-separated-values=gnumeric.desktop 
    102115zz-application/zz-winassoc-xls=gnumeric.desktop 
     116application/vnd.oasis.opendocument.spreadsheet=ooo-calc.desktop 
     117application/vnd.oasis.opendocument.spreadsheet-template=ooo-calc.desktop 
    103118application/vnd.sun.xml.calc=ooo-calc.desktop 
    104119application/vnd.sun.xml.calc.template=ooo-calc.desktop 
    105120application/vnd.stardivision.calc=ooo-calc.desktop 
    106121application/vnd.stardivision.chart=ooo-calc.desktop 
     122application/vnd.oasis.opendocument.graphics=ooo-draw.desktop 
     123application/vnd.oasis.opendocument.graphics-template=ooo-draw.desktop 
     124application/vnd.sun.xml.draw=ooo-draw.desktop 
     125application/vnd.sun.xml.draw.template=ooo-draw.desktop 
     126application/vnd.stardivision.draw=ooo-draw.desktop 
     127application/vnd.oasis.opendocument.presentation=ooo-impress.desktop 
     128application/vnd.oasis.opendocument.presentation-template=ooo-impress.desktop 
     129application/vnd.sun.xml.impress=ooo-impress.desktop 
     130application/vnd.sun.xml.impress.template=ooo-impress.desktop 
     131application/vnd.stardivision.impress=ooo-impress.desktop 
     132application/mspowerpoint=ooo-impress.desktop 
     133application/vnd.ms-powerpoint=ooo-impress.desktop 
     134application/vnd.oasis.opendocument.formula=ooo-math.desktop 
     135application/vnd.sun.xml.math=ooo-math.desktop 
     136application/vnd.stardivision.math=ooo-math.desktop 
     137application/vnd.oasis.opendocument.text=ooo-writer.desktop 
     138application/vnd.oasis.opendocument.text-template=ooo-writer.desktop 
     139application/vnd.oasis.opendocument.text-web=ooo-writer.desktop 
     140application/vnd.oasis.opendocument.text-master=ooo-writer.desktop 
    107141application/vnd.sun.xml.writer=ooo-writer.desktop 
    108142application/vnd.sun.xml.writer.template=ooo-writer.desktop 
    109143application/vnd.sun.xml.writer.global=ooo-writer.desktop 
    110144application/vnd.stardivision.writer=ooo-writer.desktop 
     145application/vnd.wordperfect=ooo-writer.desktop 
     146application/wordperfect=ooo-writer.desktop 
    111147application/ogg=totem.desktop 
     148application/ram=totem.desktop 
     149application/smil=totem.desktop 
    112150application/vnd.rn-realmedia=totem.desktop 
    113151application/x-extension-m4a=totem.desktop 
    114152application/x-extension-mp4=totem.desktop 
    115153application/x-flac=totem.desktop 
     154application/x-flash-video=totem.desktop 
    116155application/x-matroska=totem.desktop 
    117156application/x-ogg=totem.desktop 
     157application/x-quicktime-media-link=totem.desktop 
     158application/x-quicktimeplayer=totem.desktop 
    118159application/x-shockwave-flash=totem.desktop 
    119160application/x-shorten=totem.desktop 
     161application/x-smil=totem.desktop 
     162application/xspf+xml=totem.desktop 
    120163audio/3gpp=totem.desktop 
     164audio/ac3=totem.desktop 
     165audio/AMR=totem.desktop 
     166audio/AMR-WB=totem.desktop 
     167audio/basic=totem.desktop 
    121168audio/mp4=totem.desktop 
    122169audio/mpeg=totem.desktop 
    123170audio/mpegurl=totem.desktop 
    124171audio/vnd.rn-realaudio=totem.desktop 
     172audio/x-ape=totem.desktop 
    125173audio/x-flac=totem.desktop 
     174audio/x-it=totem.desktop 
    126175audio/x-m4a=totem.desktop 
     176audio/x-matroska=totem.desktop 
     177audio/x-mod=totem.desktop 
    127178audio/x-mp3=totem.desktop 
    128179audio/x-mpeg=totem.desktop 
    … …  
    131182audio/x-ms-asx=totem.desktop 
    132183audio/x-ms-wax=totem.desktop 
     184audio/x-ms-wma=totem.desktop 
     185audio/x-musepack=totem.desktop 
    133186audio/x-pn-aiff=totem.desktop 
    134187audio/x-pn-au=totem.desktop 
    … …  
    137190audio/x-pn-wav=totem.desktop 
    138191audio/x-pn-windows-acm=totem.desktop 
     192audio/x-realaudio=totem.desktop 
    139193audio/x-real-audio=totem.desktop 
    140194audio/x-scpls=totem.desktop 
     195audio/x-tta=totem.desktop 
    141196audio/x-wav=totem.desktop 
     197audio/x-wavpack=totem.desktop 
    142198image/vnd.rn-realpix=totem.desktop 
     199image/x-pict=totem.desktop 
    143200misc/ultravox=totem.desktop 
     201text/google-video-pointer=totem.desktop 
     202text/x-google-video-pointer=totem.desktop 
    144203video/3gpp=totem.desktop 
    145204video/dv=totem.desktop 
     205video/fli=totem.desktop 
     206video/flv=totem.desktop 
    146207video/mp4=totem.desktop 
     208video/mp4v-es=totem.desktop 
    147209video/mpeg=totem.desktop 
    148210video/msvideo=totem.desktop 
    149211video/quicktime=totem.desktop 
     212video/vivo=totem.desktop 
     213video/vnd.divx=totem.desktop 
    150214video/vnd.rn-realvideo=totem.desktop 
     215video/vnd.vivo=totem.desktop 
    151216video/x-anim=totem.desktop 
    152217video/x-avi=totem.desktop 
    153218video/x-flc=totem.desktop 
    154219video/x-fli=totem.desktop 
     220video/x-flic=totem.desktop 
    155221video/x-m4v=totem.desktop 
     222video/x-matroska=totem.desktop 
    156223video/x-mpeg=totem.desktop 
    157224video/x-ms-asf=totem.desktop 
     225video/x-msvideo=totem.desktop 
     226video/x-ms-wm=totem.desktop 
    158227video/x-ms-wmv=totem.desktop 
    159 video/x-msvideo=totem.desktop 
     228video/x-ms-wmx=totem.desktop 
     229video/x-ms-wvx=totem.desktop 
    160230video/x-nsv=totem.desktop 
     231video/x-ogm+ogg=totem.desktop 
     232video/x-theora+ogg=totem.desktop 

  • pkg/main/gnome-vfs2/trunk/debian/libgnomevfs2-common.preinst

    r241 r2019  
    44 
    55rm_conffile() { 
    6     CONFFILE="$1" 
     6    PKGNAME="$1" 
     7    CONFFILE="$2" 
    78 
    89    if [ -e "$CONFFILE" ]; then 
    910        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" 
    10         old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`" 
     11        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE's/.* //p\"`" 
    1112        if [ "$md5sum" != "$old_md5sum" ]; then 
    1213            echo "Obsolete conffile $CONFFILE has been modified by you." 
    … …  
    2324    install|upgrade) 
    2425    # The https method is now described in extra-modules.conf 
    25     rm_conffile /etc/gnome-vfs-2.0/modules/ssl-modules.conf 
     26    rm_conffile libgnomevfs2-common /etc/gnome-vfs-2.0/modules/ssl-modules.conf 
    2627    ;; 
    2728esac 

  • pkg/main/gnome-vfs2/trunk/debian/libgnomevfs2-extra.preinst

    r241 r2019  
    44 
    55rm_conffile() { 
    6     CONFFILE="$1" 
     6    PKGNAME="$1" 
     7    CONFFILE="$2" 
    78 
    89    if [ -e "$CONFFILE" ]; then 
    910        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" 
    10         old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`" 
     11        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE's/.* //p\"`" 
    1112        if [ "$md5sum" != "$old_md5sum" ]; then 
    1213            echo "Obsolete conffile $CONFFILE has been modified by you." 
    … …  
    2324    install|upgrade) 
    2425    # The smb method is now described in extra-modules.conf 
    25     rm_conffile /etc/gnome-vfs-2.0/modules/smb-module.conf 
     26    rm_conffile libgnomevfs2-extra /etc/gnome-vfs-2.0/modules/smb-module.conf 
    2627    ;; 
    2728esac 

  • pkg/main/gnome-vfs2/trunk/debian/patches/01_fstab_edit_crash.patch

    r241 r2019  
    11# upstream http://bugzilla.gnome.org/show_bug.cgi?id=300547 
    22 
    3 diff -Nur gnome-vfs2-2.10.0/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.10.0.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 
    4 --- gnome-vfs2-2.10.0/libgnomevfs/gnome-vfs-volume-monitor-daemon.c     2004-12-14 17:23:33.000000000 +0100 
    5 +++ gnome-vfs2-2.10.0.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2005-03-17 12:01:07.245801992 +0100 
    6 @@ -718,6 +718,9 @@ 
     3Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 
     4=================================================================== 
     5--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-04-10 14:03:59.000000000 +0200 
     6+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c      2007-05-03 22:59:25.352066750 +0200 
     7@@ -740,6 +740,9 @@ 
    78                        mount = l->data; 
    89                        uri = gnome_vfs_get_uri_from_local_path (mount->mount_path); 

  • pkg/main/gnome-vfs2/trunk/debian/patches/02_audiocd_readonly.patch

    r241 r2019  
    1 --- libgnomevfs/gnome-vfs-hal-mounts.c.orig     2006-12-09 01:14:31.000000000 +0100 
    2 +++ libgnomevfs/gnome-vfs-hal-mounts.c  2006-12-09 01:35:07.000000000 +0100 
    3 @@ -1036,17 +1036,19 @@ 
     1Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c 
     2=================================================================== 
     3--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-hal-mounts.c    2007-04-10 14:03:59.000000000 +0200 
     4+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c 2007-05-03 22:59:58.054110500 +0200 
     5@@ -1038,17 +1038,19 @@ 
    46                        vol->priv->volume_type = GNOME_VFS_VOLUME_TYPE_VFS_MOUNT; 
    57                        vol->priv->activation_uri = g_strdup_printf ("cdda://%s",  

  • pkg/main/gnome-vfs2/trunk/debian/patches/03_usr_share_gnome_applications.patch

    r241 r2019  
    1 --- libgnomevfs/gnome-vfs-mime-info-cache.c.orig        2005-03-22 19:47:02.000000000 +0100 
    2 +++ libgnomevfs/gnome-vfs-mime-info-cache.c     2005-03-22 19:59:32.000000000 +0100 
    3 @@ -412,11 +412,12 @@ 
     1Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-mime-info-cache.c 
     2=================================================================== 
     3--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-mime-info-cache.c       2007-04-10 14:03:59.000000000 +0200 
     4+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-mime-info-cache.c    2007-05-03 23:00:18.131365250 +0200 
     5@@ -424,11 +424,12 @@ 
    46  
    57        for (length = 0; data_dirs[length] != NULL; length++); 

  • pkg/main/gnome-vfs2/trunk/debian/patches/04_sftp_pam_krb5.patch

    r241 r2019  
    1 --- modules/sftp-method.c.orig  2006-07-21 19:13:29.000000000 +0200 
    2 +++ modules/sftp-method.c       2007-02-28 18:27:29.000000000 +0100 
    3 @@ -1273,6 +1273,8 @@ 
     1Index: gnome-vfs-2.18.1/modules/sftp-method.c 
     2=================================================================== 
     3--- gnome-vfs-2.18.1.orig/modules/sftp-method.c 2007-04-10 14:03:56.000000000 +0200 
     4+++ gnome-vfs-2.18.1/modules/sftp-method.c      2007-05-03 23:01:02.282124500 +0200 
     5@@ -1315,6 +1315,8 @@ 
    46                        if (g_str_has_suffix (buffer, "password: ") || 
    57                            g_str_has_suffix (buffer, "Password: ") || 
    … …  
    810+                           g_str_has_prefix (buffer, "Enter Kerberos password") || 
    911                            g_str_has_prefix (buffer, "Enter passphrase for key")) { 
    10                                 if (!done_auth && gnome_vfs_uri_get_password (uri) != NULL) { 
    11                                         password = g_strdup (gnome_vfs_uri_get_password (uri)); 
     12                                if (!done_auth && password != NULL) { 
     13                                        g_io_channel_write_chars (tty_channel, password, -1, &len, NULL); 

  • pkg/main/gnome-vfs2/trunk/debian/patches/05_default_modules.patch

    r241 r2019  
    1 --- modules/default-modules.conf.orig   2006-09-06 22:27:34.000000000 +0200 
    2 +++ modules/default-modules.conf        2007-02-24 10:45:30.000000000 +0100 
     1Index: gnome-vfs-2.18.1/modules/default-modules.conf 
     2=================================================================== 
     3--- gnome-vfs-2.18.1.orig/modules/default-modules.conf  2007-04-10 14:03:56.000000000 +0200 
     4+++ gnome-vfs-2.18.1/modules/default-modules.conf       2007-05-03 23:01:06.138365500 +0200 
    35@@ -6,8 +6,6 @@ 
    46 # <method 1> <method 2> ... <method N> : <module> 

  • pkg/main/gnome-vfs2/trunk/debian/patches/08_recursive_local_check.patch

    r241 r2019  
    1 --- modules/file-method.c.orig  2006-08-23 13:19:26.000000000 +0200 
    2 +++ modules/file-method.c       2006-09-06 22:19:02.000000000 +0200 
    3 @@ -1258,6 +1258,7 @@ 
     1Index: gnome-vfs-2.18.1/modules/file-method.c 
     2=================================================================== 
     3--- gnome-vfs-2.18.1.orig/modules/file-method.c 2007-04-10 14:03:56.000000000 +0200 
     4+++ gnome-vfs-2.18.1/modules/file-method.c      2007-05-03 23:01:11.558704250 +0200 
     5@@ -1257,6 +1257,7 @@ 
    46        struct stat statbuf; 
    57        gboolean is_local; 
    … …  
    911        g_return_val_if_fail (uri != NULL, FALSE); 
    1012  
    11 @@ -1265,21 +1266,22 @@ 
     13@@ -1264,21 +1265,22 @@ 
    1214        if (path == NULL) 
    1315                return TRUE; /* GNOME_VFS_ERROR_INVALID_URI */ 

  • pkg/main/gnome-vfs2/trunk/debian/patches/09_gnomevfs_mount_selection.patch

    r241 r2019  
    11? libgnomevfs/.gnome-vfs-volume-ops.c.swp 
    2 Index: libgnomevfs/gnome-vfs-volume-ops.c 
     2Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-ops.c 
    33=================================================================== 
    4 RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-volume-ops.c,v 
    5 retrieving revision 1.31 
    6 diff -u -r1.31 gnome-vfs-volume-ops.c 
    7 --- libgnomevfs/gnome-vfs-volume-ops.c  25 Apr 2006 11:19:53 -0000      1.31 
    8 +++ libgnomevfs/gnome-vfs-volume-ops.c  1 May 2006 17:29:27 -0000 
    9 @@ -833,8 +833,6 @@ 
     4--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-ops.c    2007-04-10 14:03:59.000000000 +0200 
     5+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-ops.c 2007-05-03 23:01:18.811157500 +0200 
     6@@ -823,8 +823,6 @@ 
    107 # if defined(HAL_MOUNT) 
    118                       if (hal_udi != NULL && g_file_test (HAL_MOUNT, G_FILE_TEST_IS_EXECUTABLE)) 
    … …  
    1613                       ; 
    1714 # endif 
    18 @@ -857,8 +855,6 @@ 
     15@@ -847,8 +845,6 @@ 
    1916 # if defined(HAL_UMOUNT) 
    2017                       if (hal_udi != NULL && g_file_test (HAL_UMOUNT, G_FILE_TEST_IS_EXECUTABLE)) 

  • pkg/main/gnome-vfs2/trunk/debian/patches/10_configuration_loop.patch

    r241 r2019  
    1 --- libgnomevfs/gnome-vfs-configuration.c.orig  2006-09-01 23:52:57.000000000 +0200 
    2 +++ libgnomevfs/gnome-vfs-configuration.c       2006-09-01 23:55:31.000000000 +0200 
     1Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-configuration.c 
     2=================================================================== 
     3--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-configuration.c 2007-04-10 14:03:59.000000000 +0200 
     4+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-configuration.c      2007-05-03 23:01:34.044109500 +0200 
    35@@ -358,6 +358,8 @@ 
    46        guint line_buffer_size; 

  • pkg/main/gnome-vfs2/trunk/debian/patches/12_user_visible_drives.patch

    r241 r2019  
    11Nur in gnome-vfs2-2.8.1.old/debian/patches: 12_user_visible_drives.patch. 
    2 diff -ru gnome-vfs2-2.8.1.old/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.8.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 
    3 --- gnome-vfs2-2.8.1.old/libgnomevfs/gnome-vfs-volume-monitor-daemon.c  2004-09-23 15:20:46.099901960 +0200 
    4 +++ gnome-vfs2-2.8.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c      2004-09-23 15:23:00.649447320 +0200 
    5 @@ -954,6 +954,10 @@ 
     2Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 
     3=================================================================== 
     4--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 22:59:25.352066750 +0200 
     5+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c      2007-05-03 23:01:46.536890250 +0200 
     6@@ -985,6 +985,10 @@ 
    67                vol->priv->is_user_visible = 1; 
    78                break; 

  • pkg/main/gnome-vfs2/trunk/debian/patches/13_resolve_fstab_symlinks.patch

    r241 r2019  
    1 diff -Nur gnome-vfs2-2.8.3/libgnomevfs/gnome-vfs-unix-mounts.c gnome-vfs2-2.8.3.new/libgnomevfs/gnome-vfs-unix-mounts.c 
    2 --- gnome-vfs2-2.8.3/libgnomevfs/gnome-vfs-unix-mounts.c        2004-10-15 10:00:02.000000000 +0200 
    3 +++ gnome-vfs2-2.8.3.new/libgnomevfs/gnome-vfs-unix-mounts.c    2004-11-23 17:19:09.426568360 +0100 
    4 @@ -538,6 +538,7 @@ 
     1Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c 
     2=================================================================== 
     3--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-unix-mounts.c   2007-04-10 14:03:59.000000000 +0200 
     4+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c        2007-05-03 23:01:50.353128750 +0200 
     5@@ -541,6 +541,7 @@ 
    56        char *opt, *opt_end; 
    67        struct stat sb; 
    … …  
    1011        stat_file = read_file = get_fstab_file (); 
    1112  
    12 @@ -569,7 +570,12 @@ 
     13@@ -572,7 +573,12 @@ 
    1314                 
    1415                mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1); 

  • pkg/main/gnome-vfs2/trunk/debian/patches/19_hurd_path_max.patch

    r241 r2019  
    1 --- libgnomevfs/gnome-vfs-unix-mounts.c.orig    2005-03-24 15:49:19.000000000 +0100 
    2 +++ libgnomevfs/gnome-vfs-unix-mounts.c 2005-03-24 15:49:55.000000000 +0100 
     1Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c 
     2=================================================================== 
     3--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-unix-mounts.c   2007-05-03 23:01:50.353128750 +0200 
     4+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c        2007-05-03 23:02:19.782968000 +0200 
    35@@ -85,6 +85,9 @@ 
    46  
    … …  
    1113 /* Ideally this should not nonblocking stat, since that can block on 
    1214  * downed NFS mounts forever, however there seems to be no good way 
    13 --- modules/file-method.c.orig  2005-04-01 02:24:13.000000000 +0200 
    14 +++ modules/file-method.c       2005-04-01 02:23:33.000000000 +0200 
    15 @@ -87,7 +87,11 @@ 
     15Index: gnome-vfs-2.18.1/modules/file-method.c 
     16=================================================================== 
     17--- gnome-vfs-2.18.1.orig/modules/file-method.c 2007-05-03 23:01:11.558704250 +0200 
     18+++ gnome-vfs-2.18.1/modules/file-method.c      2007-05-03 23:02:19.782968000 +0200 
     19@@ -127,7 +127,11 @@ 
    1620                if (x > 0) 
    1721                        value = x; 
    … …  
    2529  
    2630        return value; 
    27 @@ -1357,7 +1357,7 @@ 
     31@@ -1659,7 +1663,7 @@ 
    2832        char *cache_file_path; 
    2933        FILE *cache_file; 

  • pkg/main/gnome-vfs2/trunk/debian/patches/30_nfs4.patch

    r472 r2019  
    1 diff -Nur gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-filesystem-type.c 
    2 --- gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-filesystem-type.c   2005-07-18 14:29:56.000000000 +0200 
    3 +++ gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-filesystem-type.c       2007-02-09 21:20:20.000000000 +0100 
    4 @@ -57,6 +57,7 @@ 
     1Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-filesystem-type.c 
     2=================================================================== 
     3--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-filesystem-type.c       2007-04-10 14:03:59.000000000 +0200 
     4+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-filesystem-type.c    2007-05-03 23:02:33.475823750 +0200 
     5@@ -63,6 +63,7 @@ 
    56        { "msdos"    , N_("MSDOS Volume"), 0 }, 
    67        { "msdosfs"  , N_("MSDOS Volume"), 0 }, 
    … …  
    1011        { "nwfs"     , N_("Netware Volume"), 0 }, 
    1112        { "proc"     , N_("System Volume"), 0 }, 
    12 diff -Nur gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 
    13 --- gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c     2007-02-09 21:19:37.000000000 +0100 
    14 +++ gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-02-09 21:21:36.000000000 +0100 
    15 @@ -891,7 +891,8 @@ 
     13Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 
     14=================================================================== 
     15--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 23:02:29.895600000 +0200 
     16+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c      2007-05-03 23:02:33.475823750 +0200 
     17@@ -892,7 +892,8 @@ 
    1618                if (vol->priv->device_type == GNOME_VFS_DEVICE_TYPE_UNKNOWN) { 
    1719                        vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_CDROM; 
    … …  
    2325                        vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_AUTOFS; 
    2426                } else { 
     27Index: gnome-vfs-2.18.1/modules/file-method.c 
     28=================================================================== 
     29--- gnome-vfs-2.18.1.orig/modules/file-method.c 2007-05-03 23:02:19.782968000 +0200 
     30+++ gnome-vfs-2.18.1/modules/file-method.c      2007-05-03 23:02:33.475823750 +0200 
     31@@ -1279,6 +1279,7 @@ 
     32        G_LOCK (fstype); 
     33        type = filesystem_type (path, path, &statbuf); 
     34        is_local = ((strcmp (type, "nfs") != 0) &&  
     35+                   (strcmp (type, "nfs4") != 0) && 
     36                    (strcmp (type, "afs") != 0) && 
     37                    (strcmp (type, "autofs") != 0) && 
     38                    (strcmp (type, "unknown") != 0) && 

  • pkg/main/gnome-vfs2/trunk/debian/rules

    r241 r2019  
    44include /usr/share/cdbs/1/class/autotools.mk 
    55include /usr/share/cdbs/1/class/gnome.mk 
    6 include /usr/share/cdbs/1/rules/simple-patchsys.mk 
     6include /usr/share/cdbs/1/rules/patchsys-quilt.mk 
    77include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk 
    88include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk 
    99include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk 
    10 include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk 
    1110-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk 
    1211 

  • pkg/main/gnome-vfs2/trunk/debian/watch

    r269 r2019  
    11version=2 
    2 http://download.gnome.org/sources/gnome-vfs/([\d\.]+)[02468]/ \ 
     2http://download.gnome.org/sources/gnome-vfs/2.18/ \ 
    33        gnome-vfs-(.*)\.tar\.gz \ 
    44        debian uupdate 
Note: See TracChangeset for help on using the changeset viewer.