r31342 - in /desktop/experimental/gvfs/debian: ./ patches/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Nov 13 11:03:47 UTC 2011 

Author: joss
Date: Sun Nov 13 11:03:45 2011
New Revision: 31342

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31342
Log:
* Drop gvfs.postinst, it’s been here in squeeze.
* Make gvfs multiarch-compatible:
  + 01_modules_dir.patch: query the modules dir from gio instead of 
    hardcoding it.
  + Split the gvfs package between all sub-components.
    - gvfs: holds the GIO module (multiarch: same)
    - gvfs-daemons: holds the daemons (multiarch: foreign)
    - gvfs-libs: holds common libraries (multiarch: same)
    - gvfs-common: holds data (multiarch: foreign, arch: all)
  + Update depends/breaks/replaces accordingly.
  + Prevent dh_makeshlibs from doing anything.
  + Add lintian overrides for the private library dir using rpath.

Added:
    desktop/experimental/gvfs/debian/gvfs-common.install
      - copied, changed from r31339, desktop/experimental/gvfs/debian/gvfs.install
    desktop/experimental/gvfs/debian/gvfs-daemons.install
      - copied, changed from r31339, desktop/experimental/gvfs/debian/gvfs.install
    desktop/experimental/gvfs/debian/gvfs-daemons.lintian-overrides
    desktop/experimental/gvfs/debian/gvfs-fuse.lintian-overrides
    desktop/experimental/gvfs/debian/gvfs-libs.install
      - copied, changed from r31339, desktop/experimental/gvfs/debian/gvfs.install
    desktop/experimental/gvfs/debian/gvfs.lintian-overrides
    desktop/experimental/gvfs/debian/patches/01_modules_dir.patch
Removed:
    desktop/experimental/gvfs/debian/gvfs.postinst
Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/control
    desktop/experimental/gvfs/debian/control.in
    desktop/experimental/gvfs/debian/gvfs-backends.install
    desktop/experimental/gvfs/debian/gvfs.install
    desktop/experimental/gvfs/debian/patches/series
    desktop/experimental/gvfs/debian/rules

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=31342&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Sun Nov 13 11:03:45 2011
@@ -6,6 +6,18 @@
   * 02_deprecated.patch: updated for the new version.
   * 05_shared_libdaemon.patch: refreshed.
   * Install afp backend.
+  * Drop gvfs.postinst, it’s been here in squeeze.
+  * Make gvfs multiarch-compatible:
+    + 01_modules_dir.patch: query the modules dir from gio instead of 
+      hardcoding it.
+    + Split the gvfs package between all sub-components.
+      - gvfs: holds the GIO module (multiarch: same)
+      - gvfs-daemons: holds the daemons (multiarch: foreign)
+      - gvfs-libs: holds common libraries (multiarch: same)
+      - gvfs-common: holds data (multiarch: foreign, arch: all)
+    + Update depends/breaks/replaces accordingly.
+    + Prevent dh_makeshlibs from doing anything.
+    + Add lintian overrides for the private library dir using rpath.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 13 Nov 2011 10:38:51 +0100
 

Modified: desktop/experimental/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control?rev=31342&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control [utf-8] Sun Nov 13 11:03:45 2011
@@ -47,31 +47,99 @@
 
 Package: gvfs
 Architecture: any
+Multi-Arch: same
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gvfs-daemons (>= ${source:Version}),
+         gvfs-daemons (<< ${source:Version}.1~),
+         gvfs-libs (= ${binary:Version}),
+         gvfs-common (= ${source:Version})
+Breaks: brasero (<< 2.28.0-2),
+        rhythmbox (<< 0.12.6-2),
+        libgdu0 (<< 2.28.1-3),
+        libglib2.0-0 (<< 2.30)
+Suggests: gvfs-backends
+Description: userspace virtual filesystem - GIO module
+ gvfs is a userspace virtual filesystem where mounts run as separate
+ processes which you talk to via D-Bus. It also contains a gio module
+ that seamlessly adds gvfs support to all applications using the gio
+ API. It also supports exposing the gvfs mounts to non-gio applications
+ using fuse.
+ .
+ This package contains the GIO module that lets applications use gvfs 
+ mounts.
+
+Package: gvfs-daemons
+Architecture: any
+Multi-Arch: foreign
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          x11-utils,
+         gvfs-libs (= ${binary:Version}),
+         gvfs-common (= ${source:Version})
 Recommends: dbus,
             hal (>= 0.5.10) [!linux-any],
             gnome-mount [!linux-any] | exo-utils [!linux-any],
