[Python-modules-commits] r15289 - in packages/python-pysnmp4/branches/4.1.9a/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Tuesday, January 11, 2011 @ 22:07:06
  Author: jwilk
Revision: 15289

Make sure that pysnmp/__init__.py is removed from the python-pysnmp4 package even when built with python-support (>= 0.90). Thanks to adsb.

Modified:
  packages/python-pysnmp4/branches/4.1.9a/debian/changelog
  packages/python-pysnmp4/branches/4.1.9a/debian/control
  packages/python-pysnmp4/branches/4.1.9a/debian/rules

Modified: packages/python-pysnmp4/branches/4.1.9a/debian/changelog
===================================================================
--- packages/python-pysnmp4/branches/4.1.9a/debian/changelog	2011-01-11 21:54:28 UTC (rev 15288)
+++ packages/python-pysnmp4/branches/4.1.9a/debian/changelog	2011-01-11 22:07:06 UTC (rev 15289)
@@ -1,3 +1,12 @@
+python-pysnmp4 (4.1.9a-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Make sure that pysnmp/__init__.py is removed from the python-pysnmp4
+    package even when built with python-support (>= 0.90). Thanks to Adam D.
+    Barratt for spotting the bug.
+
+ -- Jakub Wilk <jwilk at debian.org>  Tue, 11 Jan 2011 23:04:21 +0100
+
 python-pysnmp4 (4.1.9a-1) unstable; urgency=low
 
   [ Arnaud Fontaine ]

Modified: packages/python-pysnmp4/branches/4.1.9a/debian/control
===================================================================
--- packages/python-pysnmp4/branches/4.1.9a/debian/control	2011-01-11 21:54:28 UTC (rev 15288)
+++ packages/python-pysnmp4/branches/4.1.9a/debian/control	2011-01-11 22:07:06 UTC (rev 15289)
@@ -18,7 +18,7 @@
          libsmi2ldbl,
          libsmi2-common,
          python-pyasn1,
-         python-pysnmp-common
+         python-pysnmp-common (>= 4.1.9a-2~)
 Recommends: python-crypto, python-pysnmp4-mibs, python-pysnmp4-apps
 Suggests: python-pysnmp4-doc
 Description: Python SNMP library for agents and managers (unstable branch)
@@ -51,6 +51,7 @@
 Package: python-pysnmp-common
 Architecture: all
 Depends: ${python:Depends}
+Breaks: 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)

Modified: packages/python-pysnmp4/branches/4.1.9a/debian/rules
===================================================================
--- packages/python-pysnmp4/branches/4.1.9a/debian/rules	2011-01-11 21:54:28 UTC (rev 15288)
+++ packages/python-pysnmp4/branches/4.1.9a/debian/rules	2011-01-11 22:07:06 UTC (rev 15289)
@@ -12,7 +12,7 @@
 DEB_DESTDIR=debian/python-pysnmp4
 
 binary-install/python-pysnmp4::
-	rm -f debian/python-pysnmp4/$(cdbs_python_support_path)/pysnmp/__init__.py
+	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