[libfann] 88/133: Move Python examples into the -doc package

[Christian Kastner]

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

chrisk-guest pushed a commit to branch master
in repository libfann.

commit 46b90e144f363daf720dc46b0fcd07767da723a7
Author: Christian Kastner <debian at kvr.at>
Date:   Tue Jun 7 15:59:00 2011 +0200

    Move Python examples into the -doc package
---
 debian/README-pyfann-examples-data |  2 --
 debian/python-pyfann.examples      |  1 -
 debian/rules                       | 11 +++++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/README-pyfann-examples-data b/debian/README-pyfann-examples-data
deleted file mode 100644
index e658992..0000000
--- a/debian/README-pyfann-examples-data
+++ /dev/null
@@ -1,2 +0,0 @@
-IMPORTANT NOTE: package libfann-doc must be installed for the examples in this
-directory to work!
diff --git a/debian/python-pyfann.examples b/debian/python-pyfann.examples
deleted file mode 100644
index c885c15..0000000
--- a/debian/python-pyfann.examples
+++ /dev/null
@@ -1 +0,0 @@
-python/examples/*
diff --git a/debian/rules b/debian/rules
index 5710c95..b21b5e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,6 +69,10 @@ override_dh_strip:
 override_dh_installexamples:
 	# Perform regular examples install process
 	dh_installexamples
+
+	# Copy python examples to a subdir in examples/
+	cp -r python/examples \
+		debian/libfann-doc/usr/share/doc/libfann-doc/examples/python
 	
 	# Remove unnecessary executable bits from training data sets
 	chmod 644 debian/libfann-doc/usr/share/doc/libfann-doc/examples/datasets/*
@@ -78,18 +82,13 @@ override_dh_installexamples:
 	# run upstream's own tests within the source dir.
 	sed -i -f debian/example-paths.sed \
 		debian/libfann-doc/usr/share/doc/libfann-doc/examples/*.c \
-		debian/python-pyfann/usr/share/doc/python-pyfann/examples/*.py
+		debian/libfann-doc/usr/share/doc/libfann-doc/examples/python/*.py
 	
 	# Add Makefile & compile/run instructions for the examples
 	cp debian/Makefile.examples \
 		debian/libfann-doc/usr/share/doc/libfann-doc/examples/Makefile
 	cp debian/README-libfann2-examples \
 		debian/libfann-doc/usr/share/doc/libfann-doc/examples/README
-	
-	# Add a warning to the python examples that they require data from
-	# libfann-doc
-	cp debian/README-pyfann-examples-data \
-		debian/python-pyfann/usr/share/doc/python-pyfann/examples/README
 
 override_dh_link:
 	rm -rf debian/libfann-dbg/usr/share/doc/libfann-dbg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git