[Pkg-net-snmp-commits] r278 - branches/net-snmp54/debian branches/net-snmp54-dev/debian trunk/debian

[Jochen Friedrich]

Author: jochen
Date: 2009-11-02 17:50:34 +0000 (Mon, 02 Nov 2009)
New Revision: 278

Modified:
   branches/net-snmp54-dev/debian/rules
   branches/net-snmp54/debian/rules
   trunk/debian/rules
Log:
Python updates. Fixes #519953 and #552976.


Modified: branches/net-snmp54/debian/rules
===================================================================
--- branches/net-snmp54/debian/rules	2009-11-02 16:49:17 UTC (rev 277)
+++ branches/net-snmp54/debian/rules	2009-11-02 17:50:34 UTC (rev 278)
@@ -8,6 +8,8 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+include /usr/share/python/python.mk
+
 LIB_VERSION = 15
 UPSTREAM_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ':' | sed 's/ //' | sed 's/~dfsg.*$$//')
 COMPAT_VERSION = $(UPSTREAM_VERSION)~dfsg
@@ -100,8 +102,8 @@
 debian/python-install-stamp-%:
 	# Build python modules manually as the net-snmp Makefile is too limited.
 	cd python; python$* setup.py install --root $(CURDIR)/debian/tmp
-	mv debian/tmp/usr/lib/python$*/site-packages/netsnmp_python-$(PYTHON_VERSION)-py$*.egg-info \
-	   debian/tmp/usr/lib/python$*/site-packages/netsnmp_python.egg-info
+	mv debian/tmp/usr/lib/python$*/$(call py_sitename, $*)/netsnmp_python-$(PYTHON_VERSION).egg-info \
+	   debian/tmp/usr/lib/python$*/$(call py_sitename, $*)/netsnmp_python.egg-info
 	touch $@
 
 binary-install/libsnmp-python::

Modified: branches/net-snmp54-dev/debian/rules
===================================================================
--- branches/net-snmp54-dev/debian/rules	2009-11-02 16:49:17 UTC (rev 277)
+++ branches/net-snmp54-dev/debian/rules	2009-11-02 17:50:34 UTC (rev 278)
@@ -100,7 +100,7 @@
 debian/python-install-stamp-%:
 	# Build python modules manually as the net-snmp Makefile is too limited.
 	cd python; python$* setup.py install --root $(CURDIR)/debian/tmp
-	mv debian/tmp/usr/lib/python$*/site-packages/netsnmp_python-$(PYTHON_VERSION)-py$*.egg-info \
+	mv debian/tmp/usr/lib/python$*/site-packages/netsnmp_python-$(PYTHON_VERSION).egg-info \
 	   debian/tmp/usr/lib/python$*/site-packages/netsnmp_python.egg-info
 	touch $@
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-11-02 16:49:17 UTC (rev 277)
+++ trunk/debian/rules	2009-11-02 17:50:34 UTC (rev 278)
@@ -100,7 +100,7 @@
 debian/python-install-stamp-%:
 	# Build python modules manually as the net-snmp Makefile is too limited.
 	cd python; python$* setup.py install --root $(CURDIR)/debian/tmp
-	mv debian/tmp/usr/lib/python$*/site-packages/netsnmp_python-$(PYTHON_VERSION)-py$*.egg-info \
+	mv debian/tmp/usr/lib/python$*/site-packages/netsnmp_python-$(PYTHON_VERSION).egg-info \
 	   debian/tmp/usr/lib/python$*/site-packages/netsnmp_python.egg-info
 	touch $@