r2334 - in zc.lockfile/trunk/debian (10 files)

menesis-guest at users.alioth.debian.org menesis-guest at users.alioth.debian.org
Thu Jun 30 16:59:36 UTC 2011


    Date: Thursday, June 30, 2011 @ 16:59:35
  Author: menesis-guest
Revision: 2334

* Use dh_python2 instead of deprecated python-central. (Closes: #617153)
* Do not use python-van.pydeb.
* debian/control: build-depend on python-all (not -dev).
* debian/copyright: update, convert to dep5 format.
* debian/rules: fix override to really install zc/__init__.py.
* Switch to 3.0 (quilt) source format
* debian/patches/no_doc_txt.patch: add, do not write a doc.txt.

Added:
  zc.lockfile/trunk/debian/patches/
  zc.lockfile/trunk/debian/patches/no_doc_txt.patch
  zc.lockfile/trunk/debian/patches/series
  zc.lockfile/trunk/debian/source/
  zc.lockfile/trunk/debian/source/format
Modified:
  zc.lockfile/trunk/debian/changelog
  zc.lockfile/trunk/debian/control
  zc.lockfile/trunk/debian/copyright
  zc.lockfile/trunk/debian/rules
  zc.lockfile/trunk/debian/watch

Modified: zc.lockfile/trunk/debian/changelog
===================================================================
--- zc.lockfile/trunk/debian/changelog	2011-06-30 15:49:44 UTC (rev 2333)
+++ zc.lockfile/trunk/debian/changelog	2011-06-30 16:59:35 UTC (rev 2334)
@@ -1,3 +1,15 @@
+zc.lockfile (1.0.0-5) unstable; urgency=low
+
+  * Use dh_python2 instead of deprecated python-central. (Closes: #617153)
+  * Do not use python-van.pydeb.
+  * debian/control: build-depend on python-all (not -dev).
+  * debian/copyright: update, convert to dep5 format.
+  * debian/rules: fix override to really install zc/__init__.py.
+  * Switch to 3.0 (quilt) source format
+  * debian/patches/no_doc_txt.patch: add, do not write a doc.txt.
+
+ -- Gediminas Paulauskas <menesis at pov.lt>  Thu, 30 Jun 2011 19:58:11 +0300
+
 zc.lockfile (1.0.0-4) unstable; urgency=low
 
   * Convert to debhelper 7 and the pydeb dh7 extension.

Modified: zc.lockfile/trunk/debian/control
===================================================================
--- zc.lockfile/trunk/debian/control	2011-06-30 15:49:44 UTC (rev 2333)
+++ zc.lockfile/trunk/debian/control	2011-06-30 16:59:35 UTC (rev 2334)
@@ -3,19 +3,17 @@
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Brian Sutherland <brian at vanguardistas.net>, Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-4)
-Standards-Version: 3.8.3
-XS-Python-Version: all
-XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zc.lockfile/trunk
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3~), python-setuptools
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.4
+Homepage: http://pypi.python.org/pypi/zc.lockfile
+Vcs-Svn: svn://svn.debian.org/pkg-zope/zc.lockfile/trunk
 
 Package: python-zc.lockfile
 Architecture: all
-Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}
-Recommends: ${pydeb:Recommends}
-Provides: ${pydeb:Provides}, ${python:Provides}, python-zc
-Suggests: ${pydeb:Suggests}
+Depends: ${python:Depends}, ${misc:Depends}
+Provides: ${python:Provides}, python-zc
 Replaces: python-zc
-XB-Python-Version: ${python:Versions}
 Description: Basic inter-process locks
  The zc.lockfile package provides a basic portable implementation of
  interprocess locks using lock files. The purpose if not specifically to lock

Modified: zc.lockfile/trunk/debian/copyright
===================================================================
--- zc.lockfile/trunk/debian/copyright	2011-06-30 15:49:44 UTC (rev 2333)
+++ zc.lockfile/trunk/debian/copyright	2011-06-30 16:59:35 UTC (rev 2334)
@@ -1,74 +1,52 @@
-This package was debianized by Brian Sutherland <brian at vanguardistas.net>
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: zc.lockfile
+Upstream-Contact: Jim Fulton <jim at zope.com>
+Source: http://pypi.python.org/pypi/zc.lockfile
 