-            policykit-1-gnome [linux-any]
+            policykit-1-gnome [linux-any],
+            gvfs
+Suggests: gvfs-backends
 Breaks: brasero (<< 2.28.0-2),
         rhythmbox (<< 0.12.6-2),
         libgdu0 (<< 2.28.1-3),
         gvfs-backends (<< 1.8.1-1),
-        libglib2.0-0 (<< 2.28.6-2)
-Suggests: gvfs-backends
+        libglib2.0-0 (<< 2.28.6-2),
+        gvfs (<< 1.10.1-1)
+Replaces: gvfs-backends (<< 1.8.1-1),
+          gvfs (<< 1.10.1-1)
+Description: userspace virtual filesystem - servers
+ gvfs is a userspace virtual filesystem where mounts run as separate
+ processes which you talk to via D-Bus. It also contains a gio module
+ that seamlessly adds gvfs support to all applications using the gio
+ API. It also supports exposing the gvfs mounts to non-gio applications
+ using fuse.
+ .
+ This package contains the gvfs server and the minimal set of backends.
+
+Package: gvfs-libs
+Architecture: any
+Multi-Arch: same
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gvfs-common (= ${source:Version})
+Breaks: gvfs (<< 1.10.1-1)
 Conflicts: libgvfscommon0
-Replaces: libgvfscommon0, gvfs-backends (<< 1.8.1-1)
-Description: userspace virtual filesystem - server
- gvfs is a userspace virtual filesystem where mounts run as separate
- processes which you talk to via D-Bus. It also contains a gio module
- that seamlessly adds gvfs support to all applications using the gio
- API. It also supports exposing the gvfs mounts to non-gio applications
- using fuse.
- .
- This package contains the gvfs server that provides gvfs mounts to all
- gio applications, and the minimal set of backends.
+Replaces: libgvfscommon0,
+          gvfs (<< 1.10.1-1)
+Description: userspace virtual filesystem - private libraries
+ gvfs is a userspace virtual filesystem where mounts run as separate
+ processes which you talk to via D-Bus. It also contains a gio module
+ that seamlessly adds gvfs support to all applications using the gio
+ API. It also supports exposing the gvfs mounts to non-gio applications
+ using fuse.
+ .
+ This package contains private libraries with common functions between 
+ the daemons and the GIO module.
+
+Package: gvfs-common
+Architecture: all
+Multi-Arch: foreign
+Section: libs
+Depends: ${misc:Depends}
+Recommends: gvfs
+Breaks: gvfs (<< 1.10.1-1)
+Replaces: gvfs (<< 1.10.1-1)    
+Description: userspace virtual filesystem - common data files
+ gvfs is a userspace virtual filesystem where mounts run as separate
+ processes which you talk to via D-Bus. It also contains a gio module
+ that seamlessly adds gvfs support to all applications using the gio
+ API. It also supports exposing the gvfs mounts to non-gio applications
+ using fuse.
+ .
+ This package contains the data files and translations used by all gvfs 
+ components.
 
 Package: gvfs-fuse
 Architecture: linux-any kfreebsd-any
@@ -91,9 +159,13 @@
 
 Package: gvfs-backends
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gvfs (= ${binary:Version}),
+         gvfs-daemons (= ${binary:Version}),
+         gvfs-libs (= ${binary:Version}),
+         gvfs-common (= ${source:Version}),
          psmisc
 Recommends: gnome-keyring
 Suggests: obex-data-server, samba-common
@@ -109,9 +181,11 @@
 
 Package: gvfs-bin
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gvfs (= ${binary:Version})
+Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gvfs (= ${binary:Version}),
+         gvfs-common (= ${source:Version})
 Description: userspace virtual filesystem - binaries
  gvfs is a userspace virtual filesystem where mounts run as separate
  processes which you talk to via D-Bus. It also contains a gio module

