[Python-modules-commits] [myhdl] 01/01: Avoiding conflict over cosimulation folder

[Steffen Möller]

This is an automated email from the git hooks/post-receive script.

moeller pushed a commit to branch master
in repository myhdl.

commit 8b582782643f2eb055b835cb4214c80ac974df78
Author: Steffen Moeller <moeller at debian.org>
Date:   Fri Nov 11 08:39:20 2016 +0100

    Avoiding conflict over cosimulation folder
---
 debian/README.source                  | 10 ++++++++++
 debian/control                        | 14 ++++++++++++++
 debian/python-myhdl-cosimulation.dirs |  1 +
 debian/rules                          |  8 ++++++++
 4 files changed, 33 insertions(+)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..20827ce
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,10 @@
+MyHDL
+=====
+
+No particular changes to the source tree were required. Only, the python3
+and python2 packages share the usr/share/myhdl/cosimulation folder which
+was hence moved to a common folder which both binary packages then have
+as a dependency.
+
+--
+  Steffen Moeller <moeller at debian.org>  Fri, 11 Nov 2016 08:25:42 +0100
diff --git a/debian/control b/debian/control
index 03cec1f..89ae13c 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/myhdl.git/
 Package: python-myhdl
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
+Recommends: python-myhdl-cosimulation
 Suggests: python-myhdl-doc
 Description: Hardware description generating framework (Python 2)
  MyHDL provides Python routines for embedding programmable hardware,
@@ -27,6 +28,7 @@ Description: Hardware description generating framework (Python 2)
 Package: python3-myhdl
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}
+Recommends: python-myhdl-cosimulation
 Suggests: python-myhdl-doc
 Description: Hardware description generating framework (Python 3)
  MyHDL provides Python routines for embedding programmable hardware,
@@ -36,6 +38,18 @@ Description: Hardware description generating framework (Python 3)
  .
  This package installs the library for Python 3.
 
+Package: python-myhdl-cosimulation
+Architecture: all
+Depends: ${misc:Depends}
+Description: MyHDL cosimulation files
+ MyHDL provides Python routines for embedding programmable hardware,
+ as in Field Programmable Gate Arrays (FPGA) in regular python code.
+ It may be used for complete products and for test environments
+ alike, can generate and interact with existing VHDL or Verilog code.
+ .
+ This package provides the sources for executable extensions of the
+ core modules.
+
 Package: python-myhdl-doc
 Architecture: all
 Section: doc
diff --git a/debian/python-myhdl-cosimulation.dirs b/debian/python-myhdl-cosimulation.dirs
new file mode 100644
index 0000000..076c858
--- /dev/null
+++ b/debian/python-myhdl-cosimulation.dirs
@@ -0,0 +1 @@
+usr/share/myhdl
diff --git a/debian/rules b/debian/rules
index 2c936f3..03f6337 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,3 +14,11 @@ override_dh_auto_build:
 	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml doc/source/ build/html # HTML generator
 	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bman  doc/source/ build/man # Manpage generator
 
+override_dh_auto_install:
+	dh_auto_install
+	rm -r debian/python3-myhdl/usr/share/myhdl/cosimulation
+	if [ -d debian/python-myhdl-cosimulation/usr/share/myhdl/cosimulation ]; then \
+	  echo "I: Forgot to clean up prior to build? Otherwise investigate existence of debian/python-myhdl-cosimulation/usr/share/myhdl/cosimulation"; \
+	  rm -r debian/python-myhdl-cosimulation/usr/share/myhdl/cosimulation; \
+	fi
+	mv debian/python-myhdl/usr/share/myhdl/cosimulation debian/python-myhdl-cosimulation/usr/share/myhdl/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/myhdl.git