[Python-modules-commits] r8250 - in packages/pyinotify/trunk/debian (14 files)

dottedmag-guest at users.alioth.debian.org dottedmag-guest at users.alioth.debian.org
Mon Apr 13 23:38:58 UTC 2009


    Date: Monday, April 13, 2009 @ 23:38:57
  Author: dottedmag-guest
Revision: 8250

New upstream release

Added:
  packages/pyinotify/trunk/debian/python-pyinotify-doc.docs
  packages/pyinotify/trunk/debian/python-pyinotify-doc.examples
Modified:
  packages/pyinotify/trunk/debian/changelog
  packages/pyinotify/trunk/debian/compat
  packages/pyinotify/trunk/debian/control
  packages/pyinotify/trunk/debian/copyright
  packages/pyinotify/trunk/debian/rules
  packages/pyinotify/trunk/debian/watch
Deleted:
  packages/pyinotify/trunk/debian/README.source
  packages/pyinotify/trunk/debian/patches/
  packages/pyinotify/trunk/debian/pycompat
  packages/pyinotify/trunk/debian/python-pyinotify-doc.docs
  packages/pyinotify/trunk/debian/python-pyinotify-doc.examples
  packages/pyinotify/trunk/debian/python-pyinotify.docs

Deleted: packages/pyinotify/trunk/debian/README.source
===================================================================
--- packages/pyinotify/trunk/debian/README.source	2009-04-13 12:03:34 UTC (rev 8249)
+++ packages/pyinotify/trunk/debian/README.source	2009-04-13 23:38:57 UTC (rev 8250)
@@ -1,4 +0,0 @@
-This package uses quilt as patch system, you can find some information
-about it at:
-
-    /usr/share/doc/quilt/README.source

Modified: packages/pyinotify/trunk/debian/changelog
===================================================================
--- packages/pyinotify/trunk/debian/changelog	2009-04-13 12:03:34 UTC (rev 8249)
+++ packages/pyinotify/trunk/debian/changelog	2009-04-13 23:38:57 UTC (rev 8250)
@@ -1,3 +1,24 @@
+pyinotify (0.8.6-1) UNRELEASED; 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 <dottedmag at dottedmag.net>  Mon, 13 Apr 2009 16:47:49 +0700
+
 pyinotify (0.7.1-3) unstable; urgency=low
 
   * debian/copyight:

Modified: packages/pyinotify/trunk/debian/compat
===================================================================
--- packages/pyinotify/trunk/debian/compat	2009-04-13 12:03:34 UTC (rev 8249)
+++ packages/pyinotify/trunk/debian/compat	2009-04-13 23:38:57 UTC (rev 8250)
@@ -1 +1 @@
-5
+7

Modified: packages/pyinotify/trunk/debian/control
===================================================================
--- packages/pyinotify/trunk/debian/control	2009-04-13 12:03:34 UTC (rev 8249)
+++ packages/pyinotify/trunk/debian/control	2009-04-13 23:38:57 UTC (rev 8250)
@@ -3,18 +3,21 @@
 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-all-dbg, python-support (>= 0.3), quilt (>= 0.40)
-Standards-Version: 3.8.0
-Homepage: http://pyinotify.sourceforge.net/
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-support (>= 0.3), python-epydoc
+Standards-Version: 3.8.1
+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: any
-Depends: ${python:Depends}, ${shlibs:Depends}
+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)
+Recommends: python-psyco
+Suggests: python-pyinotify-doc
 XB-Python-Version: ${python:Versions}
 Description: simple Linux inotify Python bindings
  pyinotify is a simple wrapper for the Linux inotify mechanism.
@@ -24,26 +27,11 @@
 
 Package: python-pyinotify-doc
 Architecture: all