Modified: desktop/experimental/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control.in?rev=31342&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control.in [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control.in [utf-8] Sun Nov 13 11:03:45 2011
@@ -42,31 +42,99 @@
 
 Package: gvfs
 Architecture: any
+Multi-Arch: same
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gvfs-daemons (>= ${source:Version}),
+         gvfs-daemons (<< ${source:Version}.1~),
+         gvfs-libs (= ${binary:Version}),
+         gvfs-common (= ${source:Version})
+Breaks: brasero (<< 2.28.0-2),
+        rhythmbox (<< 0.12.6-2),
+        libgdu0 (<< 2.28.1-3),
+        libglib2.0-0 (<< 2.30)
+Suggests: gvfs-backends
+Description: userspace virtual filesystem - GIO module
+ gvfs is a userspace virtual filesystem where mounts run as separate
+ processes which you talk to via D-Bus. It also contains a gio module
+ that seamlessly adds gvfs support to all applications using the gio
+ API. It also supports exposing the gvfs mounts to non-gio applications
+ using fuse.
+ .
+ This package contains the GIO module that lets applications use gvfs 
+ mounts.
+
+Package: gvfs-daemons
+Architecture: any
+Multi-Arch: foreign
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          x11-utils,
+         gvfs-libs (= ${binary:Version}),
+         gvfs-common (= ${source:Version})
 Recommends: dbus,
             hal (>= 0.5.10) [!linux-any],
             gnome-mount [!linux-any] | exo-utils [!linux-any],
-            policykit-1-gnome [linux-any]
+            policykit-1-gnome [linux-any],
+            gvfs
+Suggests: gvfs-backends
 Breaks: brasero (<< 2.28.0-2),
         rhythmbox (<< 0.12.6-2),
         libgdu0 (<< 2.28.1-3),
         gvfs-backends (<< 1.8.1-1),
-        libglib2.0-0 (<< 2.28.6-2)
-Suggests: gvfs-backends
+        libglib2.0-0 (<< 2.28.6-2),
+        gvfs (<< 1.10.1-1)
+Replaces: gvfs-backends (<< 1.8.1-1),
+          gvfs (<< 1.10.1-1)
+Description: userspace virtual filesystem - servers
+ gvfs is a userspace virtual filesystem where mounts run as separate
+ processes which you talk to via D-Bus. It also contains a gio module
+ that seamlessly adds gvfs support to all applications using the gio
+ API. It also supports exposing the gvfs mounts to non-gio applications
+ using fuse.
+ .
+ This package contains the gvfs server and the minimal set of backends.
+
+Package: gvfs-libs
+Architecture: any
+Multi-Arch: same
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gvfs-common (= ${source:Version})
+Breaks: gvfs (<< 1.10.1-1)
 Conflicts: libgvfscommon0
-Replaces: libgvfscommon0, gvfs-backends (<< 1.8.1-1)
-Description: userspace virtual filesystem - server
- gvfs is a userspace virtual filesystem where mounts run as separate
- processes which you talk to via D-Bus. It also contains a gio module
- that seamlessly adds gvfs support to all applications using the gio
- API. It also supports exposing the gvfs mounts to non-gio applications
- using fuse.
- .
- This package contains the gvfs server that provides gvfs mounts to all
- gio applications, and the minimal set of backends.
+Replaces: libgvfscommon0,
+          gvfs (<< 1.10.1-1)
+Description: userspace virtual filesystem - private libraries
+ gvfs is a userspace virtual filesystem where mounts run as separate
+ processes which you talk to via D-Bus. It also contains a gio module
+ that seamlessly adds gvfs support to all applications using the gio
+ API. It also supports exposing the gvfs mounts to non-gio applications
+ using fuse.
+ .
+ This package contains private libraries with common functions between 
+ the daemons and the GIO module.
+
+Package: gvfs-common
+Architecture: all
+Multi-Arch: foreign
+Section: libs
+Depends: ${misc:Depends}
+Recommends: gvfs
+Breaks: gvfs (<< 1.10.1-1)
+Replaces: gvfs (<< 1.10.1-1)    
+Description: userspace virtual filesystem - common data files
+ gvfs is a userspace virtual filesystem where mounts run as separate
+ processes which you talk to via D-Bus. It also contains a gio module
+ that seamlessly adds gvfs support to all applications using the gio
+ API. It also supports exposing the gvfs mounts to non-gio applications
+ using fuse.
+ .
+ This package contains the data files and translations used by all gvfs 
+ components.
 
 Package: gvfs-fuse
 Architecture: linux-any kfreebsd-any
@@ -86,9 +154,13 @@
 
 Package: gvfs-backends
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gvfs (= ${binary:Version}),
+         gvfs-daemons (= ${binary:Version}),
+         gvfs-libs (= ${binary:Version}),
+         gvfs-common (= ${source:Version}),
          psmisc
 Recommends: gnome-keyring
 Suggests: obex-data-server, samba-common
@@ -104,9 +176,11 @@
 
 Package: gvfs-bin
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gvfs (= ${binary:Version})
+Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gvfs (= ${binary:Version}),
+         gvfs-common (= ${source:Version})
 Description: userspace virtual filesystem - binaries
  gvfs is a userspace virtual filesystem where mounts run as separate
  processes which you talk to via D-Bus. It also contains a gio module

Modified: desktop/experimental/gvfs/debian/gvfs-backends.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-backends.install?rev=31342&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] Sun Nov 13 11:03:45 2011
@@ -21,7 +21,7 @@
 # usr/share/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service
 # Now installed from debian/rules:
 # usr/lib/gvfs/gvfs-gphoto2-volume-monitor
