[Python-modules-commits] r3285 - in /packages/pyinotify/trunk/debian: changelog control patches/ patches/series patches/use-sys-syscall-h.patch rules

dottedmag-guest at users.alioth.debian.org dottedmag-guest at users.alioth.debian.org
Fri Sep 21 04:14:50 UTC 2007


Author: dottedmag-guest
Date: Fri Sep 21 04:14:50 2007
New Revision: 3285

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3285
Log:
pyinotify 0.7.1-1 changes:

* 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.


Added:
    packages/pyinotify/trunk/debian/patches/
    packages/pyinotify/trunk/debian/patches/series
    packages/pyinotify/trunk/debian/patches/use-sys-syscall-h.patch
Modified:
    packages/pyinotify/trunk/debian/changelog
    packages/pyinotify/trunk/debian/control
    packages/pyinotify/trunk/debian/rules

Modified: packages/pyinotify/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/pyinotify/trunk/debian/changelog?rev=3285&op=diff
==============================================================================
--- packages/pyinotify/trunk/debian/changelog (original)
+++ packages/pyinotify/trunk/debian/changelog Fri Sep 21 04:14:50 2007
@@ -3,24 +3,38 @@
   [Mikhail Gusarov]
 
   * New upstream release (Closes: #432866).
+    - Removed hppa-syscalls.patch - applied upstream.
+    - Removed m68k-syscalls.patch - applied upstream.
 
-  * Removed hppa-syscalls.patch - applied upstream.
-  * Removed m68k-syscalls.patch - applied upstream.
-  * quilt is no longer needed.
+  * 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 <dottedmag at dottedmag.net>  Fri, 24 Aug 2007 23:04:01 +0700
+ -- Mikhail Gusarov <dottedmag at dottedmag.net>  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 <lamont at debian.org>  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.

Modified: packages/pyinotify/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/pyinotify/trunk/debian/control?rev=3285&op=diff
==============================================================================
--- packages/pyinotify/trunk/debian/control (original)
+++ packages/pyinotify/trunk/debian/control Fri Sep 21 04:14:50 2007
@@ -3,30 +3,11 @@
 Priority: optional
 Maintainer: Mikhail Gusarov <dottedmag at dottedmag.net>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-support (>= 0.3)
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-support (>= 0.3), quilt (>= 0.40)
 Standards-Version: 3.7.2
 
-# Notes on the Architecture: field for the binary packages:
-#  * inotify is Linux-only.
-#  * inotify supports a limited number of architectures
-#    (cf. inotify-syscalls.h)
-#  * debian-policy specifies the Architecture: to be either
-#    "arch" or "arch-os".
-#  * dpkg-buildpackage only handles "arch" and "os-arch".
-#    dpkg-buildpackage explicitly fails for "i386-linux" and
-#    works for "linux-i386".
-#  * The behaviour of dpkg-buildpackage probably reflects that of
-#    dpkg-architecture -i${architecture}
-#  * buildd behaves differently... "i386" implies Linux, and
-#    "hurd-i386" is hurd specifically. "dpkg-architecture -L"
-#    output suggests this makes sense.
-# Ergo: We half-ignore the Debian Policy, and explicitly list all
-#       architectures supported by inotify in the "arch" pattern,
-#       e.g. "i386" and hope we guessed right about the implication
-#       of "linux-".
-
 Package: python-pyinotify
-Architecture: alpha amd64 arm armel armeb i386 ia64 hppa m68k powerpc ppc64 s390 sh sparc sparc64
+Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
 Replaces: python2.3-pyinotify (<< 0.5.2-1.1), python2.4-pyinotify (<< 0.5.2-1.1)

Added: packages/pyinotify/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/python-modules/packages/pyinotify/trunk/debian/patches/series?rev=3285&op=file
==============================================================================
--- packages/pyinotify/trunk/debian/patches/series (added)
+++ packages/pyinotify/trunk/debian/patches/series Fri Sep 21 04:14:50 2007
@@ -1,0 +1,1 @@
+use-sys-syscall-h.patch

Added: packages/pyinotify/trunk/debian/patches/use-sys-syscall-h.patch
URL: http://svn.debian.org/wsvn/python-modules/packages/pyinotify/trunk/debian/patches/use-sys-syscall-h.patch?rev=3285&op=file
==============================================================================
--- packages/pyinotify/trunk/debian/patches/use-sys-syscall-h.patch (added)
+++ packages/pyinotify/trunk/debian/patches/use-sys-syscall-h.patch Fri Sep 21 04:14:50 2007
@@ -1,0 +1,19 @@
+Index: pyinotify-0.7.1/src/pyinotify/inotify_syscalls.h
+===================================================================
+--- pyinotify-0.7.1.orig/src/pyinotify/inotify_syscalls.h	2007-09-20 01:15:32.000000000 +0700
++++ pyinotify-0.7.1/src/pyinotify/inotify_syscalls.h	2007-09-20 01:16:10.000000000 +0700
+@@ -1,6 +1,7 @@
+ #ifndef _LINUX_INOTIFY_SYSCALLS_H
+ #define _LINUX_INOTIFY_SYSCALLS_H
+ 
++#if !defined(__NR_inotify_init) || !defined(__NR_inotify_add_watch) || !defined(__NR_inotify_rm_watch)
+ #if defined(__i386__)
+ #  define __NR_inotify_init		291
+ #  define __NR_inotify_add_watch	292
+@@ -83,5 +84,6 @@
+ #else
+ # error "Unsupported architecture!"
+ #endif
++#endif
+ 
+ #endif /* _LINUX_INOTIFY_SYSCALLS_H */

Modified: packages/pyinotify/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pyinotify/trunk/debian/rules?rev=3285&op=diff
==============================================================================
--- packages/pyinotify/trunk/debian/rules (original)
+++ packages/pyinotify/trunk/debian/rules Fri Sep 21 04:14:50 2007
@@ -2,6 +2,8 @@
 
 # Based on sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
+
+include /usr/share/quilt/quilt.make
 
 # List of python versions this package will be compiled for.
 # This list has to match the package list in debian/control.
@@ -45,14 +47,14 @@
 	done
 
 # Installing documentation in html/ subdirectory.
-	mv doc html
+	cp -R doc html
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdocs -i
-	dh_installexamples -i
+	dh_installexamples -i -Xautopath.py
 	dh_installchangelogs -i ChangeLog
 	dh_link -i
 	dh_strip -i




More information about the Python-modules-commits mailing list