fuse: update to 2.6.5 and make packaging more granular

diff --git a/packages/fuse/fuse-2.6.3/.mtn2git_empty b/packages/fuse/fuse-2.6.3/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/fuse/fuse-2.6.3/not-run-updaterc.d-on-host.patch b/packages/fuse/fuse-2.6.3/not-run-updaterc.d-on-host.patch
deleted file mode 100644 (file)
index 2496b77..0000000
--- a/packages/fuse/fuse-2.6.3/not-run-updaterc.d-on-host.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- fuse-2.6.3/util/Makefile.am~       2007-02-27 22:50:15.000000000 -0600
-+++ fuse-2.6.3/util/Makefile.am        2007-02-27 22:53:31.000000000 -0600
-@@ -29,10 +29,6 @@
-       $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
-       $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
-       $(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
--      @if test -x /usr/sbin/update-rc.d; then \
--              echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
--              /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
--      fi
- 
- install-data-local:
-       $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
-@@ -42,7 +38,3 @@
-       rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
-       rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
-       rm -f $(DESTDIR)$(INIT_D_PATH)/fuse
--      @if test -x /usr/sbin/update-rc.d; then \
--              echo "/usr/sbin/update-rc.d fuse remove || true"; \
--              /usr/sbin/update-rc.d fuse remove || true; \
--      fi

diff --git a/packages/fuse/fuse-2.6.5/.mtn2git_empty b/packages/fuse/fuse-2.6.5/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/fuse/fuse-2.6.5/not-run-updaterc.d-on-host.patch b/packages/fuse/fuse-2.6.5/not-run-updaterc.d-on-host.patch
new file mode 100644 (file)
index 0000000..2496b77
--- /dev/null
+++ b/packages/fuse/fuse-2.6.5/not-run-updaterc.d-on-host.patch
@@ -0,0 +1,21 @@
+--- fuse-2.6.3/util/Makefile.am~       2007-02-27 22:50:15.000000000 -0600
++++ fuse-2.6.3/util/Makefile.am        2007-02-27 22:53:31.000000000 -0600
+@@ -29,10 +29,6 @@
+       $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+       $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
+       $(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
+-      @if test -x /usr/sbin/update-rc.d; then \
+-              echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
+-              /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
+-      fi
+ 
+ install-data-local:
+       $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
+@@ -42,7 +38,3 @@
+       rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+       rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
+       rm -f $(DESTDIR)$(INIT_D_PATH)/fuse
+-      @if test -x /usr/sbin/update-rc.d; then \
+-              echo "/usr/sbin/update-rc.d fuse remove || true"; \
+-              /usr/sbin/update-rc.d fuse remove || true; \
+-      fi

diff --git a/packages/fuse/fuse_2.6.3.bb b/packages/fuse/fuse_2.6.3.bb
deleted file mode 100644 (file)
index 1cc9cbe..0000000
--- a/packages/fuse/fuse_2.6.3.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require fuse.inc
-
-PR = "r2"
-
-SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
-
-EXTRA_OECONF = " --disable-kernel-module"
-
-#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
-PACKAGES += "fuse-utils"
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += "${libdir}/*.la"
-FILES_fuse-utils = "${bindir} ${base_sbindir}"
-DEBIAN_NOAUTONAME_fuse-utils = "1"
-
-fakeroot do_stage() {
-        autotools_stage_all
-}
-
-

diff --git a/packages/fuse/fuse_2.6.5.bb b/packages/fuse/fuse_2.6.5.bb
new file mode 100644 (file)
index 0000000..a1795e7
--- /dev/null
+++ b/packages/fuse/fuse_2.6.5.bb
@@ -0,0 +1,27 @@
+require fuse.inc
+
+PR = "r0"
+
+SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
+
+EXTRA_OECONF = " --disable-kernel-module"
+
+#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
+PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg"
+FILES_${PN} += "${libdir}/libfuse.so.*"
+FILES_${PN}-dev += "${libdir}/libfuse*.la"
+
+FILES_libulockmgr = "${libdir}/libulockmgr.so.*"
+FILES_libulockmgr-dev += "${libdir}/libulock*.la"
+FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*"
+
+FILES_fuse-utils = "${bindir} ${base_sbindir}"
+FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug"
+DEBIAN_NOAUTONAME_fuse-utils = "1"
+DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
+
+fakeroot do_stage() {
+        autotools_stage_all
+}
+
+