-usr/lib/gvfs/libgvfscommon-dnssd.so
+usr/lib/*/gvfs/libgvfscommon-dnssd.so
 # Now installed from debian/rules:
 # usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
 # usr/share/gvfs/mounts/afc.mount

Copied: desktop/experimental/gvfs/debian/gvfs-common.install (from r31339, desktop/experimental/gvfs/debian/gvfs.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-common.install?rev=31342&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs-common.install [utf-8] Sun Nov 13 11:03:45 2011
@@ -1,23 +1,3 @@
-usr/lib/gio/modules/*.so
-usr/lib/gvfs/gvfsd
-usr/lib/gvfs/gvfsd-burn
-usr/lib/gvfs/gvfsd-computer
-usr/lib/gvfs/gvfsd-localtest
-usr/lib/gvfs/gvfsd-metadata
-usr/lib/gvfs/gvfsd-trash
-usr/lib/gvfs/libgvfsdaemon.so
-usr/lib/gvfs/libgvfscommon.so
-usr/share/dbus-1/services/gvfs-daemon.service
-usr/share/dbus-1/services/gvfs-metadata.service
 usr/share/glib-2.0
 usr/share/GConf
 usr/share/locale
-usr/share/gvfs/mounts/burn.mount
-usr/share/gvfs/mounts/computer.mount
-usr/share/gvfs/mounts/localtest.mount
-usr/share/gvfs/mounts/trash.mount
-# Now installed from debian/rules
-# usr/lib/gvfs/gvfs-{hal,gdu}-volume-monitor
-# usr/share/dbus-1/services/org.gtk.Private.{Hal,Gdu}VolumeMonitor.service
-# usr/share/gvfs/remote-volume-monitors/{hal,gdu}.monitor
-# debian/xdg-mount /usr/bin/

Copied: desktop/experimental/gvfs/debian/gvfs-daemons.install (from r31339, desktop/experimental/gvfs/debian/gvfs.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-daemons.install?rev=31342&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs-daemons.install [utf-8] Sun Nov 13 11:03:45 2011
@@ -1,17 +1,11 @@
-usr/lib/gio/modules/*.so
 usr/lib/gvfs/gvfsd
 usr/lib/gvfs/gvfsd-burn
 usr/lib/gvfs/gvfsd-computer
 usr/lib/gvfs/gvfsd-localtest
 usr/lib/gvfs/gvfsd-metadata
 usr/lib/gvfs/gvfsd-trash
-usr/lib/gvfs/libgvfsdaemon.so
-usr/lib/gvfs/libgvfscommon.so
 usr/share/dbus-1/services/gvfs-daemon.service
 usr/share/dbus-1/services/gvfs-metadata.service
-usr/share/glib-2.0
-usr/share/GConf
-usr/share/locale
 usr/share/gvfs/mounts/burn.mount
 usr/share/gvfs/mounts/computer.mount
 usr/share/gvfs/mounts/localtest.mount

Added: desktop/experimental/gvfs/debian/gvfs-daemons.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-daemons.lintian-overrides?rev=31342&op=file
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs-daemons.lintian-overrides (added)
+++ desktop/experimental/gvfs/debian/gvfs-daemons.lintian-overrides [utf-8] Sun Nov 13 11:03:45 2011
@@ -1,0 +1,1 @@
+gvfs-daemons: binary-or-shlib-defines-rpath usr/lib/gvfs/gvfs* /usr/lib/*/gvfs

