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

[jwilk at users.alioth.debian.org]

    Date: Wednesday, January 12, 2011 @ 11:42:53
  Author: jwilk
Revision: 15300

Merge changes from the 4.1.9a branch.

Modified:
  packages/python-pysnmp4/trunk/debian/changelog
  packages/python-pysnmp4/trunk/debian/control
  packages/python-pysnmp4/trunk/debian/rules

Modified: packages/python-pysnmp4/trunk/debian/changelog
===================================================================
--- packages/python-pysnmp4/trunk/debian/changelog	2011-01-12 03:54:59 UTC (rev 15299)
+++ packages/python-pysnmp4/trunk/debian/changelog	2011-01-12 11:42:53 UTC (rev 15300)
@@ -1,4 +1,4 @@
-python-pysnmp4 (4.1.13a-1) unstable; urgency=low
+python-pysnmp4 (4.1.13a-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Bumped Standard version to 3.8.4 (No changes).
@@ -27,6 +27,17 @@
   * debian/control:
     + switch Vcs-Browser field to viewsvn.
 
+  [ Jakub Wilk ]
+  * 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.
+  * Ensure that python-pysnmp{2,4,-common} use the same directory layout
+    (closes: #591503).
+    + Make python-pysnmp4 depend on python-pysnmp-common (>= 4.1.9a-2);
+    + Make python-pysnmp-common break and replace python-pysnmp2 (<< 2.0.9-3).
+    + Make python-pysnmp-common break python-pysnmp4 (<< 4.1.9a-2).
+    Thanks to Christoph Egger for the bug report.
+
  -- Deepak Tripathi <apenguinlinux at gmail.com>  Fri, 28 May 2010 10:06:05 +0530
 
 python-pysnmp4 (4.1.9a-1) unstable; urgency=low

Modified: packages/python-pysnmp4/trunk/debian/control
===================================================================
--- packages/python-pysnmp4/trunk/debian/control	2011-01-12 03:54:59 UTC (rev 15299)
+++ packages/python-pysnmp4/trunk/debian/control	2011-01-12 11:42:53 UTC (rev 15300)
@@ -20,7 +20,7 @@
          libsmi2ldbl,
          libsmi2-common,
          python-pyasn1,
-         python-pysnmp-common,
+         python-pysnmp-common (>= 4.1.9a-2~),
 	 ${misc:Depends}
 Recommends: python-crypto, python-pysnmp4-mibs, python-pysnmp4-apps, python-twisted
 Suggests: python-pysnmp4-doc, doc-base
@@ -55,6 +55,8 @@
 Package: python-pysnmp-common
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
+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)

Modified: packages/python-pysnmp4/trunk/debian/rules
===================================================================
--- packages/python-pysnmp4/trunk/debian/rules	2011-01-12 03:54:59 UTC (rev 15299)
+++ packages/python-pysnmp4/trunk/debian/rules	2011-01-12 11:42:53 UTC (rev 15300)
@@ -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