[Python-modules-commits] r21847 - in packages/python-pysnmp4/trunk/debian (12 files)

arnau at users.alioth.debian.org arnau at users.alioth.debian.org
Mon May 21 07:32:38 UTC 2012


    Date: Monday, May 21, 2012 @ 07:32:36
  Author: arnau
Revision: 21847

* New upstream release. Closes: #620229, #585321.
* debian/control:
  + Remove myself from Maintainer as Jan L?\195?\188bbe is now the maintainer.
  + Bump Standards-Version to 3.9.3. No changes needed.
* Switch from deprecated python-support to dh_python2.
* Switch debian/copyright to machine-readable format.
* Add debian/source/options to fix double build issue because of
  .egg-info by ignoring it.

Added:
  packages/python-pysnmp4/trunk/debian/patches/
  packages/python-pysnmp4/trunk/debian/patches/fix-libsmi2pysnmp-with-python-less-than-2.7.patch
  packages/python-pysnmp4/trunk/debian/patches/series
  packages/python-pysnmp4/trunk/debian/source/options
Modified:
  packages/python-pysnmp4/trunk/debian/changelog
  packages/python-pysnmp4/trunk/debian/control
  packages/python-pysnmp4/trunk/debian/copyright
  packages/python-pysnmp4/trunk/debian/python-pysnmp-common.dirs
  packages/python-pysnmp4/trunk/debian/python-pysnmp-common.install
  packages/python-pysnmp4/trunk/debian/rules
Deleted:
  packages/python-pysnmp4/trunk/debian/pycompat
  packages/python-pysnmp4/trunk/debian/pyversions

Modified: packages/python-pysnmp4/trunk/debian/changelog
===================================================================
--- packages/python-pysnmp4/trunk/debian/changelog	2012-05-21 07:00:58 UTC (rev 21846)
+++ packages/python-pysnmp4/trunk/debian/changelog	2012-05-21 07:32:36 UTC (rev 21847)
@@ -1,10 +1,12 @@
-python-pysnmp4 (4.1.13a-1) UNRELEASED; urgency=low
+python-pysnmp4 (4.2.2-1) unstable; urgency=low
 
-  * New upstream release
+  * Team upload.
+
+  [ Deepak Tripathi ]
   * Bumped Standard version to 3.8.4 (No changes).
   * debian/control
      + added myself to uploaders.
-     + added ${misc:Depends}i because debhelper required now.
+     + added ${misc:Depends} because debhelper required now.
      + removed python-dev and added python.
      + added python-twisted as Depends.
      + added python-setuptools as BD.
@@ -12,7 +14,7 @@
      + added debian's copyright information.
      + formated and updated copy information.
   * debian/
-     + added python-pysnmp4-doc.doc-base because package has some 
+     + added python-pysnmp4-doc.doc-base because package has some
      html,pdf files.
   * debian/source
      + switch to dpkg-source 3.0 (quilt) format.
@@ -20,10 +22,16 @@
      + removed hyphen-used-as-minus-sign
 
   [ Arnaud Fontaine ]
+  * New upstream release. Closes: #620229, #585321.
   * debian/control:
-     + Remove myself from Maintainer as Jan Lübbe is now the maintainer.
+    + Remove myself from Maintainer as Jan Lübbe is now the maintainer.
+    + Bump Standards-Version to 3.9.3. No changes needed.
+  * Switch from deprecated python-support to dh_python2.
+  * Switch debian/copyright to machine-readable format.
+  * Add debian/source/options to fix double build issue because of
+    .egg-info by ignoring it.
 
- -- Deepak Tripathi <apenguinlinux at gmail.com>  Fri, 28 May 2010 10:06:05 +0530
+ -- Arnaud Fontaine <arnau at debian.org>  Mon, 21 May 2012 15:07:04 +0900
 
 python-pysnmp4 (4.1.9a-2) unstable; urgency=medium
 
