patches, control: Added bts532763-neon27 and b-d on libneon27-gnutls-dev.

diff --git a/debian/changelog b/debian/changelog
index 041c881354790fb57b7dbd08706db8beefc10af6..967e8a7160d7c67e7aa0b0f3a78420f638ea1047 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,14 @@ fusedav (0.2-3) unstable; urgency=low
 
   * debian/control:
     - Updated to standards-version 3.8.4 -- no changes.
+    - Build-depend on libneon27-gnutls-dev rather than libneon26-gnutls-dev.
   * debian/rules:
     - Use 'filter' rather than 'findstring' to make sure to match words rather
       than substrings.
+  * debian/patches:
+    - Added bts532763-neon27, adding support for neon27.
 
- -- Sebastian Harl <tokkee@debian.org>  Fri, 04 Jun 2010 13:53:50 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Fri, 04 Jun 2010 13:57:38 +0200
 
 fusedav (0.2-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index e4e07a882f01fcba7473d8a6d93001cf2aa12a4a..fddaa33335f223b192e662bea0d2b84e821eb149 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: fusedav
 Section: web
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), autotools-dev, libneon26-gnutls-dev, libfuse-dev (>= 2.5), libattr1-dev, lynx, dpatch
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), autotools-dev, libneon27-gnutls-dev, libfuse-dev (>= 2.5), libattr1-dev, lynx, dpatch
 Standards-Version: 3.8.4
 Homepage: http://0pointer.de/lennart/projects/fusedav/
 Vcs-Git: git://git.tokkee.org/pkg-fusedav.git

diff --git a/debian/patches/00list b/debian/patches/00list
index 0ba267812c70a9088908fc8827c4c060448c6861..f7fed7df91ab51599709295d00aab6be49a60967 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 ne_lfs.dpatch
+bts532763-neon27.dpatch
 

diff --git a/debian/patches/bts532763-neon27.dpatch b/debian/patches/bts532763-neon27.dpatch
new file mode 100755 (executable)
index 0000000..16a938d
--- /dev/null
+++ b/debian/patches/bts532763-neon27.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bts532763-neon27.dpatch by Sebastian Harl <tokkee@debian.org>
+##
+## DP: Added support for neon27.
+
+@DPATCH@
+
+diff a/src/filecache.c b/src/filecache.c
+--- a/src/filecache.c
++++ b/src/filecache.c
+@@ -233,8 +233,13 @@ fail:
+ }
+ 
+ static int load_up_to_unlocked(struct file_info *fi, off_t l) {
+-
++#ifndef ne_get_range64
++#define NE_GET_RANGE ne_get_range
++    ne_content_range range;
++#else
++#define NE_GET_RANGE ne_get_range64
+     ne_content_range64 range;
++#endif
+     ne_session *session;
+ 
+     assert(fi);
+@@ -257,7 +262,7 @@ static int load_up_to_unlocked(struct file_info *fi, off_t l) {
+     range.end = l-1;
+     range.total = 0;
+     
+-    if (ne_get_range64(session, fi->filename, &range, fi->fd) != NE_OK) {
++    if (NE_GET_RANGE(session, fi->filename, &range, fi->fd) != NE_OK) {
+         fprintf(stderr, "GET failed: %s\n", ne_get_error(session));
+         errno = ENOENT;
+         return -1;
+@@ -265,6 +270,7 @@ static int load_up_to_unlocked(struct file_info *fi, off_t l) {
+ 
+     fi->present = l;
+     return 0;
++#undef NE_GET_RANGE
+ }
+ 
+ int file_cache_read(void *f, char *buf, size_t size, off_t offset) {