-Section: doc
-Depends: ${python:Depends}
-Suggests: python-pyinotify
-Description: simple Linux inotify Python bindings (documentation)
+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 Inotify's documentation and examples.
-
-Package: python-pyinotify-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: python-pyinotify (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, python-dbg
-Description: simple Linux inotify Python bindings (debug extension)
- 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 Inotify's debug extension.
+ This package contains API documentation and examples.

Modified: packages/pyinotify/trunk/debian/copyright
===================================================================
--- packages/pyinotify/trunk/debian/copyright	2009-04-13 12:03:34 UTC (rev 8249)
+++ packages/pyinotify/trunk/debian/copyright	2009-04-13 23:38:57 UTC (rev 8250)
@@ -7,12 +7,12 @@
 
 License:
 
-    Copyright (C) 2005-2006 Sebastien Martini
+    Copyright (C) 2005-2008 Sebastien Martini
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2,
-    or (at your option) any later version.
+    as published by the Free Software Foundation; either version 2 
+    of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,96 +26,6 @@
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL-2 file.
 
-src/pyinotify/inotify.py, src/pyinotify/pyinotify.py files are under
-GPL version 2:
-
-    Copyright (C) 2005-2006 Sebastien Martini
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    version 2 as published by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-src/pyinotify/autopath.py, src/examples/pyinotifyfs/autopath.py,
-src/examples/pyinotifyfs/pyinotifyfs.py, src/examples/pyinotifyfs/vtagfs.py
-files are under MIT/X11 license:
-
-    Copyright © 2005-2006 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.
-
-src/pyinotify/iglob.py is copied and adapted from the Python distribution, and
-licensed under PSF 2 license:
-
-    PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
-    --------------------------------------------
-
-    1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
-    and the Individual or Organization ("Licensee") accessing and otherwise
-    using this software ("Python") in source or binary form and its associated
-    documentation.
-
-    2. Subject to the terms and conditions of this License Agreement, PSF hereby
-    grants Licensee a nonexclusive, royalty-free, world-wide license to
-    reproduce, analyze, test, perform and/or display publicly, prepare
-    derivative works, distribute, and otherwise use Python alone or in any
-    derivative version, provided, however, that PSF's License Agreement and
-    PSF's notice of copyright, i.e., "Copyright (C) 2001, 2002, 2003, 2004,
-    2005, 2006, 2007 Python Software Foundation; All Rights Reserved" are
-    retained in Python alone or in any derivative version prepared by Licensee.
-
-    3. In the event Licensee prepares a derivative work that is based on or
-    incorporates Python or any part thereof, and wants to make the derivative
-    work available to others as provided herein, then Licensee hereby agrees to
-    include in any such work a brief summary of the changes made to Python.
-
-    4. PSF is making Python available to Licensee on an "AS IS" basis.  PSF
-    MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.  BY WAY OF
-    EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION
-    OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
-    THE USE OF PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
-    5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY
-    INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-    MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE
-    THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-    6. This License Agreement will automatically terminate upon a material
-    breach of its terms and conditions.
-
-    7. Nothing in this License Agreement shall be deemed to create any
-    relationship of agency, partnership, or joint venture between PSF and
-    Licensee.  This License Agreement does not grant permission to use PSF
-    trademarks or trade name in a trademark sense to endorse or promote products
-    or services of Licensee, or any third party.
-
-    8. By copying, installing or otherwise using Python, Licensee agrees to be
-    bound by the terms and conditions of this License Agreement.
-
 The Debian packaging is
 © 2006-2007 Hans Ulrich Niedermann <debian at n-dimensional.de>
 © 2007-2009 Mikhail Gusarov <dottedmag at dottedmag.net>

Deleted: packages/pyinotify/trunk/debian/pycompat
===================================================================
--- packages/pyinotify/trunk/debian/pycompat	2009-04-13 12:03:34 UTC (rev 8249)
+++ packages/pyinotify/trunk/debian/pycompat	2009-04-13 23:38:57 UTC (rev 8250)
@@ -1 +0,0 @@
-2

Deleted: packages/pyinotify/trunk/debian/python-pyinotify-doc.docs
===================================================================
--- packages/pyinotify/trunk/debian/python-pyinotify-doc.docs	2009-04-13 12:03:34 UTC (rev 8249)
+++ packages/pyinotify/trunk/debian/python-pyinotify-doc.docs	2009-04-13 23:38:57 UTC (rev 8250)
@@ -1,6 +0,0 @@
-AUTHORS
-NEWS
-README
-TODO
-html
-

Added: packages/pyinotify/trunk/debian/python-pyinotify-doc.docs
===================================================================
--- packages/pyinotify/trunk/debian/python-pyinotify-doc.docs	                        (rev 0)
+++ packages/pyinotify/trunk/debian/python-pyinotify-doc.docs	2009-04-13 23:38:57 UTC (rev 8250)
@@ -0,0 +1,2 @@
+TODO
+html

Deleted: packages/pyinotify/trunk/debian/python-pyinotify-doc.examples
===================================================================
--- packages/pyinotify/trunk/debian/python-pyinotify-doc.examples	2009-04-13 12:03:34 UTC (rev 8249)
+++ packages/pyinotify/trunk/debian/python-pyinotify-doc.examples	2009-04-13 23:38:57 UTC (rev 8250)
@@ -1 +0,0 @@
-src/examples/*

Added: packages/pyinotify/trunk/debian/python-pyinotify-doc.examples
===================================================================
--- packages/pyinotify/trunk/debian/python-pyinotify-doc.examples	                        (rev 0)
+++ packages/pyinotify/trunk/debian/python-pyinotify-doc.examples	2009-04-13 23:38:57 UTC (rev 8250)
@@ -0,0 +1,13 @@
+chain.py
+daemon.py
+exclude.patterns
+exclude.py
+loop.py
+not_quiet.py
+stats.py
+stats_threaded.py
+transient_file.py
+transient_file.sh
+tutorial_notifier.py
+tutorial_threadednotifier.py
+unicode.py

Deleted: packages/pyinotify/trunk/debian/python-pyinotify.docs
===================================================================
--- packages/pyinotify/trunk/debian/python-pyinotify.docs	2009-04-13 12:03:34 UTC (rev 8249)
+++ packages/pyinotify/trunk/debian/python-pyinotify.docs	2009-04-13 23:38:57 UTC (rev 8250)
@@ -1,4 +0,0 @@
-AUTHORS
-NEWS
-README
-TODO

Modified: packages/pyinotify/trunk/debian/rules
===================================================================
--- packages/pyinotify/trunk/debian/rules	2009-04-13 12:03:34 UTC (rev 8249)
+++ packages/pyinotify/trunk/debian/rules	2009-04-13 23:38:57 UTC (rev 8250)
@@ -3,100 +3,47 @@
 # Based on sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-include /usr/share/quilt/quilt.make
+include /usr/share/python/python.mk
 
-# List of python versions this package will be compiled for.
-# This list has to match the package list in debian/control.
-PYVERS = $(shell pyversions -r)
-
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
+clean:
 	dh_testdir
-	for python in $(PYVERS); do \
-	    "$${python}" setup.py config; \
-	    "$${python}-dbg" setup.py config; \
-	done
-	touch $@
-
-build:
-
-clean: unpatch
-	dh_testdir
 	dh_testroot
 
-	for python in $(PYVERS); do \
-	    "$${python}" setup.py clean --all; \
-	    "$${python}-dbg" setup.py clean --all; \
-	done
+	python setup.py clean --all
 
-	$(MAKE) clean
+	rm -rf html
+	[ ! -e docstrings.orig ] || mv docstrings.orig docstrings
 
-	rm -rf html/
+	dh_clean
 
-	dh_clean configure-stamp
+build:
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
-# Since setup.py doesn't segregate _inotify.so by the python version it's built
-# against, we need to build and install in one go for each python version.
-# (Bug #85705)
+	[ ! -e docstrings ] || mv docstrings docstrings.orig
+	epydoc pyinotify.py
 
-	for python in $(PYVERS); do \
-	    $$python setup.py build --force; \
-	    $$python setup.py install --root=$(CURDIR)/debian/python-pyinotify; \
-	done
+	python setup.py install --root $(CURDIR)/debian/python-pyinotify
 
-	# debug extension installation
-	for python in $(PYVERS); do \
-	    $$python-dbg setup.py build --force; \
-	    $$python-dbg setup.py install --root=$(CURDIR)/debian/python-pyinotify-dbg; \
-	done
-	find debian/python-*-dbg ! -type d ! -name '*_d.so' | xargs rm -f
-	find debian/python-*-dbg -depth -empty -exec rmdir {} \;
-
-# Installing documentation in html/ subdirectory.
-	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 -Xautopath.py
-	dh_installchangelogs -i ChangeLog
-	dh_link -i
-	dh_strip -i --dbg-package=python-pyinotify-dbg
+	dh_installexamples -i
+	dh_installchangelogs -i NEWS
+	dh_pysupport -i
 	dh_compress -i -Xexamples
 	dh_fixperms -i
-	dh_pysupport -i
 	dh_installdeb -i
-	dh_shlibdeps -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a
-	dh_installchangelogs -a ChangeLog
-	dh_link -a
-	dh_strip -a --dbg-package=python-pyinotify-dbg
-	dh_compress -a
-	dh_fixperms -a
-	dh_pysupport -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+binary-arch:
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

Modified: packages/pyinotify/trunk/debian/watch
===================================================================
--- packages/pyinotify/trunk/debian/watch	2009-04-13 12:03:34 UTC (rev 8249)
+++ packages/pyinotify/trunk/debian/watch	2009-04-13 23:38:57 UTC (rev 8250)
@@ -1,4 +1,2 @@
 version=3
-# The first versions were named 0.06 and 0.07, while they logically are
-# 0.0.6 and 0.0.7, respectively.
-opts="uversionmangle=s/^0\.0([67])$/0\.0\.$1/" http://sf.net/pyinotify/pyinotify-(.*)\.tar\.bz2
+http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-(.*)\.tar\.gz




More information about the Python-modules-commits mailing list