Added: desktop/experimental/gvfs/debian/gvfs-fuse.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-fuse.lintian-overrides?rev=31342&op=file
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs-fuse.lintian-overrides (added)
+++ desktop/experimental/gvfs/debian/gvfs-fuse.lintian-overrides [utf-8] Sun Nov 13 11:03:45 2011
@@ -1,0 +1,1 @@
+gvfs-fuse: binary-or-shlib-defines-rpath usr/lib/gvfs/gvfs-fuse-daemon /usr/lib/*/gvfs

Copied: desktop/experimental/gvfs/debian/gvfs-libs.install (from r31339, desktop/experimental/gvfs/debian/gvfs.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-libs.install?rev=31342&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs-libs.install [utf-8] Sun Nov 13 11:03:45 2011
@@ -1,23 +1,2 @@
-usr/lib/gio/modules/*.so
-usr/lib/gvfs/gvfsd
-usr/lib/gvfs/gvfsd-burn
-usr/lib/gvfs/gvfsd-computer
-usr/lib/gvfs/gvfsd-localtest
-usr/lib/gvfs/gvfsd-metadata
-usr/lib/gvfs/gvfsd-trash
-usr/lib/gvfs/libgvfsdaemon.so
-usr/lib/gvfs/libgvfscommon.so
-usr/share/dbus-1/services/gvfs-daemon.service
-usr/share/dbus-1/services/gvfs-metadata.service
-usr/share/glib-2.0
-usr/share/GConf
-usr/share/locale
-usr/share/gvfs/mounts/burn.mount
-usr/share/gvfs/mounts/computer.mount
-usr/share/gvfs/mounts/localtest.mount
-usr/share/gvfs/mounts/trash.mount
-# Now installed from debian/rules
-# usr/lib/gvfs/gvfs-{hal,gdu}-volume-monitor
-# usr/share/dbus-1/services/org.gtk.Private.{Hal,Gdu}VolumeMonitor.service
-# usr/share/gvfs/remote-volume-monitors/{hal,gdu}.monitor
-# debian/xdg-mount /usr/bin/
+usr/lib/*/gvfs/libgvfsdaemon.so
+usr/lib/*/gvfs/libgvfscommon.so

Modified: desktop/experimental/gvfs/debian/gvfs.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs.install?rev=31342&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs.install [utf-8] Sun Nov 13 11:03:45 2011
@@ -1,23 +1,1 @@
-usr/lib/gio/modules/*.so
-usr/lib/gvfs/gvfsd
-usr/lib/gvfs/gvfsd-burn
-usr/lib/gvfs/gvfsd-computer
-usr/lib/gvfs/gvfsd-localtest
-usr/lib/gvfs/gvfsd-metadata
-usr/lib/gvfs/gvfsd-trash
-usr/lib/gvfs/libgvfsdaemon.so
-usr/lib/gvfs/libgvfscommon.so
-usr/share/dbus-1/services/gvfs-daemon.service
-usr/share/dbus-1/services/gvfs-metadata.service
-usr/share/glib-2.0
-usr/share/GConf
-usr/share/locale
-usr/share/gvfs/mounts/burn.mount
-usr/share/gvfs/mounts/computer.mount
-usr/share/gvfs/mounts/localtest.mount
-usr/share/gvfs/mounts/trash.mount
-# Now installed from debian/rules
-# usr/lib/gvfs/gvfs-{hal,gdu}-volume-monitor
-# usr/share/dbus-1/services/org.gtk.Private.{Hal,Gdu}VolumeMonitor.service
-# usr/share/gvfs/remote-volume-monitors/{hal,gdu}.monitor
-# debian/xdg-mount /usr/bin/
+usr/lib/*/gio/modules/*.so

Added: desktop/experimental/gvfs/debian/gvfs.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs.lintian-overrides?rev=31342&op=file
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs.lintian-overrides (added)
+++ desktop/experimental/gvfs/debian/gvfs.lintian-overrides [utf-8] Sun Nov 13 11:03:45 2011
@@ -1,0 +1,1 @@
+gvfs: binary-or-shlib-defines-rpath usr/lib/*/gio/modules/lib*.so /usr/lib/*/gvfs

Added: desktop/experimental/gvfs/debian/patches/01_modules_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/01_modules_dir.patch?rev=31342&op=file
==============================================================================
--- desktop/experimental/gvfs/debian/patches/01_modules_dir.patch (added)
+++ desktop/experimental/gvfs/debian/patches/01_modules_dir.patch [utf-8] Sun Nov 13 11:03:45 2011
@@ -1,0 +1,13 @@
+Index: gvfs-1.10.1/configure.ac
+===================================================================
+--- gvfs-1.10.1.orig/configure.ac	2011-10-17 14:40:15.018104293 +0200
++++ gvfs-1.10.1/configure.ac	2011-11-13 11:13:26.339677537 +0100
+@@ -56,7 +56,7 @@ AC_ARG_WITH(dbus_service_dir,
+ DBUS_SERVICE_DIR=$with_dbus_service_dir
+ AC_SUBST(DBUS_SERVICE_DIR)
+ 
+-giomodulesdir=$libdir/gio/modules
++giomodulesdir=`$PKG_CONFIG --variable=giomoduledir gio-2.0`
+ AC_SUBST(giomodulesdir)
+ 
+ dnl ****************************

Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=31342&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Sun Nov 13 11:03:45 2011
@@ -1,3 +1,4 @@
+01_modules_dir.patch
 02_deprecated.patch
 03_xdg-mount.patch
 04_hurd_path_max.patch

Modified: desktop/experimental/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/rules?rev=31342&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/rules [utf-8] (original)
+++ desktop/experimental/gvfs/debian/rules [utf-8] Sun Nov 13 11:03:45 2011
@@ -12,7 +12,7 @@
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 DEB_DH_STRIP_ARGS := --dbg-package=gvfs-dbg
-DEB_DH_MAKESHLIBS_ARGS_ALL := -Xlib/gio -Xlib/gvfs
+DEB_DH_MAKESHLIBS_ARGS_ALL := --no-act
 DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 MANPAGES += $(patsubst %.pod,%.1,$(wildcard debian/*.pod))
@@ -23,7 +23,9 @@
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-hal
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-hal \
+	--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+	--libexecdir=/usr/lib/gvfs
 
 install/gvfs-backends::
 	# Those are only available on Linux:
@@ -32,7 +34,7 @@
 		debian/tmp/usr/share/gvfs/mounts/obexftp.mount
 
 install/gvfs::
-	dh_install --autodest -pgvfs --ignore=debian/gvfs.install \
+	dh_install --autodest -pgvfs-daemons --ignore=debian/gvfs-daemons.install \
 		debian/tmp/usr/lib/gvfs/gvfs-gdu-volume-monitor \
 		debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service \
 		debian/tmp/usr/share/gvfs/remote-volume-monitors/gdu.monitor
@@ -42,11 +44,11 @@
 DEB_INSTALL_MANPAGES_gvfs += $(MANPAGES)
 
 install/gvfs::
-	dh_install --autodest -pgvfs --ignore=debian/gvfs.install \
+	dh_install --autodest -pgvfs-daemons --ignore=debian/gvfs-daemons.install \
 		debian/tmp/usr/lib/gvfs/gvfs-hal-volume-monitor \
 		debian/tmp/usr/share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service \
 		debian/tmp/usr/share/gvfs/remote-volume-monitors/hal.monitor
-	dh_install -pgvfs --ignore=debian/gvfs.install \
+	dh_install -pgvfs-daemons --ignore=debian/gvfs-daemons.install \
 		debian/xdg-mount usr/bin
 
 endif

More information about the pkg-gnome-commits mailing list