@@ -90,7 +98,7 @@
       - Add DEB_PYTHON_SYSTEM=pysupport.
       - Clean debian/rules.
     + debian/control.in
-      - Clean Build-Depends and Depends, cdbs handles that 
+      - Clean Build-Depends and Depends, cdbs handles that
         automatically now.
       - XB-Python-Version and Provides for binary package.
     + debian/postinst && debian/prerm:

Modified: packages/python-pysnmp4/trunk/debian/control
===================================================================
--- packages/python-pysnmp4/trunk/debian/control	2012-05-21 07:00:58 UTC (rev 21846)
+++ packages/python-pysnmp4/trunk/debian/control	2012-05-21 07:32:36 UTC (rev 21847)
@@ -4,13 +4,13 @@
 Maintainer: Jan Lübbe <jluebbe at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
 	   Deepak Tripathi <apenguinlinux at gmail.com>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 5.0.37.2),
-               cdbs (>= 0.4.42), 
-               python,
-               python-support (>= 0.3),
+               cdbs (>= 0.4.90~), 
+               python-all (>= 2.6.6-3~),
 	       python-setuptools
 Homepage: http://pysnmp.sourceforge.net/
+X-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-pysnmp4/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-pysnmp4/trunk/
 
@@ -22,7 +22,10 @@
          python-pyasn1,
          python-pysnmp-common (>= 4.1.9a-2~),
 	 ${misc:Depends}
-Recommends: python-crypto, python-pysnmp4-mibs, python-pysnmp4-apps, python-twisted
+Recommends: python-crypto,
+            python-pysnmp4-mibs,
+            python-pysnmp4-apps,
+            python-twisted
 Suggests: python-pysnmp4-doc, doc-base
 Description: Python SNMP library for agents and managers (unstable branch)
  This  is a  Python implementation  of SNMP  v.1/v.2c/v.3  engine. Its
@@ -58,7 +61,6 @@
 Breaks: python-pysnmp2 (<< 2.0.9-3~), python-pysnmp4 (<< 4.1.9a-2~)
 Replaces: python-pysnmp2 (<< 2.0.9-3~)
 Recommends: python-pysnmp4
-XB-Python-Version: ${python:Versions}
 Description: Python SNMP library for agents and managers (version selection module)
  This is a Python implementation of SNMP v.1/v.2c/v.3 engine (SNMP v.3
  is  only supported  by  pysnmp4).  Its  general  functionality is  to

Modified: packages/python-pysnmp4/trunk/debian/copyright
===================================================================
--- packages/python-pysnmp4/trunk/debian/copyright	2012-05-21 07:00:58 UTC (rev 21846)
+++ packages/python-pysnmp4/trunk/debian/copyright	2012-05-21 07:32:36 UTC (rev 21847)
@@ -1,55 +1,63 @@
-This package was debianized by Arnaud Fontaine <arnau at debian.org> on
-Fri, 21 Apr 2006 08:07:03 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: pysnmp
+Upstream-Contact: Ilya Etingof <ilya at glas.net>
+Source: http://pysnmp.sourceforge.net/download.html
 
-It was downloaded from http://pysnmp.sourceforge.net/download.html
+Files: *
+Copyright: 1999-2012, Ilya Etingof <ilya at glas.net>, all rights reserved.
+License:
+ THIS SOFTWARE IS NOT  FAULT TOLERANT AND SHOULD NOT BE  USED IN ANY SITUATION
+ ENDANGERING HUMAN LIFE OR PROPERTY.
+ .
+ Redistribution  and  use  in  source   and  binary  forms,  with  or  without
+ modification, are permitted provided that the following conditions are met:
+ .
+   * Redistributions of  source code must  retain the above  copyright notice,
+     this list of conditions and the following disclaimer.
+ .
+   * Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+ .
+   * The name of  the authors may not  be used to endorse  or promote products
+     derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+ AND ANY  EXPRESS 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 REGENTS OR CONTRIBUTORS 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.
 
