--- pyinotify-0.8.9.orig/debian/changelog +++ pyinotify-0.8.9/debian/changelog @@ -0,0 +1,192 @@ +pyinotify (0.8.9-1ubuntu1) lucid; urgency=low + + * Cherry picked patch from upstream to fix event arrival after removing a + watch (LP: #507126) + + -- Guillermo Gonzalez Fri, 29 Jan 2010 12:07:53 -0300 + +pyinotify (0.8.9-1) unstable; urgency=low + + * New upstream release + - License changed from GPLv2+ to MIT + * Adjust documentation generation and installation due to changed + tarball layout + + -- Mikhail Gusarov Mon, 11 Jan 2010 02:28:44 +0600 + +pyinotify (0.8.8-1) unstable; urgency=low + + * New upstream release. + + -- Mikhail Gusarov Wed, 11 Nov 2009 19:29:08 +0600 + +pyinotify (0.8.7-1) unstable; urgency=low + + * New upstream release: + - inotify detection with glibc 2.10 fixed (Closes: #546786), + - python-psyco suggestion dropped, Psyco support removed upstream. + - installing examples/* as examples, files moved upstream + * Standards-Version is bumped to 3.8.3, no changes required. + * Unused XB-Python-Version field removed. + * doc-base registration added for HTML documentation + + -- Mikhail Gusarov Fri, 25 Sep 2009 03:31:04 +0700 + +pyinotify (0.8.6-2) unstable; urgency=low + + * Upload to unstable. + * Added Breaks field for packages known to be incompatible with + pyinotify 0.8.x. + + -- Mikhail Gusarov Thu, 14 May 2009 13:49:58 +0700 + +pyinotify (0.8.6-1) experimental; urgency=low + + * New upstream release (Closes: #521422): + - New upstream homepage, + + debian/watch updated. + - debian/copyright updated. + - compiled module is gone: + + -dbg package removed, + + build-dependencies/runtime-dependencies cleaned up, + + debian/rules cleanup. + - documentation is now built with epydoc + + added python-epydoc to dependencies + + debian/rules adjusted + - use-sys-syscall-h.patch removed, obsolete. + - quilt dependency removed, no longer used: + + debian/README.source removed. + * Bump Standards-Version to 3.8.1, no changes required. + * Bump debhelper compatibility to 7. + + -- Mikhail Gusarov Mon, 13 Apr 2009 16:47:49 +0700 + +pyinotify (0.7.1-3) unstable; urgency=low + + * debian/copyight: + - Replacing (C) with ©, as suggested by Lintian, + - Several files are under GPLv2 or later, + - Updating copyright years to 2009. + * debian/control: + - Updated short description for python-pyinotify-doc, as suggested by + Lintian. + + -- Mikhail Gusarov Tue, 17 Feb 2009 00:46:17 +0600 + +pyinotify (0.7.1-2) unstable; urgency=low + + [ Piotr Ożarowski ] + * Vcs-Svn, Vcs-Browser and Homepage fields added + + [ Sandro Tosi ] + * debian/control + - uniforming Vcs-Browser field + - switch Vcs-Browser field to viewsvn + - added -dbg package, adding python-all-dbg to build-depends + - uncapitalized short descriptions of all binary packages + - bump Standards-Version to 3.8.0 + + added debian/README.source + * debian/rules + - added -dbg building rules; thanks to Ezequiel Lara Gómez for the (partial) + patch; Closes: #470990 + - correctly depending on '$(QUILT_STAMPFN)' (for configure-stamp target) + and 'unpatch' (for clean target) + - added removal of 'html/' dir (created by Debian package build system) + - merged *-stamp removal in 'dh_clean' call + * debian/patches/use-sys-syscall-h.patch + - added description (from previous changelog entries) + + -- Debian Python Modules Team Sun, 28 Dec 2008 15:01:11 +0100 + +pyinotify (0.7.1-1) unstable; urgency=low + + [Mikhail Gusarov] + + * New upstream release (Closes: #432866). + - Removed hppa-syscalls.patch - applied upstream. + - Removed m68k-syscalls.patch - applied upstream. + + * Acknowleging NMU 0.7.0-2.1. Thanks to LaMont Jones. + - Added use-sys-syscall-h.patch - all Lenny architectures have an + inotify support. + - Package made Architecture: any. + + * Fixed compilation of _inotify.so for several Python versions (thanks + to Christopher Halse Rogers) (Closes: #430891). + + * epydoc documentation moved to html/ subdir to avoid polluting + documentation directory. + + * autopath.py stripped from examples, as it is not needed for packaged + library, and hangs when being imported due to some reason. + + [Scott Kitterman] + + * Suggest python-pyinotify instead of python2.*-pyinotify for + python-pyinotify-doc. + + -- Mikhail Gusarov Thu, 20 Sep 2007 01:22:55 +0700 + +pyinotify (0.7.0-2.1) unstable; urgency=low + + * Fix FTBFS on hppa and mips/mipsel by using sys/syscall.h, since + inotify stuff is mainline linux on all lenny-supporting architectures. + * Architecture: any and let Packages-arch-specific deal with the exceptions. + + -- LaMont Jones Fri, 31 Aug 2007 18:59:18 -0600 + +pyinotify (0.7.0-2) unstable; urgency=low + + * Added armel and armeb to the supported architectures list. Thanks, Riku. + (Closes: #429266) + * Added patch hppa-syscalls.patch, enabling compilation for + hppa. Thanks, Jan. (Closes: #382647). + + -- Mikhail Gusarov Sun, 17 Jun 2007 00:18:31 +0700 + +pyinotify (0.7.0-1) unstable; urgency=low + + * New maintainer. Thanks for your work, Hans! + * Acknowledging NMU. Thanks, Pierre! (Closes: #373497) + + * New upstream release. (Closes: #370565, #414740) + * Added syscall numbers for m68k. (Closes: #394587) + + * debhelper compatibility level 5 (no changes required). + * -doc package moved to 'doc' section. + * '[dummy package]' removed from description: package is no longer + dummy. (Closes: #420775) + * Trailing whitespace and empty lines removed from the + debian/{control,rules,changelog} + * 'Homepage' entries indented to have two leading spaces. + * debian/copyright updated: several files in package are under MIT and + PSF licenses + + -- Mikhail Gusarov Mon, 14 May 2007 21:54:22 +0700 + +pyinotify (0.5.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Update package for new python policy (Closes: #373497). + + -- Pierre Habouzit Fri, 30 Jun 2006 10:30:52 +0200 + +pyinotify (0.5.2-1) unstable; urgency=low + + * New upstream release. + + -- Hans Ulrich Niedermann Sun, 2 Apr 2006 02:35:31 +0200 + +pyinotify (0.5.1-1) unstable; urgency=low + + * New upstream release. + * Explicitly list all (Linux) architectures supported by inotify. + * Do ship private docs (they are linked to from the public docs). + + -- Hans Ulrich Niedermann Tue, 28 Mar 2006 14:25:09 +0200 + +pyinotify (0.5.0-1) unstable; urgency=low + + * Initial Release, closes: #351451. + + -- Hans Ulrich Niedermann Thu, 9 Mar 2006 15:48:55 +0100 --- pyinotify-0.8.9.orig/debian/compat +++ pyinotify-0.8.9/debian/compat @@ -0,0 +1 @@ +7 --- pyinotify-0.8.9.orig/debian/control +++ pyinotify-0.8.9/debian/control @@ -0,0 +1,39 @@ +Source: pyinotify +Section: python +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Mikhail Gusarov +Uploaders: Debian Python Modules Team +Build-Depends: debhelper (>= 7), python, quilt +Build-Depends-Indep: python-epydoc, python-support (>= 0.3) +Standards-Version: 3.8.3 +XS-Python-Version: >=2.4 +Homepage: http://trac.dbzteam.org/pyinotify +Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyinotify/trunk/ +Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyinotify/trunk/ + +Package: python-pyinotify +Architecture: all +Depends: ${python:Depends} +Provides: ${python:Provides} +Replaces: python2.3-pyinotify (<< 0.5.2-1.1), python2.4-pyinotify (<< 0.5.2-1.1) +Conflicts: python2.3-pyinotify (<< 0.5.2-1.1), python2.4-pyinotify (<< 0.5.2-1.1) +Suggests: python-pyinotify-doc +Breaks: deejayd (<< 0.8), listen (<< 0.6), pytagsfs (<< 0.9.0-2), debomatic (<< 0.6) +Description: simple Linux inotify Python bindings + pyinotify is a simple wrapper for the Linux inotify mechanism. + . + inotify is a Linux Kernel feature available since 2.6.13. inotify makes + it possible for applications to easily be notified of filesystem changes. + +Package: python-pyinotify-doc +Architecture: all +Section: doc +Recommends: python-pyinotify +Description: simple Linux inotify Python bindings -- documentation + pyinotify is a simple wrapper for the Linux inotify mechanism. + . + inotify is a Linux Kernel feature available since 2.6.13. inotify makes + it possible for applications to easily be notified of filesystem changes. + . + This package contains API documentation and examples. --- pyinotify-0.8.9.orig/debian/copyright +++ pyinotify-0.8.9/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Hans Ulrich Niedermann on +Sat, 4 Feb 2006 12:50:56 +0000. + +It was downloaded from http://pyinotify.sourceforge.net/ + +Upstream Author: Sebastien Martini + +License: + +Copyright (c) 2010 Sebastien Martini + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +The Debian packaging is +© 2006-2007 Hans Ulrich Niedermann +© 2007-2010 Mikhail Gusarov +and is licensed under the GPL version 2, see `/usr/share/common-licenses/GPL-2'. --- pyinotify-0.8.9.orig/debian/python-pyinotify-doc.doc-base +++ pyinotify-0.8.9/debian/python-pyinotify-doc.doc-base @@ -0,0 +1,9 @@ +Document: python-pyinotify-reference-manual +Title: Python Pyinotify Library Reference Manual +Author: xxxx +Abstract: Pyinotify is a simple library for accessing Linux inotify mechanism. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/python-pyinotify-doc/html/index.html +Files: /usr/share/doc/python-pyinotify-doc/html/* --- pyinotify-0.8.9.orig/debian/python-pyinotify-doc.docs +++ pyinotify-0.8.9/debian/python-pyinotify-doc.docs @@ -0,0 +1,5 @@ +ACKS +html +NEWS_old +README +TODO --- pyinotify-0.8.9.orig/debian/python-pyinotify-doc.examples +++ pyinotify-0.8.9/debian/python-pyinotify-doc.examples @@ -0,0 +1 @@ +python2/examples/*.py --- pyinotify-0.8.9.orig/debian/rules +++ pyinotify-0.8.9/debian/rules @@ -0,0 +1,49 @@ +#!/usr/bin/make -f + +# Based on sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +include /usr/share/quilt/quilt.make + +clean: unpatch + dh_testdir + dh_testroot + + python setup.py clean --all + + rm -rf html + [ ! -e docstrings.orig ] || mv docstrings.orig docstrings + + dh_clean + +build: patch + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + [ ! -e docstrings ] || mv docstrings docstrings.orig + epydoc python2/pyinotify.py + + python setup.py install --root $(CURDIR)/debian/python-pyinotify + +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i + dh_installexamples -i + dh_installchangelogs -i + dh_pysupport -i + dh_compress -i -Xexamples + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- pyinotify-0.8.9.orig/debian/watch +++ pyinotify-0.8.9/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-(.*)\.tar\.gz --- pyinotify-0.8.9.orig/debian/patches/series +++ pyinotify-0.8.9/debian/patches/series @@ -0,0 +1 @@ +wd_missing.patch --- pyinotify-0.8.9.orig/debian/patches/wd_missing.patch +++ pyinotify-0.8.9/debian/patches/wd_missing.patch @@ -0,0 +1,46 @@ +From: Sebastien Martini +Subject: Skip events on removed watches to avoid crashes +Origin: upstream, + http://git.dbzteam.org/pyinotify/commit/?id=d334049eed6b1136a9d224a3ca17aa66fea5215a +Bug: http://trac.dbzteam.org/pyinotify/ticket/36 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-django/+bug/513719 +Reviewed-By: Guillermo Gonzalez +Reviewed-By: James Westby +Last-Update: 2010-01-31 + +=== modified file 'python2/pyinotify.py' +--- pyinotify-0.8.9.orig/python2/pyinotify.py 2010-01-11 02:28:44 +0000 ++++ pyinotify-0.8.9/python2/pyinotify.py 2010-01-25 17:01:22 +0000 +@@ -1121,6 +1121,13 @@ + while self._eventq: + raw_event = self._eventq.popleft() # pop next event + watch_ = self._watch_manager.get_watch(raw_event.wd) ++ if watch_ is None: ++ # Not really sure how we ended up here, nor how we should ++ # handle these types of events and if it is appropriate to ++ # completly skip them (like we are doing here). ++ log.warning("Unable to retrieve Watch object associated to %s", ++ repr(raw_event)) ++ continue + revent = self._sys_proc_fun(raw_event) # system processings + if watch_ and watch_.proc_fun: + watch_.proc_fun(revent) # user processings + +=== modified file 'python3/pyinotify.py' +--- pyinotify-0.8.9.orig/python3/pyinotify.py 2010-01-11 02:28:44 +0000 ++++ pyinotify-0.8.9/python3/pyinotify.py 2010-01-25 17:01:36 +0000 +@@ -1084,6 +1084,13 @@ + while self._eventq: + raw_event = self._eventq.popleft() # pop next event + watch_ = self._watch_manager.get_watch(raw_event.wd) ++ if watch_ is None: ++ # Not really sure how we ended up here, nor how we should ++ # handle these types of events and if it is appropriate to ++ # completly skip them (like we are doing here). ++ log.warning("Unable to retrieve Watch object associated to %s", ++ repr(raw_event)) ++ continue + revent = self._sys_proc_fun(raw_event) # system processings + if watch_ and watch_.proc_fun: + watch_.proc_fun(revent) # user processings +