-It was downloaded from http://pypi.python.org/pypi/zc.lockfile
-
-Copyright:
-
-Upstream Author: Zope Corporation and Contributers <zope3-dev at zope.org>
-
-Files contain this header:
-
-# Copyright (c) 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-
-Zope Public License (ZPL) Version 2.1
--------------------------------------
-
-A copyright notice accompanies this license document that
-identifies the copyright holders.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in source code must retain the
-   accompanying copyright notice, this list of conditions,
-   and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying
-   copyright notice, this list of conditions, and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to
-   endorse or promote products derived from this software
-   without prior written permission from the copyright
-   holders.
-
-4. The right to distribute this software or to use it for
-   any purpose does not give you the right to use
-   Servicemarks (sm) or Trademarks (tm) of the copyright
-   holders. Use of them is covered by separate agreement
-   with the copyright holders.
-
-5. If any files are modified, you must cause the modified
-   files to carry prominent notices stating that you changed
-   the files and the date of any change.
-
-Disclaimer
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
-  AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-  NO EVENT SHALL THE COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGE.
+Files: *
+Copyright: (c) 2001, 2002, 2004 Zope Corporation and Contributors.
+License: Zope-2.1
+ Zope Public License (ZPL) Version 2.1
+ .
+ A copyright notice accompanies this license document that identifies the
+ copyright holders.
+ .
+ This license has been certified as open source. It has also been designated as
+ GPL compatible by the Free Software Foundation (FSF).
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions in source code must retain the accompanying copyright
+ notice, this list of conditions, and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the accompanying copyright
+ notice, this list of conditions, and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. Names of the copyright holders must not be used to endorse or promote
+ products derived from this software without prior written permission from the
+ copyright holders.
+ .
+ 4. The right to distribute this software or to use it for any purpose does not
+ give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+ copyright
+ holders. Use of them is covered by separate agreement with the copyright
+ holders.
+ .
+ 5. If any files are modified, you must cause the modified files to carry
+ prominent notices stating that you changed the files and the date of any
+ change.
+ .
+ Disclaimer
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Added: zc.lockfile/trunk/debian/patches/no_doc_txt.patch
===================================================================
--- zc.lockfile/trunk/debian/patches/no_doc_txt.patch	                        (rev 0)
+++ zc.lockfile/trunk/debian/patches/no_doc_txt.patch	2011-06-30 16:59:35 UTC (rev 2334)
@@ -0,0 +1,14 @@
+Do not write a doc.txt that gets added to debian diff. The same is in PKG-INFO.
+Index: zc.lockfile/setup.py
+===================================================================
+--- zc.lockfile.orig/setup.py
++++ zc.lockfile/setup.py
+@@ -33,8 +33,6 @@ long_description=(
+         '**********************\n'
+         )
+ 
+-open('doc.txt', 'w').write(long_description)
+-
+ setup(
+     name = name, version=version,
+     author = "Jim Fulton",

Added: zc.lockfile/trunk/debian/patches/series
===================================================================
--- zc.lockfile/trunk/debian/patches/series	                        (rev 0)
+++ zc.lockfile/trunk/debian/patches/series	2011-06-30 16:59:35 UTC (rev 2334)
@@ -0,0 +1 @@
+no_doc_txt.patch

Modified: zc.lockfile/trunk/debian/rules
===================================================================
--- zc.lockfile/trunk/debian/rules	2011-06-30 15:49:44 UTC (rev 2333)
+++ zc.lockfile/trunk/debian/rules	2011-06-30 16:59:35 UTC (rev 2334)
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with pydeb --with python-central $@
+	dh --with python2 $@
 
-overRIde_dh_install:
+override_dh_install:
 	# zc.lockfile provides the zc namespace __init__.py
 	for py in $(shell pyversions -vr debian/control); do \
-	    cp src/zope/__init__.py debian/python-zc.lockfile/usr/lib/python$$py/*-packages/zc/; \
+	    cp src/zc/__init__.py debian/python-zc.lockfile/usr/lib/python$$py/*-packages/zc/; \
 	done

Added: zc.lockfile/trunk/debian/source/format
===================================================================
--- zc.lockfile/trunk/debian/source/format	                        (rev 0)
+++ zc.lockfile/trunk/debian/source/format	2011-06-30 16:59:35 UTC (rev 2334)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: zc.lockfile/trunk/debian/watch
===================================================================
--- zc.lockfile/trunk/debian/watch	2011-06-30 15:49:44 UTC (rev 2333)
+++ zc.lockfile/trunk/debian/watch	2011-06-30 16:59:35 UTC (rev 2334)
@@ -1,3 +1,2 @@
 version=3
 http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-([0-9.]*)\.tar\.gz
-http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-([0-9.]*)\.zip




More information about the pkg-zope-developers mailing list