-Author: Ilya Etingof <ilya at glas.net>
-	
-	File: /pysnmp/carrier/twisted/base.py
-	Copyright (C) 2008 Truelite Srl <info at truelite.it>
-	Author: Filippo Giunchedi <filippo at truelite.it>
-	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
+Files: pysnmp/carrier/twisted/dispatch.py
+       pysnmp/carrier/twisted/base.py
+Copyright: 2008 Truelite Srl <info at truelite.it>
+License: GPL-2
 
-Copyright: 1999-2010, Ilya Etingof <ilya at glas.net>, all rights reserved.
+Files: debian/*
+Copyright: 2006-2012 Jan Lübbe <jluebbe at debian.org> 
+           2006-2012 Arnaud Fontaine <arnau at debian.org>
+           2010-2012 Deepak Tripathi <apenguinlinux at gmail.com>
+License: GPL-2
 
-   THIS SOFTWARE IS  NOT FAULT TOLERANT AND SHOULD NOT  BE USED IN ANY
-   SITUATION ENDANGERING HUMAN LIFE OR PROPERTY.
-
-   Redistribution and use in source  and binary forms, with or without
-   modification, are permitted  provided that the following conditions
-   are met:
-
-       * Redistributions  of   source  code  must   retain  the  above
-         copyright notice,  this list of conditions  and the following
-         disclaimer.
-
-       * Redistributions  in  binary  form  must reproduce  the  above
-         copyright notice,  this list of conditions  and the following
-         disclaimer  in  the   documentation  and/or  other  materials
-         provided with the distribution.
-
-       * The name of the authors may not be used to endorse or promote
-         products  derived from this  software without  specific prior
-         written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS 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
-   REGENTS  OR  CONTRIBUTORS  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.
-
---
-The Debian packaging is:
-  Copyright (C) 2010 Deepak Tripathi <apenguinlinux at gmail.com>,
-  Jan Lübbe <jluebbe at debian.org>, Arnaud Fontaine <arnau at debian.org>
-  and is licensed under the GPL version 2 or above,
-  see `/usr/share/common-licenses/GPL-2'.
+License: GPL-2
+ 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 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 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  package; if  not,  write  to the  Free  Software  Foundation, Inc.,  51
+ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of  the GNU General Public License version 2
+ can be found in the file `/usr/share/common-licenses/GPL-2'.

Added: packages/python-pysnmp4/trunk/debian/patches/fix-libsmi2pysnmp-with-python-less-than-2.7.patch
===================================================================
--- packages/python-pysnmp4/trunk/debian/patches/fix-libsmi2pysnmp-with-python-less-than-2.7.patch	                        (rev 0)
+++ packages/python-pysnmp4/trunk/debian/patches/fix-libsmi2pysnmp-with-python-less-than-2.7.patch	2012-05-21 07:32:36 UTC (rev 21847)
@@ -0,0 +1,21 @@
+Description: Fix to libsmi2pysnmp tool to make it working again in Python < 2.7
+Forwarded: not-needed
+Author: Ilya Etingof <ilya at glas.net>
+Applied-Upstream: 4.2.3rc1
+
+--- pysnmp-4.2.2/tools/libsmi2pysnmp	2012-04-03 01:22:12.000000000 +0900
++++ pysnmp-4.2.3rc1/tools/libsmi2pysnmp	2012-04-27 19:59:45.000000000 +0900
+@@ -357,11 +357,11 @@
+     while len(typedefs_left):
+         delayed = []
+         for t in typedefs_left:
+-            if t[1]['parent module']['name'] in { \
++            if t[1]['parent module']['name'] in ( \
+                 # implicitly imported MIBs
+                 'SNMPv2-TC',
+                 'SNMPv2-SMI'
+-                } or t[1]['parent module']['type'] in typedefs_seen:
++                ) or t[1]['parent module']['type'] in typedefs_seen:
+                 typedefs_seen.add(t[0])
+                 typedefs.append(t)
+                 continue

Added: packages/python-pysnmp4/trunk/debian/patches/series
===================================================================
--- packages/python-pysnmp4/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-pysnmp4/trunk/debian/patches/series	2012-05-21 07:32:36 UTC (rev 21847)
@@ -0,0 +1 @@
+fix-libsmi2pysnmp-with-python-less-than-2.7.patch

Deleted: packages/python-pysnmp4/trunk/debian/pycompat
===================================================================
--- packages/python-pysnmp4/trunk/debian/pycompat	2012-05-21 07:00:58 UTC (rev 21846)
+++ packages/python-pysnmp4/trunk/debian/pycompat	2012-05-21 07:32:36 UTC (rev 21847)
@@ -1 +0,0 @@
-2

Modified: packages/python-pysnmp4/trunk/debian/python-pysnmp-common.dirs
===================================================================
--- packages/python-pysnmp4/trunk/debian/python-pysnmp-common.dirs	2012-05-21 07:00:58 UTC (rev 21846)
+++ packages/python-pysnmp4/trunk/debian/python-pysnmp-common.dirs	2012-05-21 07:32:36 UTC (rev 21847)
@@ -1 +1 @@
-usr/share/python-support/python-pysnmp-common/pysnmp/
+usr/share/pyshared/pysnmp/

Modified: packages/python-pysnmp4/trunk/debian/python-pysnmp-common.install
===================================================================
--- packages/python-pysnmp4/trunk/debian/python-pysnmp-common.install	2012-05-21 07:00:58 UTC (rev 21846)
+++ packages/python-pysnmp4/trunk/debian/python-pysnmp-common.install	2012-05-21 07:32:36 UTC (rev 21847)
@@ -1 +1 @@
-pysnmp/__init__.py	usr/share/python-support/python-pysnmp-common/pysnmp/
+pysnmp/__init__.py	usr/share/pyshared/pysnmp/

Deleted: packages/python-pysnmp4/trunk/debian/pyversions
===================================================================
--- packages/python-pysnmp4/trunk/debian/pyversions	2012-05-21 07:00:58 UTC (rev 21846)
+++ packages/python-pysnmp4/trunk/debian/pyversions	2012-05-21 07:32:36 UTC (rev 21847)
@@ -1 +0,0 @@
-2.3-

Modified: packages/python-pysnmp4/trunk/debian/rules
===================================================================
--- packages/python-pysnmp4/trunk/debian/rules	2012-05-21 07:00:58 UTC (rev 21846)
+++ packages/python-pysnmp4/trunk/debian/rules	2012-05-21 07:32:36 UTC (rev 21847)
@@ -1,18 +1,17 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-DEB_PYTHON_SYSTEM=pysupport
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 # Don't compress .py files
 DEB_COMPRESS_EXCLUDE := .py
 
+DEB_PYTHON_INSTALL_ARGS_ALL += --install-layout=deb
 DEB_DESTDIR=debian/python-pysnmp4
 
 binary-install/python-pysnmp4::
 	rm -f debian/python-pysnmp4/usr/lib/python$(cdbs_python_current_version)/*-packages/pysnmp/__init__.py
 
 binary-install/python-pysnmp-common::
-	dh_pysupport -ppython-pysnmp-common
+	dh_python2 -ppython-pysnmp-common

Added: packages/python-pysnmp4/trunk/debian/source/options
===================================================================
--- packages/python-pysnmp4/trunk/debian/source/options	                        (rev 0)
+++ packages/python-pysnmp4/trunk/debian/source/options	2012-05-21 07:32:36 UTC (rev 21847)
@@ -0,0 +1 @@
+extend-diff-ignore = "\.egg-info"




More information about the Python-modules-commits mailing list