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

[bernat at users.alioth.debian.org]

    Date: Thursday, February 20, 2014 @ 22:48:00
  Author: bernat
Revision: 27795

Depends on ieee-data instead of shipping oui.txt and iab.txt.
Closes: #739197. Closes: #739198.

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

Modified: packages/python-netaddr/trunk/debian/changelog
===================================================================
--- packages/python-netaddr/trunk/debian/changelog	2014-02-20 17:45:44 UTC (rev 27794)
+++ packages/python-netaddr/trunk/debian/changelog	2014-02-20 22:48:00 UTC (rev 27795)
@@ -1,3 +1,10 @@
+python-netaddr (0.7.10-2) UNRELEASED; urgency=medium
+
+  * Depends on ieee-data instead of shipping oui.txt and iab.txt.
+    Closes: #739197. Closes: #739198.
+
+ -- Vincent Bernat <bernat at debian.org>  Mon, 17 Feb 2014 21:56:51 +0100
+
 python-netaddr (0.7.10-1) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/python-netaddr/trunk/debian/control
===================================================================
--- packages/python-netaddr/trunk/debian/control	2014-02-20 17:45:44 UTC (rev 27794)
+++ packages/python-netaddr/trunk/debian/control	2014-02-20 22:48:00 UTC (rev 27795)
@@ -3,12 +3,13 @@
 Priority: optional
 Maintainer: Vincent Bernat <bernat at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 8),
 	       cdbs (>= 0.4.90~),
 	       python (>= 2.6.5), python3 (>= 3.2),
 	       python-setuptools (>= 0.6b3),
-               python-sphinx (>= 1.0.7+dfsg) | python3-sphinx
+               python-sphinx (>= 1.0.7+dfsg) | python3-sphinx,
+               ieee-data
 Homepage: https://github.com/drkjam/netaddr/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-netaddr/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-netaddr/trunk/
@@ -17,7 +18,7 @@
 
 Package: python-netaddr
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ieee-daa
 Suggests: ipython, python-netaddr-docs
 Description: manipulation of various common network address notations (Python 2)
  netaddr is a Python library for the manipulation of various common
@@ -39,7 +40,7 @@
 
 Package: python3-netaddr
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}, ieee-data
 Suggests: ipython3, python-netaddr-docs
 Description: manipulation of various common network address notations (Python 3)
  netaddr is a Python library for the manipulation of various common

Modified: packages/python-netaddr/trunk/debian/rules
===================================================================
--- packages/python-netaddr/trunk/debian/rules	2014-02-20 17:45:44 UTC (rev 27794)
+++ packages/python-netaddr/trunk/debian/rules	2014-02-20 22:48:00 UTC (rev 27795)
@@ -4,6 +4,16 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
+# ieee-data
+python_module_path=$(if $(filter python2,$(cdbs_curpythonsystems)),/usr/share/pyshared,/usr/lib/python3/dist-packages)
+binary-fixup/python-netaddr binary-fixup/python3-netaddr::
+	rm $(CURDIR)/debian/$(cdbs_curpkg)$(python_module_path)/netaddr/eui/iab.*
+	rm $(CURDIR)/debian/$(cdbs_curpkg)$(python_module_path)/netaddr/eui/oui.*
+	ln -s /usr/share/ieee-data/oui.txt $(CURDIR)/debian/$(cdbs_curpkg)$(python_module_path)/netaddr/eui/
+	ln -s /usr/share/ieee-data/iab.txt $(CURDIR)/debian/$(cdbs_curpkg)$(python_module_path)/netaddr/eui/
+	PYTHONPATH=$(CURDIR) $(cdbs_curpythonindepbinary) \
+		$(CURDIR)/debian/$(cdbs_curpkg)$(python_module_path)/netaddr/eui/ieee.py
+
 # Documentation
 build/python-netaddr-docs::
 	PYTHONPATH=$(CURDIR) sphinx-build -q docs/source docs/api
@@ -13,8 +23,7 @@
 # Tests
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 install/python-netaddr install/python3-netaddr::
-	$(call cdbs_python_binary,python$(cdbs_python_compile_version)) \
-		debian/runtests.py .
+	$(cdbs_curpythonindepbinary) debian/runtests.py .
 endif
 
 clean::