r22358 - in /desktop/experimental/gvfs/debian: changelog control control.in gvfs-backends.install patches/04_hurd_path_max.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Nov 16 17:34:10 UTC 2009
Author: joss
Date: Mon Nov 16 17:34:08 2009
New Revision: 22358
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22358
Log:
* Merge changes in unstable to the experimental (GDU-enabled) branch.
Added:
desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch
- copied unchanged from r22357, desktop/unstable/gvfs/debian/patches/04_hurd_path_max.patch
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/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=22358&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Mon Nov 16 17:34:08 2009
@@ -1,3 +1,42 @@
+gvfs (1.4.1-5+gdu) experimental; urgency=low
+
+ * Merge changes in unstable to the experimental (GDU-enabled) branch.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 16 Nov 2009 18:28:56 +0100
+
+gvfs (1.4.1-5) unstable; urgency=low
+
+ * Brown paper *bag* release.
+ * debian/gvfs-backends.install:
+ - debian/tmp/usr/share/gvfs/remote-volume-monitors/gphoto2.monitor is
+ now installed from debian/rules to avoid installing it on the Hurd,
+ so remove it from the .install file. Should really fix the build on
+ the Hurd.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Fri, 13 Nov 2009 02:20:36 +0100
+
+gvfs (1.4.1-4) unstable; urgency=low
+
+ * Brown paper bug release.
+ * debian/patches/series:
+ - Really apply 04_hurd_path_max.patch. Closes: #555055.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Thu, 12 Nov 2009 08:15:01 +0100
+
+gvfs (1.4.1-3) unstable; urgency=low
+
+ * debian/patches/04_hurd_path_max.patch:
+ - Fix the build in the Hurd.
+ * debian/control.in:
+ - Build-dep on libcdio-paranoia-dev on the Hurd now that it's available
+ there.
+ * debian/gvfs-backends.install,
+ debian/rules:
+ - Don't install the gphoto2 backend on the Hurd.
+ * Thanks to Samuel Thibault for all the above. This closes: #555055.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Tue, 10 Nov 2009 23:08:45 +0100
+
gvfs (1.4.1-2+gdu) experimental; urgency=low
* Re-upload the gdu-enabled branch to experimental.
Modified: desktop/experimental/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control?rev=22358&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control [utf-8] Mon Nov 16 17:34:08 2009
@@ -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>, Josselin Mouette <joss at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>
Build-Depends: debhelper (>= 5),
autotools-dev,
cdbs,
@@ -24,7 +24,7 @@
libhal-dev (>= 0.5.10) | linux-gnu,
libgdu-dev (>= 0.5) | not+linux-gnu,
libgudev-1.0-dev (>= 001) | not+linux-gnu,
- libcdio-paranoia-dev (>= 0.78.2) | hurd,
+ libcdio-paranoia-dev (>= 0.78.2),
libbluetooth-dev (>= 4.0) | not+linux-gnu,
libdbus-glib-1-dev,
libexpat1-dev,
Modified: desktop/experimental/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control.in?rev=22358&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control.in [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control.in [utf-8] Mon Nov 16 17:34:08 2009
@@ -24,7 +24,7 @@
libhal-dev (>= 0.5.10) | linux-gnu,
libgdu-dev (>= 0.5) | not+linux-gnu,
libgudev-1.0-dev (>= 001) | not+linux-gnu,
- libcdio-paranoia-dev (>= 0.78.2) | hurd,
+ libcdio-paranoia-dev (>= 0.78.2),
libbluetooth-dev (>= 4.0) | not+linux-gnu,
libdbus-glib-1-dev,
libexpat1-dev,
Modified: desktop/experimental/gvfs/debian/gvfs-backends.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-backends.install?rev=22358&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] Mon Nov 16 17:34:08 2009
@@ -3,7 +3,8 @@
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
+# Now installed from debian/rules:
+# debian/tmp/usr/lib/gvfs/gvfsd-gphoto2
debian/tmp/usr/lib/gvfs/gvfsd-http
debian/tmp/usr/lib/gvfs/gvfsd-network
# Now installed from debian/rules:
@@ -11,16 +12,19 @@
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
+# Now installed from debian/rules:
+# debian/tmp/usr/lib/gvfs/gvfs-gphoto2-volume-monitor
debian/tmp/usr/lib/libgvfscommon-dnssd.so.*
-debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
+# Now installed from debian/rules:
+# 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/dav+sd.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
+# Now installed from debian/rules:
+# debian/tmp/usr/share/gvfs/mounts/gphoto2.mount
debian/tmp/usr/share/gvfs/mounts/http.mount
debian/tmp/usr/share/gvfs/mounts/network.mount
# Now installed from debian/rules:
@@ -28,4 +32,5 @@
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
+# Now installed from debian/rules:
+# debian/tmp/usr/share/gvfs/remote-volume-monitors/gphoto2.monitor
Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=22358&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Mon Nov 16 17:34:08 2009
@@ -1,6 +1,6 @@
01_maintainer_mode.patch
02_deprecated.patch
03_xdg-mount.patch
-#90_relibtoolize.patch
+04_hurd_path_max.patch
90_relibtoolize.patch
99_ltmain_as-needed.patch
Modified: desktop/experimental/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/rules?rev=22358&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/rules [utf-8] (original)
+++ desktop/experimental/gvfs/debian/rules [utf-8] Mon Nov 16 17:34:08 2009
@@ -55,6 +55,16 @@
endif
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
+install/gvfs-backends::
+ dh_install --autodest -pgvfs-backends --ignore=debian/gvfs-backends.install \
+ debian/tmp/usr/lib/gvfs/gvfsd-gphoto2 \
+ 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/gphoto2.mount \
+ debian/tmp/usr/share/gvfs/remote-volume-monitors/gphoto2.monitor
+endif
+
common-build-arch:: $(MANPAGES)
clean::
More information about the pkg-gnome-commits
mailing list