[med-svn] [oases] 02/09: Uhmm, oases relies on having the velvet *source* - that's a bit more than I can do now in a quick shot ...

[Andreas Tille]

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

tille pushed a commit to branch master
in repository oases.

commit 718759e7f64f61594fa2cc9e359469ad0d65fef1
Author: Andreas Tille <tille at debian.org>
Date:   Wed Nov 7 15:20:12 2012 +0000

    Uhmm, oases relies on having the velvet *source* - that's a bit more than I can do now in a quick shot ...
---
 debian/patches/fix-clean-target.patch           | 21 +++++++++++++++++++++
 debian/patches/series                           |  2 ++
 debian/patches/use-debian-packaged-velvet.patch | 20 ++++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/debian/patches/fix-clean-target.patch b/debian/patches/fix-clean-target.patch
new file mode 100644
index 0000000..85f03f1
--- /dev/null
+++ b/debian/patches/fix-clean-target.patch
@@ -0,0 +1,21 @@
+From: Andreas Tille <tille at debian.org>
+Subject: Enable flawless cleaning up
+
+--- a/Makefile
++++ b/Makefile
+@@ -78,7 +78,6 @@ velvetdbg_de :
+ 
+ clean :
+ 	rm -f obj/*.o obj/dbg/*.o ./oases 
+-	cd $(VELVET_DIR) && make clean
+ 	cd doc && make clean
+ 
+ cleanobj: 
+--- a/doc/manual/Makefile
++++ b/doc/manual/Makefile
+@@ -5,4 +5,4 @@ default:
+ 	mv *.pdf ../../
+ 
+ clean:
+-	rm *.aux *.toc *.log *.out
++	rm -f *.aux *.toc *.log *.out
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ff96e6f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-clean-target.patch
+use-debian-packaged-velvet.patch
diff --git a/debian/patches/use-debian-packaged-velvet.patch b/debian/patches/use-debian-packaged-velvet.patch
new file mode 100644
index 0000000..c5dbe10
--- /dev/null
+++ b/debian/patches/use-debian-packaged-velvet.patch
@@ -0,0 +1,20 @@
+From: Andreas Tille <tille at debian.org>
+Subject: Try to use Debian packaged velvet
+  PROBLEM:  THIS DOES NOT WORK
+  The build system actually relies on re-building
+  velvet and needs velvet source files.
+  .
+  That's a more serious thing than I could solve in a
+  quick shot at this program.
+
+--- a/Makefile
++++ b/Makefile
+@@ -29,7 +29,7 @@ ifdef SINGLE_COV_CAT
+ override DEF := $(DEF) -D SINGLE_COV_CAT
+ endif
+ 
+-default : cleanobj velvet oases doc
++default : cleanobj oases doc
+ 
+ ifdef BUNDLEDZLIB
+ Z_LIB_DIR=$(VELVET_DIR)/third-party/zlib-1.2.3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/oases.git