r40256 - in /attic/gnome-vfs/debian: changelog control control.in extra-modules.conf libgnomevfs2-daemon.install libgnomevfs2-extra.install libgnomevfs2-extra.install.hurd-i386 patches/41_test_srcdir.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Nov 6 21:45:01 UTC 2013
Author: joss
Date: Wed Nov 6 21:45:01 2013
New Revision: 40256
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40256
Log:
+ Remove the daemon and the smb backend, it doesn’t build anymore
and nobody uses it anyway. It avoids adding a new package just for
the daemon.
+ Set Multi-Arch fields: lib and dev are MA: same, -common and -bin
are MA: foreign.
* 41_test_srcdir.patch: new patch. Get autoreconf to work with a more
recent automake.
Added:
attic/gnome-vfs/debian/patches/41_test_srcdir.patch
Removed:
attic/gnome-vfs/debian/libgnomevfs2-daemon.install
attic/gnome-vfs/debian/libgnomevfs2-extra.install.hurd-i386
Modified:
attic/gnome-vfs/debian/changelog
attic/gnome-vfs/debian/control
attic/gnome-vfs/debian/control.in
attic/gnome-vfs/debian/extra-modules.conf
attic/gnome-vfs/debian/libgnomevfs2-extra.install
attic/gnome-vfs/debian/patches/series
attic/gnome-vfs/debian/rules
Modified: attic/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/changelog?rev=40256&op=diff
==============================================================================
--- attic/gnome-vfs/debian/changelog [utf-8] (original)
+++ attic/gnome-vfs/debian/changelog [utf-8] Wed Nov 6 21:45:01 2013
@@ -2,14 +2,17 @@
* Switch to multiarch.
+ Update installation paths.
- + Move the daemon to a new libgnomevfs2-daemon package.
- + Only libgnomevfs2-extra uses it (for the SMB module).
- + Set M-A fields to same, except for -daemon and -common which are
- foreign.
+ + Remove the daemon and the smb backend, it doesn’t build anymore
+ and nobody uses it anyway. It avoids adding a new package just for
+ the daemon.
+ + Set Multi-Arch fields: lib and dev are MA: same, -common and -bin
+ are MA: foreign.
+ Remove gnome:Version stuff.
* Remove FAM support. The library is not ported to MA, and anyway
gnome-vfs is not used by nautilus anymore, which was the application
with a use for that feature.
+ * 41_test_srcdir.patch: new patch. Get autoreconf to work with a more
+ recent automake.
-- Josselin Mouette <joss at debian.org> Wed, 06 Nov 2013 11:36:56 +0100
Modified: attic/gnome-vfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/control?rev=40256&op=diff
==============================================================================
--- attic/gnome-vfs/debian/control [utf-8] (original)
+++ attic/gnome-vfs/debian/control [utf-8] Wed Nov 6 21:45:01 2013
@@ -15,7 +15,6 @@
libgconf2-dev (>= 2.8.0),
libxml2-dev (>= 2.6.0),
libbz2-dev,
- libsmbclient-dev,
gettext,
debhelper (>= 8),
zlib1g-dev,
@@ -75,25 +74,6 @@
.
This package contains the runtime libraries and the default modules.
-Package: libgnomevfs2-daemon
-Architecture: any
-Multi-Arch: foreign
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- dbus (>= 0.90),
- libgnomevfs2-common (= ${source:Version})
-Recommends: libgnomevfs2-extra, dbus-x11
-Replaces: libgnomevfs2-common (<< 1:2.24.4-4~), libgnomevfs2-0 (<< 1:2.24.4-4~)
-Breaks: libgnomevfs2-common (<< 1:2.24.4-4~), libgnomevfs2-0 (<< 1:2.24.4-4~)
-Description: GNOME Virtual File System (runtime libraries)
- GNOME VFS is the GNOME virtual file system. It is the foundation of the
- Nautilus file manager. It provides a modular architecture and ships with
- several modules that implement support for local files, http, ftp and others.
- It provides an URI-based API, a backend supporting asynchronous file
- operations, a MIME type manipulation library and other features.
- .
- This package contains the daemon which is used for some modules.
-
Package: libgnomevfs2-bin
Architecture: any
Multi-Arch: foreign
@@ -115,7 +95,6 @@
Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends},
- libgnomevfs2-daemon (= ${binary:Version}),
libgnomevfs2-common (= ${source:Version})
Conflicts: libgnomevfs2-common (<< 2.12.2-7),
libgnomevfs2-0 (<< 1:2.16.0-1)
@@ -130,8 +109,7 @@
File System. It includes:
* the bzip2 module;
* the ftp module;
- * the http module (which also includes support for WebDAV);
- * the smb module, to browse Windows shares.
+ * the http module (which also includes support for WebDAV).
Package: libgnomevfs2-0-dbg
Architecture: any
Modified: attic/gnome-vfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/control.in?rev=40256&op=diff
==============================================================================
--- attic/gnome-vfs/debian/control.in [utf-8] (original)
+++ attic/gnome-vfs/debian/control.in [utf-8] Wed Nov 6 21:45:01 2013
@@ -10,7 +10,6 @@
libgconf2-dev (>= 2.8.0),
libxml2-dev (>= 2.6.0),
libbz2-dev,
- libsmbclient-dev,
gettext,
debhelper (>= 8),
zlib1g-dev,
@@ -70,25 +69,6 @@
.
This package contains the runtime libraries and the default modules.
-Package: libgnomevfs2-daemon
-Architecture: any
-Multi-Arch: foreign
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- dbus (>= 0.90),
- libgnomevfs2-common (= ${source:Version})
-Recommends: libgnomevfs2-extra, dbus-x11
-Replaces: libgnomevfs2-common (<< 1:2.24.4-4~), libgnomevfs2-0 (<< 1:2.24.4-4~)
-Breaks: libgnomevfs2-common (<< 1:2.24.4-4~), libgnomevfs2-0 (<< 1:2.24.4-4~)
-Description: GNOME Virtual File System (runtime libraries)
- GNOME VFS is the GNOME virtual file system. It is the foundation of the
- Nautilus file manager. It provides a modular architecture and ships with
- several modules that implement support for local files, http, ftp and others.
- It provides an URI-based API, a backend supporting asynchronous file
- operations, a MIME type manipulation library and other features.
- .
- This package contains the daemon which is used for some modules.
-
Package: libgnomevfs2-bin
Architecture: any
Multi-Arch: foreign
@@ -110,7 +90,6 @@
Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends},
- libgnomevfs2-daemon (= ${binary:Version}),
libgnomevfs2-common (= ${source:Version})
Conflicts: libgnomevfs2-common (<< 2.12.2-7),
libgnomevfs2-0 (<< 1:2.16.0-1)
@@ -125,8 +104,7 @@
File System. It includes:
* the bzip2 module;
* the ftp module;
- * the http module (which also includes support for WebDAV);
- * the smb module, to browse Windows shares.
+ * the http module (which also includes support for WebDAV).
Package: libgnomevfs2-0-dbg
Architecture: any
Modified: attic/gnome-vfs/debian/extra-modules.conf
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/extra-modules.conf?rev=40256&op=diff
==============================================================================
--- attic/gnome-vfs/debian/extra-modules.conf [utf-8] (original)
+++ attic/gnome-vfs/debian/extra-modules.conf [utf-8] Wed Nov 6 21:45:01 2013
@@ -5,8 +5,6 @@
#
# <method 1> <method 2> ... <method N> : <module>
#
-
-smb: [daemon] libsmb
bzip2: bzip2
Modified: attic/gnome-vfs/debian/libgnomevfs2-extra.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/libgnomevfs2-extra.install?rev=40256&op=diff
==============================================================================
--- attic/gnome-vfs/debian/libgnomevfs2-extra.install [utf-8] (original)
+++ attic/gnome-vfs/debian/libgnomevfs2-extra.install [utf-8] Wed Nov 6 21:45:01 2013
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/*/gnome-vfs-2.0/modules/lib{bzip2,smb,http,ftp}.so
+debian/tmp/usr/lib/*/gnome-vfs-2.0/modules/lib{bzip2,http,ftp}.so
debian/extra-modules.conf /etc/gnome-vfs-2.0/modules/
Added: attic/gnome-vfs/debian/patches/41_test_srcdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/patches/41_test_srcdir.patch?rev=40256&op=file
==============================================================================
--- attic/gnome-vfs/debian/patches/41_test_srcdir.patch (added)
+++ attic/gnome-vfs/debian/patches/41_test_srcdir.patch [utf-8] Wed Nov 6 21:45:01 2013
@@ -0,0 +1,13 @@
+Index: gnome-vfs-2.24.4/test/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/test/Makefile.am 2013-11-06 22:10:40.529461121 +0100
++++ gnome-vfs-2.24.4/test/Makefile.am 2013-11-06 22:11:19.743917313 +0100
+@@ -64,7 +64,7 @@ TESTS = test-acl \
+ test-async-cancel \
+ test-escape \
+ test-uri \
+- $(srcdir)/auto-test
++ auto-test
+
+ libraries = \
+ $(top_builddir)/libgnomevfs/libgnomevfs-2.la \
Modified: attic/gnome-vfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/patches/series?rev=40256&op=diff
==============================================================================
--- attic/gnome-vfs/debian/patches/series [utf-8] (original)
+++ attic/gnome-vfs/debian/patches/series [utf-8] Wed Nov 6 21:45:01 2013
@@ -22,3 +22,4 @@
30_nfs4.patch
31_link_tests_and_programs_against_required_libs.patch
40_disable_deprecated.patch
+41_test_srcdir.patch
Modified: attic/gnome-vfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/rules?rev=40256&op=diff
==============================================================================
--- attic/gnome-vfs/debian/rules [utf-8] (original)
+++ attic/gnome-vfs/debian/rules [utf-8] Wed Nov 6 21:45:01 2013
@@ -24,6 +24,7 @@
--disable-openssl \
--disable-hal \
--disable-fam \
+ --disable-samba \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--libexecdir=\$${libdir}/gnome-vfs-2.0 \
$(HOST_ARCH_CONFIGURE_FLAGS)
More information about the pkg-gnome-commits
mailing list