[maemo-commits] [maemo-commits] r17890 - in projects/haf/trunk/gvfs-1.0.3: . daemon debian
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Mar 30 19:42:24 EEST 2009
- Previous message: [maemo-commits] r17889 - projects/haf/trunk
- Next message: [maemo-commits] r17891 - projects/haf/trunk/gvfs-1.0.3/debian/patches
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: marivoll
Date: 2009-03-30 19:42:15 +0300 (Mon, 30 Mar 2009)
New Revision: 17890
Modified:
projects/haf/trunk/gvfs-1.0.3/configure.ac
projects/haf/trunk/gvfs-1.0.3/daemon/Makefile.am
projects/haf/trunk/gvfs-1.0.3/debian/control
projects/haf/trunk/gvfs-1.0.3/debian/control.in
projects/haf/trunk/gvfs-1.0.3/debian/gvfs-backends.install
projects/haf/trunk/gvfs-1.0.3/debian/gvfs-backends.postinst
projects/haf/trunk/gvfs-1.0.3/debian/gvfs.install
projects/haf/trunk/gvfs-1.0.3/debian/rules
Log:
Reverted to original state. Patches will move into quilt.
Modified: projects/haf/trunk/gvfs-1.0.3/configure.ac
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/configure.ac 2009-03-30 15:38:37 UTC (rev 17889)
+++ projects/haf/trunk/gvfs-1.0.3/configure.ac 2009-03-30 16:42:15 UTC (rev 17890)
@@ -1,7 +1,6 @@
AC_INIT(client/gdaemonvfs.h)
AM_INIT_AUTOMAKE(gvfs, 1.0.3)
-AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
AM_SANITY_CHECK
@@ -97,13 +96,8 @@
dnl *** Checks for ssh stuff ***
dnl ****************************
-dnl AC_PATH_PROG(SSH_PROGRAM, ssh, "ssh")
+AC_PATH_PROG(SSH_PROGRAM, ssh, "ssh")
-dnl Don't try to find ssh, that might pin it to a path that is wrong
-dnl at run-time. (Such as when building in Scratchbox.)
-
-SSH_PROGRAM="ssh"
-
dnl ****************************
dnl *** Checks for pty stuff ***
dnl ****************************
@@ -131,7 +125,7 @@
HTTP_LIBS=
if test "x$enable_http" != "xno"; then
- PKG_CHECK_EXISTS(libsoup-2.4, msg_http=yes)
+ PKG_CHECK_EXISTS(libsoup-2.4 >= 2.23.91, msg_http=yes)
if test "x$msg_http" == "xyes"; then
PKG_CHECK_MODULES(HTTP, libsoup-2.4 libxml-2.0)
Modified: projects/haf/trunk/gvfs-1.0.3/daemon/Makefile.am
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/daemon/Makefile.am 2009-03-30 15:38:37 UTC (rev 17889)
+++ projects/haf/trunk/gvfs-1.0.3/daemon/Makefile.am 2009-03-30 16:42:15 UTC (rev 17890)
@@ -16,10 +16,10 @@
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
-DG_DISABLE_DEPRECATED
-lib_LTLIBRARIES=libgvfsdaemon.la
+noinst_LTLIBRARIES=libdaemon.la
libraries = \
- libgvfsdaemon.la \
+ libdaemon.la \
$(top_builddir)/common/libgvfscommon.la \
$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
@@ -104,7 +104,7 @@
gvfsd-test \
$(NULL)
-libgvfsdaemon_la_SOURCES = \
+libdaemon_la_SOURCES = \
gvfsdaemon.c gvfsdaemon.h \
gvfsbackend.c gvfsbackend.h \
gvfschannel.c gvfschannel.h \
@@ -146,10 +146,6 @@
gvfskeyring.h gvfskeyring.c \
$(NULL)
-libgvfsdaemon_la_LIBADD = \
- $(top_builddir)/common/libgvfscommon.la \
- $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
-
gvfsd_SOURCES = \
mount.c mount.h \
main.c
Modified: projects/haf/trunk/gvfs-1.0.3/debian/control
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/control 2009-03-30 15:38:37 UTC (rev 17889)
+++ projects/haf/trunk/gvfs-1.0.3/debian/control 2009-03-30 16:42:15 UTC (rev 17890)
@@ -1,7 +1,7 @@
Source: gvfs
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
autotools-dev,
cdbs,
@@ -11,13 +11,21 @@
libglib2.0-dev (>= 2.17.6),
libdbus-1-dev,
libdbus-glib-1-dev,
+ libfuse-dev,
libexpat1-dev,
+ libsmbclient-dev (>= 3.0),
+ libcdio-paranoia-dev (>= 0.78.2),
libhal-dev (>= 0.5.10),
libsoup2.4-dev (>= 2.23.91),
libgconf2-dev,
+ libavahi-client-dev (>= 0.6),
+ libavahi-glib-dev (>= 0.6),
+ libgphoto2-2-dev (>= 2.4.0),
+ libgnome-keyring-dev,
libxml2-dev,
- libbluetooth3-dev,
+ libbluetooth-dev (>= 3.12),
libltdl3-dev,
+ libarchive-dev,
openssh-client
Standards-Version: 3.8.0
Section: libs
@@ -71,6 +79,21 @@
This package contains the gvfs server that provides gvfs mounts to all
gio applications, and the minimal set of backends.
+Package: gvfs-fuse
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ gvfs (= ${binary:Version})
+Description: userspace virtual filesystem - fuse server
+ gvfs is a userspace virtual filesystem where mount runs as a 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-fuse server that exports gvfs mounts to
+ all applications using FUSE.
+
Package: gvfs-backends
Architecture: any
Depends: ${shlibs:Depends},
Modified: projects/haf/trunk/gvfs-1.0.3/debian/control.in
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/control.in 2009-03-30 15:38:37 UTC (rev 17889)
+++ projects/haf/trunk/gvfs-1.0.3/debian/control.in 2009-03-30 16:42:15 UTC (rev 17890)
@@ -11,13 +11,21 @@
libglib2.0-dev (>= 2.17.6),
libdbus-1-dev,
libdbus-glib-1-dev,
+ libfuse-dev,
libexpat1-dev,
+ libsmbclient-dev (>= 3.0),
+ libcdio-paranoia-dev (>= 0.78.2),
libhal-dev (>= 0.5.10),
libsoup2.4-dev (>= 2.23.91),
libgconf2-dev,
+ libavahi-client-dev (>= 0.6),
+ libavahi-glib-dev (>= 0.6),
+ libgphoto2-2-dev (>= 2.4.0),
+ libgnome-keyring-dev,
libxml2-dev,
- libbluetooth3-dev,
+ libbluetooth-dev (>= 3.12),
libltdl3-dev,
+ libarchive-dev,
openssh-client
Standards-Version: 3.8.0
Section: libs
@@ -71,6 +79,21 @@
This package contains the gvfs server that provides gvfs mounts to all
gio applications, and the minimal set of backends.
+Package: gvfs-fuse
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ gvfs (= ${binary:Version})
+Description: userspace virtual filesystem - fuse server
+ gvfs is a userspace virtual filesystem where mount runs as a 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-fuse server that exports gvfs mounts to
+ all applications using FUSE.
+
Package: gvfs-backends
Architecture: any
Depends: ${shlibs:Depends},
Modified: projects/haf/trunk/gvfs-1.0.3/debian/gvfs-backends.install
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/gvfs-backends.install 2009-03-30 15:38:37 UTC (rev 17889)
+++ projects/haf/trunk/gvfs-1.0.3/debian/gvfs-backends.install 2009-03-30 16:42:15 UTC (rev 17890)
@@ -1,12 +1,27 @@
+debian/tmp/usr/lib/gvfs/gvfsd-archive
+debian/tmp/usr/lib/gvfs/gvfsd-cdda
debian/tmp/usr/lib/gvfs/gvfsd-dav
+debian/tmp/usr/lib/gvfs/gvfsd-dnssd
debian/tmp/usr/lib/gvfs/gvfsd-ftp
+debian/tmp/usr/lib/gvfs/gvfsd-gphoto2
debian/tmp/usr/lib/gvfs/gvfsd-http
debian/tmp/usr/lib/gvfs/gvfsd-network
debian/tmp/usr/lib/gvfs/gvfsd-obexftp
debian/tmp/usr/lib/gvfs/gvfsd-sftp
+debian/tmp/usr/lib/gvfs/gvfsd-smb
+debian/tmp/usr/lib/gvfs/gvfsd-smb-browse
+debian/tmp/usr/lib/gvfs/gvfs-gphoto2-volume-monitor
+debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
+debian/tmp/usr/share/gvfs/mounts/archive.mount
+debian/tmp/usr/share/gvfs/mounts/cdda.mount
debian/tmp/usr/share/gvfs/mounts/dav.mount
+debian/tmp/usr/share/gvfs/mounts/dns-sd.mount
debian/tmp/usr/share/gvfs/mounts/ftp.mount
+debian/tmp/usr/share/gvfs/mounts/gphoto2.mount
debian/tmp/usr/share/gvfs/mounts/http.mount
debian/tmp/usr/share/gvfs/mounts/network.mount
debian/tmp/usr/share/gvfs/mounts/obexftp.mount
debian/tmp/usr/share/gvfs/mounts/sftp.mount
+debian/tmp/usr/share/gvfs/mounts/smb-browse.mount
+debian/tmp/usr/share/gvfs/mounts/smb.mount
+debian/tmp/usr/share/gvfs/remote-volume-monitors/gphoto2.monitor
Modified: projects/haf/trunk/gvfs-1.0.3/debian/gvfs-backends.postinst
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/gvfs-backends.postinst 2009-03-30 15:38:37 UTC (rev 17889)
+++ projects/haf/trunk/gvfs-1.0.3/debian/gvfs-backends.postinst 2009-03-30 16:42:15 UTC (rev 17890)
@@ -4,22 +4,8 @@
#DEBHELPER#
if [ "$1" = "configure" ]; then
- # Let gvfsd reload it's backend list.
-
- # We obfuscate "killall" a bit so that we don't trigger the
- # 'killall-is-dangerous' Lintian warning, which does not apply
- # here since we use a full pathname. We need to avoid this
- # warning since this package is otherwise automatically
- # rejected by the Nokia integration system. And I don't feel
- # like asking for an exception.
- #
- # Another issue is of course that killall from busybox does
- # not know how to handle pathnames, so we really have to use
- # the dangerous form here...
-
- k'i'llall -q /usr/lib/gvfs/gvfsd -HUP || \
- k'i'llall -q gvfsd -HUP || \
- true
+ # Let gvfsd reload it's backend list
+ killall -q /usr/lib/gvfs/gvfsd -HUP || true
fi
exit 0
Modified: projects/haf/trunk/gvfs-1.0.3/debian/gvfs.install
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/gvfs.install 2009-03-30 15:38:37 UTC (rev 17889)
+++ projects/haf/trunk/gvfs-1.0.3/debian/gvfs.install 2009-03-30 16:42:15 UTC (rev 17890)
@@ -7,6 +7,7 @@
debian/tmp/usr/lib/gvfs/gvfs-hal-volume-monitor
debian/tmp/usr/share/dbus-1/services/gvfs-daemon.service
debian/tmp/usr/share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
+debian/tmp/usr/share/locale
debian/tmp/usr/share/gvfs/mounts/burn.mount
debian/tmp/usr/share/gvfs/mounts/computer.mount
debian/tmp/usr/share/gvfs/mounts/localtest.mount
Modified: projects/haf/trunk/gvfs-1.0.3/debian/rules
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/rules 2009-03-30 15:38:37 UTC (rev 17889)
+++ projects/haf/trunk/gvfs-1.0.3/debian/rules 2009-03-30 16:42:15 UTC (rev 17890)
@@ -13,4 +13,3 @@
DEB_DH_MAKESHLIBS_ARGS_libgvfscommon0 := -V "libgvfscommon0 (>= 0.99.6)"
DEB_DH_MAKESHLIBS_ARGS_gvfs := --no-act
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-smbclient
- Previous message: [maemo-commits] r17889 - projects/haf/trunk
- Next message: [maemo-commits] r17891 - projects/haf/trunk/gvfs-1.0.3/debian/patches
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]