r19955 - in /desktop/unstable/gvfs/debian: changelog control control.in patches/10_kfreebsd.patch patches/90_relibtoolize.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed May 13 21:48:14 UTC 2009 

Author: joss
Date: Wed May 13 21:48:14 2009
New Revision: 19955

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19955
Log:
* Add back fuse and cdio support for kfreebsd.
* 10_kfreebsd.patch: patch from Aurélien Jarno to add gphoto2 support 
  on kfreebsd. Closes: #528539.
  + Update 90_relibtoolize.patch accordingly.

Added:
    desktop/unstable/gvfs/debian/patches/10_kfreebsd.patch
Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/control
    desktop/unstable/gvfs/debian/control.in
    desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch
    desktop/unstable/gvfs/debian/patches/series
    desktop/unstable/gvfs/debian/rules

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=19955&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog (original)
+++ desktop/unstable/gvfs/debian/changelog Wed May 13 21:48:14 2009
@@ -1,3 +1,12 @@
+gvfs (1.2.2-3) UNRELEASED; urgency=low
+
+  * Add back fuse and cdio support for kfreebsd.
+  * 10_kfreebsd.patch: patch from Aurélien Jarno to add gphoto2 support 
+    on kfreebsd. Closes: #528539.
+    + Update 90_relibtoolize.patch accordingly.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 13 May 2009 23:40:55 +0200
+
 gvfs (1.2.2-2) unstable; urgency=low
 
   [ Deng Xiyue ]

Modified: desktop/unstable/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control?rev=19955&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control (original)
+++ desktop/unstable/gvfs/debian/control Wed May 13 21:48:14 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>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>
 Build-Depends: debhelper (>= 5),
                autotools-dev,
                cdbs,
@@ -52,7 +52,7 @@
  gio applications, and the minimal set of backends.
 
 Package: gvfs-fuse
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
+Architecture: kfreebsd-alpha alpha kfreebsd-amd64 amd64 kfreebsd-arm arm kfreebsd-armeb armeb armel kfreebsd-hppa hppa kfreebsd-i386 i386 kfreebsd-ia64 ia64 lpia kfreebsd-m32r m32r kfreebsd-m68k m68k kfreebsd-mips mips kfreebsd-mipsel mipsel kfreebsd-powerpc powerpc kfreebsd-ppc64 ppc64 kfreebsd-s390 s390 kfreebsd-s390x s390x kfreebsd-sh3 sh3 kfreebsd-sh3eb sh3eb kfreebsd-sh4 sh4 kfreebsd-sh4eb sh4eb kfreebsd-sparc sparc
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gvfs (= ${binary:Version})

Modified: desktop/unstable/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control.in?rev=19955&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control.in (original)
+++ desktop/unstable/gvfs/debian/control.in Wed May 13 21:48:14 2009
@@ -18,10 +18,10 @@
                libxml2-dev,
                libavahi-glib-dev (>= 0.6),
                libavahi-client-dev (>= 0.6),
-               libfuse-dev | not+linux-gnu,
+               libfuse-dev | hurd,
                libgconf2-dev,
                libhal-dev (>= 0.5.10),
-               libcdio-paranoia-dev (>= 0.78.2) | not+linux-gnu,
+               libcdio-paranoia-dev (>= 0.78.2) | hurd,
 #               libbluetooth-dev (>= 4.0) | not+linux-gnu,
 #               libdbus-glib-1-dev,
 #               libexpat1-dev,
@@ -52,7 +52,7 @@
  gio applications, and the minimal set of backends.
 
 Package: gvfs-fuse
-Architecture: @LINUX@
+Architecture: @FUSE_ARCHES@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gvfs (= ${binary:Version})

Added: desktop/unstable/gvfs/debian/patches/10_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/10_kfreebsd.patch?rev=19955&op=file
==============================================================================
--- desktop/unstable/gvfs/debian/patches/10_kfreebsd.patch (added)
+++ desktop/unstable/gvfs/debian/patches/10_kfreebsd.patch Wed May 13 21:48:14 2009
@@ -1,0 +1,27 @@
+--- a/monitor/gphoto2/ggphoto2volumemonitor.c
++++ b/monitor/gphoto2/ggphoto2volumemonitor.c
+@@ -560,7 +560,13 @@
+         continue;
+ 
+       usb_bus_num = hal_device_get_property_int (d, "usb.bus_number");
++#if defined(__linux__)
+       usb_device_num = hal_device_get_property_int (d, "usb.linux.device_number");
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++      usb_device_num = hal_device_get_property_int (d, "freebsd.unit");
++#else
++# error "Need OS specific tweaks"
++#endif
+ 
+       store_heads = get_stores_for_camera (usb_bus_num, usb_device_num);
+       num_store_heads = g_list_length (store_heads);
+--- a/configure.ac     2009-04-03 09:30:54 +0200
++++ b/configure.ac     2009-05-13 11:16:24 +0200
+@@ -299,7 +299,7 @@
+ 
+   # Need OS tweaks in hal volume monitor backend
+   case "$host" in
+-    *-linux*)
++    *-linux* | *-freebsd* | *-kfreebsd*-gnu)
+       use_gphoto2=yes
+       ;;
+     *)

Modified: desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch?rev=19955&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch (original)
+++ desktop/unstable/gvfs/debian/patches/90_relibtoolize.patch Wed May 13 21:48:14 2009
@@ -46274,7 +46274,7 @@
 -  if test "x$msg_hal" = "xyes"; then
 +  # Need OS tweaks in hal volume monitor backend
 +  case "$host" in
-+    *-linux*)
++    *-linux* | *-freebsd* | *-kfreebsd*-gnu)
 +      use_gphoto2=yes
 +      ;;
 +    *)

Modified: desktop/unstable/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/series?rev=19955&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/series (original)
+++ desktop/unstable/gvfs/debian/patches/series Wed May 13 21:48:14 2009
@@ -1,4 +1,5 @@
 01_maintainer_mode.patch
 02_deprecated.patch
+10_kfreebsd.patch
 90_relibtoolize.patch
 99_ltmain_as-needed.patch

Modified: desktop/unstable/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/rules?rev=19955&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/rules (original)
+++ desktop/unstable/gvfs/debian/rules Wed May 13 21:48:14 2009
@@ -14,7 +14,7 @@
 DEB_DH_STRIP_ARGS := --dbg-package=gvfs-dbg
 DEB_DH_MAKESHLIBS_ARGS_ALL := -Xlib/gio -Xlib/gvfs
 
-LINUX_ARCHES := $(shell type-handling any linux)
+FUSE_ARCHES := $(shell type-handling any linux,kfreebsd)
 
 clean::
-	sed -i 's/@LINUX@/$(LINUX_ARCHES)/' debian/control
+	sed -i 's/@FUSE_ARCHES@/$(FUSE_ARCHES)/' debian/control

More information about the pkg-gnome-commits mailing list