r40240 - in /attic/gnome-vfs/debian: changelog control control.in libgnomevfs2-0.install libgnomevfs2-common.install libgnomevfs2-daemon.install libgnomevfs2-dev.install libgnomevfs2-extra.install libgnomevfs2-extra.install.hurd-i386 rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Nov 6 12:55:25 UTC 2013
Author: joss
Date: Wed Nov 6 12:55:24 2013
New Revision: 40240
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40240
Log:
* 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 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.
Added:
attic/gnome-vfs/debian/libgnomevfs2-daemon.install
Modified:
attic/gnome-vfs/debian/changelog
attic/gnome-vfs/debian/control
attic/gnome-vfs/debian/control.in
attic/gnome-vfs/debian/libgnomevfs2-0.install
attic/gnome-vfs/debian/libgnomevfs2-common.install
attic/gnome-vfs/debian/libgnomevfs2-dev.install
attic/gnome-vfs/debian/libgnomevfs2-extra.install
attic/gnome-vfs/debian/libgnomevfs2-extra.install.hurd-i386
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=40240&op=diff
==============================================================================
--- attic/gnome-vfs/debian/changelog [utf-8] (original)
+++ attic/gnome-vfs/debian/changelog [utf-8] Wed Nov 6 12:55:24 2013
@@ -1,3 +1,18 @@
+gnome-vfs (1:2.24.4-4) unstable; urgency=low
+
+ * 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 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.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 06 Nov 2013 11:36:56 +0100
+
gnome-vfs (1:2.24.4-3) unstable; urgency=low
* debian/patches/40_disable_deprecated.patch:
Modified: attic/gnome-vfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/control?rev=40240&op=diff
==============================================================================
--- attic/gnome-vfs/debian/control [utf-8] (original)
+++ attic/gnome-vfs/debian/control [utf-8] Wed Nov 6 12:55:24 2013
@@ -15,7 +15,6 @@
libgconf2-dev (>= 2.8.0),
libxml2-dev (>= 2.6.0),
libbz2-dev,
- libfam-dev (>= 2.6.9-4) [!hurd-i386],
libsmbclient-dev,
gettext,
debhelper (>= 8),
@@ -40,6 +39,7 @@
Package: libgnomevfs2-common
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends},
gnome-mime-data,
shared-mime-info
@@ -57,13 +57,13 @@
Package: libgnomevfs2-0
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
- dbus (>= 0.90),
- libgnomevfs2-common (>= ${gnome:Version}),
- libgnomevfs2-common (<< ${gnome:NextVersion})
-Recommends: libgnomevfs2-extra, dbus-x11
-Suggests: libgnomevfs2-bin, fam
+ libgnomevfs2-common (= ${source:Version})
+Recommends: libgnomevfs2-extra
+Suggests: libgnomevfs2-bin
Replaces: libgnomevfs2-common (<< 2.12.2-4)
Conflicts: libbonobo2-0 (<< 2.15.0)
Description: GNOME Virtual File System (runtime libraries)
@@ -73,11 +73,30 @@
It provides an URI-based API, a backend supporting asynchronous file
operations, a MIME type manipulation library and other features.
.
- This package contains the runtime libraries, the daemon, and the
- default modules.
+ 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
Depends: ${shlibs:Depends},
${misc:Depends}
Replaces: libgnomevfs2-common (<< 2.12.2-4)
@@ -93,10 +112,11 @@
Package: libgnomevfs2-extra
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends},
- libgnomevfs2-common (>= ${gnome:Version}),
- libgnomevfs2-common (<< ${gnome:NextVersion})
+ libgnomevfs2-daemon (= ${binary:Version}),
+ libgnomevfs2-common (= ${source:Version})
Conflicts: libgnomevfs2-common (<< 2.12.2-7),
libgnomevfs2-0 (<< 1:2.16.0-1)
Description: GNOME Virtual File System (extra modules)
@@ -133,6 +153,7 @@
Package: libgnomevfs2-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libgnomevfs2-0 (= ${binary:Version}),
${misc:Depends},
Modified: attic/gnome-vfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/control.in?rev=40240&op=diff
==============================================================================
--- attic/gnome-vfs/debian/control.in [utf-8] (original)
+++ attic/gnome-vfs/debian/control.in [utf-8] Wed Nov 6 12:55:24 2013
@@ -10,7 +10,6 @@
libgconf2-dev (>= 2.8.0),
libxml2-dev (>= 2.6.0),
libbz2-dev,
- libfam-dev (>= 2.6.9-4) [!hurd-i386],
libsmbclient-dev,
gettext,
debhelper (>= 8),
@@ -35,6 +34,7 @@
Package: libgnomevfs2-common
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends},
gnome-mime-data,
shared-mime-info
@@ -52,13 +52,13 @@
Package: libgnomevfs2-0
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
- dbus (>= 0.90),
- libgnomevfs2-common (>= ${gnome:Version}),
- libgnomevfs2-common (<< ${gnome:NextVersion})
-Recommends: libgnomevfs2-extra, dbus-x11
-Suggests: libgnomevfs2-bin, fam
+ libgnomevfs2-common (= ${source:Version})
+Recommends: libgnomevfs2-extra
+Suggests: libgnomevfs2-bin
Replaces: libgnomevfs2-common (<< 2.12.2-4)
Conflicts: libbonobo2-0 (<< 2.15.0)
Description: GNOME Virtual File System (runtime libraries)
@@ -68,11 +68,30 @@
It provides an URI-based API, a backend supporting asynchronous file
operations, a MIME type manipulation library and other features.
.
- This package contains the runtime libraries, the daemon, and the
- default modules.
+ 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
Depends: ${shlibs:Depends},
${misc:Depends}
Replaces: libgnomevfs2-common (<< 2.12.2-4)
@@ -88,10 +107,11 @@
Package: libgnomevfs2-extra
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends},
- libgnomevfs2-common (>= ${gnome:Version}),
- libgnomevfs2-common (<< ${gnome:NextVersion})
+ libgnomevfs2-daemon (= ${binary:Version}),
+ libgnomevfs2-common (= ${source:Version})
Conflicts: libgnomevfs2-common (<< 2.12.2-7),
libgnomevfs2-0 (<< 1:2.16.0-1)
Description: GNOME Virtual File System (extra modules)
@@ -128,6 +148,7 @@
Package: libgnomevfs2-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libgnomevfs2-0 (= ${binary:Version}),
${misc:Depends},
Modified: attic/gnome-vfs/debian/libgnomevfs2-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/libgnomevfs2-0.install?rev=40240&op=diff
==============================================================================
--- attic/gnome-vfs/debian/libgnomevfs2-0.install [utf-8] (original)
+++ attic/gnome-vfs/debian/libgnomevfs2-0.install [utf-8] Wed Nov 6 12:55:24 2013
@@ -1,3 +1,2 @@
-debian/tmp/usr/lib/libgnomevfs-2.so.*
-debian/tmp/usr/lib/gnome-vfs-2.0/gnome-vfs-daemon
-debian/tmp/usr/lib/gnome-vfs-2.0/modules/lib{network,file,tar,computer,gzip,vfs-test,sftp,dns-sd}.so
+debian/tmp/usr/lib/*/libgnomevfs-2.so.*
+debian/tmp/usr/lib/*/gnome-vfs-2.0/modules/lib{network,file,tar,computer,gzip,vfs-test,sftp,dns-sd}.so
Modified: attic/gnome-vfs/debian/libgnomevfs2-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/libgnomevfs2-common.install?rev=40240&op=diff
==============================================================================
--- attic/gnome-vfs/debian/libgnomevfs2-common.install [utf-8] (original)
+++ attic/gnome-vfs/debian/libgnomevfs2-common.install [utf-8] Wed Nov 6 12:55:24 2013
@@ -1,5 +1,4 @@
debian/tmp/etc/gconf
debian/tmp/etc/gnome-vfs-2.0/modules/default-modules.conf
-debian/tmp/usr/share/dbus-1
debian/tmp/usr/share/locale
debian/tmp/usr/share/gtk-doc/html/gnome-vfs-2.0/* usr/share/doc/libgnomevfs2-common/html/
Added: attic/gnome-vfs/debian/libgnomevfs2-daemon.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/libgnomevfs2-daemon.install?rev=40240&op=file
==============================================================================
--- attic/gnome-vfs/debian/libgnomevfs2-daemon.install (added)
+++ attic/gnome-vfs/debian/libgnomevfs2-daemon.install [utf-8] Wed Nov 6 12:55:24 2013
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/*/gnome-vfs-2.0/gnome-vfs-daemon
+debian/tmp/usr/share/dbus-1
Modified: attic/gnome-vfs/debian/libgnomevfs2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/libgnomevfs2-dev.install?rev=40240&op=diff
==============================================================================
--- attic/gnome-vfs/debian/libgnomevfs2-dev.install [utf-8] (original)
+++ attic/gnome-vfs/debian/libgnomevfs2-dev.install [utf-8] Wed Nov 6 12:55:24 2013
@@ -1,6 +1,6 @@
debian/tmp/usr/include
-debian/tmp/usr/lib/libgnomevfs-2.so
-debian/tmp/usr/lib/libgnomevfs-2.la
-debian/tmp/usr/lib/libgnomevfs-2.a
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/gnome-vfs-2.0/include
+debian/tmp/usr/lib/*/libgnomevfs-2.so
+debian/tmp/usr/lib/*/libgnomevfs-2.la
+debian/tmp/usr/lib/*/libgnomevfs-2.a
+debian/tmp/usr/lib/*/pkgconfig
+debian/tmp/usr/lib/*/gnome-vfs-2.0/include
Modified: attic/gnome-vfs/debian/libgnomevfs2-extra.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/libgnomevfs2-extra.install?rev=40240&op=diff
==============================================================================
--- attic/gnome-vfs/debian/libgnomevfs2-extra.install [utf-8] (original)
+++ attic/gnome-vfs/debian/libgnomevfs2-extra.install [utf-8] Wed Nov 6 12:55:24 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,smb,http,ftp}.so
debian/extra-modules.conf /etc/gnome-vfs-2.0/modules/
Modified: attic/gnome-vfs/debian/libgnomevfs2-extra.install.hurd-i386
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/libgnomevfs2-extra.install.hurd-i386?rev=40240&op=diff
==============================================================================
--- attic/gnome-vfs/debian/libgnomevfs2-extra.install.hurd-i386 [utf-8] (original)
+++ attic/gnome-vfs/debian/libgnomevfs2-extra.install.hurd-i386 [utf-8] Wed Nov 6 12:55:24 2013
@@ -1 +1 @@
-debian/tmp/usr/lib/gnome-vfs-2.0/modules/lib{bzip2,http,ftp}.so
+debian/tmp/usr/lib/*/gnome-vfs-2.0/modules/lib{bzip2,http,ftp}.so
Modified: attic/gnome-vfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-vfs/debian/rules?rev=40240&op=diff
==============================================================================
--- attic/gnome-vfs/debian/rules [utf-8] (original)
+++ attic/gnome-vfs/debian/rules [utf-8] Wed Nov 6 12:55:24 2013
@@ -4,7 +4,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
@@ -24,7 +23,9 @@
--enable-avahi \
--disable-openssl \
--disable-hal \
- --libexecdir=/usr/lib/gnome-vfs-2.0 \
+ --disable-fam \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --libexecdir=\$${libdir}/gnome-vfs-2.0 \
$(HOST_ARCH_CONFIGURE_FLAGS)
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
More information about the pkg-gnome-commits
mailing list