[Python-modules-commits] [python-llfuse] 10/11: merge patched into master
Nikolaus Rath
nikratio-guest at moszumanska.debian.org
Mon Nov 13 12:52:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
nikratio-guest pushed a commit to branch master
in repository python-llfuse.
commit 3ce7511e8eb0e7973038e909b679aed0686b3a0d
Merge: 714f5b5 607834e
Author: Nikolaus Rath <Nikolaus at rath.org>
Date: Mon Nov 13 12:50:30 2017 +0000
merge patched into master
Include/posix/stat.pxd | 2 +-
debian/.git-dpm | 4 ++--
debian/changelog | 2 ++
debian/patches/mips_dev_t.diff | 6 +++---
4 files changed, 8 insertions(+), 6 deletions(-)
diff --cc debian/.git-dpm
index f04cbb7,0000000..bb724af
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 962f96aa30c98566c6b214ef31a32268a853824e
- 962f96aa30c98566c6b214ef31a32268a853824e
++607834e7265a65e5339f919b84390e3758ad91ac
++607834e7265a65e5339f919b84390e3758ad91ac
+1921f2f34497ebd923bf57c3c5db71af7ce70668
+1921f2f34497ebd923bf57c3c5db71af7ce70668
+python-llfuse_1.3.2+dfsg.orig.tar.gz
+671f1fbd7195ec5989fa24112e93d5ec0774ef2e
+276475
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 15dd1d0,0000000..348e99e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,274 -1,0 +1,276 @@@
+python-llfuse (1.3.2+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream version.
++ * Don't apply dev_t fix to mips64 (just mips and mipsel).
++ Closes: #877500
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Mon, 13 Nov 2017 12:33:02 +0000
+
+python-llfuse (1.3+dfsg-3) unstable; urgency=medium
+
+ * Updated standards version to 4.1.1
+ * Added support for 'nodoc' in DEB_BUILD_OPTIONS.
+ * python-llfuse-doc is now Multi-Arch: foreign
+ * Fixed mips_dev_t.diff one more time. One mips, dev_t is unsigned
+ and we have to apply the match for mips, not just mips64.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sun, 01 Oct 2017 15:21:45 +0100
+
+python-llfuse (1.3+dfsg-2) unstable; urgency=medium
+
+ * Fix build for mips
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Fri, 15 Sep 2017 14:58:36 +0100
+
+python-llfuse (1.3+dfsg-1) unstable; urgency=medium
+
+ * new upstream release
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Fri, 15 Sep 2017 11:30:10 +0100
+
+python-llfuse (1.2+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sun, 22 Jan 2017 14:42:22 -0800
+
+python-llfuse (1.1.1+dfsg-7) unstable; urgency=medium
+
+ * Fix syntax error introduced with new Debian patch in -6.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sun, 22 Jan 2017 09:54:54 -0800
+
+python-llfuse (1.1.1+dfsg-6) unstable; urgency=medium
+
+ * Ignore exceptions during interpreter shutdown
+
+ These can most likely be ignored in general. In the specific
+ case that we are addressing with this, they also seem to be
+ caused by a bug in Python. Closes: #851724.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sat, 21 Jan 2017 16:36:43 -0800
+
+python-llfuse (1.1.1+dfsg-5) unstable; urgency=medium
+
+ * Added missing python-pytest-catchlog dependency for tests
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Mon, 02 Jan 2017 20:17:51 -0800
+
+python-llfuse (1.1.1+dfsg-4) unstable; urgency=medium
+
+ * Added missing python3-pytest-catchlog dependency for tests
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Fri, 07 Oct 2016 20:46:10 -0700
+
+python-llfuse (1.1.1+dfsg-3) unstable; urgency=medium
+
+ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+
+ [ Nikolaus Rath ]
+ * Don't use pytest.skip at module level. Closes: #837254.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Fri, 23 Sep 2016 20:41:07 -0700
+
+python-llfuse (1.1.1+dfsg-2) unstable; urgency=medium
+
+ * Added missing pytest-catchlog build dependency
+ * Fixup 0004-Backport-properties-to-Cython-0.23-syntax.patch
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 27 Jul 2016 11:25:48 -0700
+
+python-llfuse (1.1.1+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 27 Jul 2016 10:20:40 -0700
+
+python-llfuse (1.0+dfsg-2) unstable; urgency=medium
+
+ * Cherry picked ns-resolution support for kFreeBSD
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 10 Mar 2016 09:13:08 -0800
+
+python-llfuse (1.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Tue, 08 Mar 2016 09:04:29 -0800
+
+python-llfuse (0.43+dfsg-3) unstable; urgency=medium
+
+ * Skip extended attribute tests under kFreeBSD.
+ * Bump standards version to 3.9.7, no changes required.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Mon, 07 Mar 2016 13:23:53 -0800
+
+python-llfuse (0.43+dfsg-2) unstable; urgency=medium
+
+ * Added Breaks: borgbackup.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 25 Feb 2016 09:42:48 -0800
+
+python-llfuse (0.43+dfsg-1) unstable; urgency=medium
+
+ * Updated URL in copyright file.
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Tue, 23 Feb 2016 16:10:05 -0800
+
+python-llfuse (0.41.1+dfsg-4) unstable; urgency=medium
+
+ * Added patches/mips_dev_t.diff to work around bug in mips/mipsel libc
+ (cf. https://sourceware.org/bugzilla/show_bug.cgi?id=17786).
+ Closes: #635197.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 16 Sep 2015 13:59:11 -0700
+
+python-llfuse (0.41.1+dfsg-3) unstable; urgency=medium
+
+ * Bumped Cython dependency to >= 0.21.1. Older versions don't have
+ posix/time.pxi.
+ * Added patches/setattr_compat.diff to restore full backwards
+ compatibility with version 0.40 (some applications were relying
+ on undocumented behavior were broken by the update to 0.41.1).
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 10 Sep 2015 14:09:16 -0700
+
+python-llfuse (0.41.1+dfsg-1) unstable; urgency=medium
+
+ * Added test suite.
+ * 'nostrip' build option is now honored.
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sat, 22 Aug 2015 19:34:48 -0700
+
+python-llfuse (0.41+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Use Python 3 versions of Cython and Sphinx.
+ * Dropped build dependency on cython3-dbg (fixed upstream).
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Fri, 21 Aug 2015 08:52:21 -0700
+
+python-llfuse (0.40+dfsg-2) unstable; urgency=medium
+
+ * Correctly handle symlink-to-directory transition of
+ /usr/share/doc/{python,python3}-llfuse-dbg when upgrading from jessie.
+ Closes: #788161.
+ * Add versioned Breaks and Conflicts to -dbg packages to avoid
+ upgrade problems due to moved file. Closes: #781652.
+ * Put debugging symbols for regular interpreter into -dbg
+ package again. Closes: #781719.
+ * Bumped Standards-Version to 3.9.6 (no changes needed).
+ * Added missing build-depends on cython3 and cython-dbg.
+ Closes: #794056.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 29 Jul 2015 20:49:49 -0700
+
+python-llfuse (0.40+dfsg-1) unstable; urgency=medium
+
+ * Updated watch file to use pypi, and validate pgp signature.
+ * Remove minified javascript files from upstream source.
+ * Switched package build system to pybuild.
+ * Updated project URL.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 10 Jul 2014 21:34:34 -0700
+
+python-llfuse (0.40-2) unstable; urgency=low
+
+ * Some cosmetic fixes to debian/
+ * Bumped standards version to 3.9.5, no other changes required.
+ * Added force_xattr_api.diff to support compilation under GNU/kFreeBSD.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 27 Nov 2013 20:19:13 -0800
+
+python-llfuse (0.40-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Tue, 26 Nov 2013 21:59:10 -0800
+
+python-llfuse (0.39-1) unstable; urgency=low
+
+ [ Nikolaus Rath ]
+ * Bumped standards version to 3.9.4, no other changes required.
+ * Bumped debhelper compatibility level to 9 to get support for
+ dpkg-buildflags.
+ * Added lintian override for hardening-no-fortify-functions,
+ this is a false positive.
+ * Build depend on newer Cython (> 0.16).
+ * New upstream release.
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sat, 11 May 2013 12:33:34 -0700
+
+python-llfuse (0.37.1-2) unstable; urgency=low
+
+ * Fix build failure, only call dh_sphinxdoc when building
+ python-llfuse-doc package.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 22 Dec 2011 22:37:26 -0500
+
+python-llfuse (0.37.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sat, 10 Dec 2011 20:57:38 -0500
+
+python-llfuse (0.36-2) unstable; urgency=low
+
+ * Use dh_sphinxdoc. Closes: #637393.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Mon, 24 Oct 2011 19:36:59 -0400
+
+python-llfuse (0.36-1) unstable; urgency=low
+
+ * New upstream release.
+ * Depend on Cython > 0.15.1, previous versions generated segfaulting
+ code.
+ * Breaks S3QL < 1.2, API changed in non-backwards compatible way.
+ (python-llfuse is not in any stable release, and S3QL is the
+ only reverse dependency, so a new package name does not seem
+ justified).
+ * Update format of copyright file.
+ * Fixed argument parsing under Python 3.x
+ * Do correct typecasting of mode_t constants. Fix introduces
+ build dependency on Cython 0.15 (Closes: #635196).
+ * Use underscore.js from libjs-underscore rather than shipping
+ our own version.
+ * Added correct copyright information for files in doc/html/_static.
+ * Thanks to Jakub Wilk for his packaging review.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Tue, 20 Sep 2011 22:16:17 -0400
+
+python-llfuse (0.33-1) unstable; urgency=low
+
+ * New upstream release.
+ * Build extension before generating documentation, so that
+ autogenerated documentation is no longer empty. Closes: 631871
+ * Ship cached python intersphinx file in debian/, so that it
+ does not need to be downloaded at build time.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 06 Jul 2011 09:32:38 -0400
+
+python-llfuse (0.32-2) unstable; urgency=low
+
+ * Created separate -doc package for documentation. Closes: 630632
+ * Regenerate documentation in debian/rules. Closes: 630605
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sat, 25 Jun 2011 13:01:03 -0400
+
+python-llfuse (0.32-1) unstable; urgency=low
+
+ * First official debian release. Closes: 626658
+ * Breaks and Replaces s3ql <= 0.28, this package isn't in the official
+ debian package but was provided by upstream over various channels (LLFUSE
+ was factored out of S3QL in version 0.29).
+ * Rebuilding of HTML documentation requires (yet unreleased) Sphinx version
+ 1.1 or resolution of wishlist bug #63040, therefore we do not rebuild the
+ documentation in debian/rules but use the HTML files included in the
+ upstream tarball.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Thu, 12 May 2011 10:19:11 -0400
+
diff --cc debian/patches/mips_dev_t.diff
index 0a61792,0000000..10534d3
mode 100644,000000..100644
--- a/debian/patches/mips_dev_t.diff
+++ b/debian/patches/mips_dev_t.diff
@@@ -1,67 -1,0 +1,67 @@@
- From 962f96aa30c98566c6b214ef31a32268a853824e Mon Sep 17 00:00:00 2001
++From 607834e7265a65e5339f919b84390e3758ad91ac Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus at rath.org>
+Date: Mon, 13 Nov 2017 12:31:56 +0000
+Subject: Work around bug in mips+mipsel libc
+
+Forwarded: no
+Patch-Name: mips_dev_t.diff
+
+On mips and mipsel, the st_dev and st_rdev members of struct stat do not
+have type dev_t. This breaks POSIX compatibility, but is difficult to fix
+(cf. https://sourceware.org/bugzilla/show_bug.cgi?id=17786).
+
+To work around the issue, we change the definition of struct stat that
+is used by Cython when we are compiling under mips. Note that this
+requires the Cython compilation to run under mips, and that the
+resulting C file will be mips specific (without the patch, the
+generated C file is suitable for any architecture).
+
+Upstream is not interested in this change for obvious reasons.
+---
+ Include/posix/stat.pxd | 37 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 37 insertions(+)
+ create mode 100644 Include/posix/stat.pxd
+
+diff --git a/Include/posix/stat.pxd b/Include/posix/stat.pxd
+new file mode 100644
- index 00000..f9038
++index 00000..45144
+--- /dev/null
++++ b/Include/posix/stat.pxd
+@@ -0,0 +1,37 @@
++from posix.types cimport (blkcnt_t, blksize_t, dev_t, gid_t, ino_t, mode_t,
++ nlink_t, off_t, time_t, uid_t)
++
- +IF UNAME_MACHINE.startswith('mips'):
+++IF UNAME_MACHINE in ('mips', 'mipsel'):
++ cdef extern from "<sys/stat.h>" nogil:
++ cdef struct struct_stat "stat":
++ unsigned st_dev
++ ino_t st_ino
++ mode_t st_mode
++ nlink_t st_nlink
++ uid_t st_uid
++ gid_t st_gid
++ unsigned st_rdev
++ off_t st_size
++ blksize_t st_blksize
++ blkcnt_t st_blocks
++ time_t st_atime
++ time_t st_mtime
++ time_t st_ctime
++ time_t st_birthtime
++ELSE:
++ cdef extern from "<sys/stat.h>" nogil:
++ cdef struct struct_stat "stat":
++ dev_t st_dev
++ ino_t st_ino
++ mode_t st_mode
++ nlink_t st_nlink
++ uid_t st_uid
++ gid_t st_gid
++ dev_t st_rdev
++ off_t st_size
++ blksize_t st_blksize
++ blkcnt_t st_blocks
++ time_t st_atime
++ time_t st_mtime
++ time_t st_ctime
++ time_t st_birthtime
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-llfuse.git
More information about the Python-modules-commits
mailing list