[Pkg-ocaml-maint-commits] [alt-ergo] 07/11: fix Makefile.users for dropping of non-free dirfectory

[Ralf Treinen]

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

treinen pushed a commit to branch experimental/master
in repository alt-ergo.

commit adf7037b482558d218107c61ecabd52d0f3db764
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Dec 30 18:40:01 2014 +0100

    fix Makefile.users for dropping of non-free dirfectory
---
 debian/changelog                     |  4 +++-
 debian/patches/0002-non-free-dropped | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1ba440c..1599f92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ alt-ergo (0.99.1+dfsg1-1) unstable; urgency=medium
     when config.status present.
   * update debian patch 0001-No-need-to-activate-debug-flag which now applies
     to the file Makefile.users
+  * new patch 0002-non-free-dropped: adapt Makefile.users to the removal of
+    the non-free directory.
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 30 Dec 2014 18:31:16 +0100
+ -- Ralf Treinen <treinen at debian.org>  Tue, 30 Dec 2014 18:39:34 +0100
 
 alt-ergo (0.95.2-3) sid; urgency=medium
 
diff --git a/debian/patches/0002-non-free-dropped b/debian/patches/0002-non-free-dropped
new file mode 100644
index 0000000..1d840f4
--- /dev/null
+++ b/debian/patches/0002-non-free-dropped
@@ -0,0 +1,35 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: adapt Makefile to the removal of the non-free directory
+
+Index: alt-ergo/Makefile.users
+===================================================================
+--- alt-ergo.orig/Makefile.users	2014-12-30 18:35:23.675323677 +0100
++++ alt-ergo/Makefile.users	2014-12-30 18:37:45.143325965 +0100
+@@ -3,8 +3,7 @@
+ VERSION=0.99.1
+ 
+ LOCAL_INC = -I src/util -I src/structures -I src/theories -I src/instances \
+-    -I src/sat -I src/preprocess -I src/parsing -I src/gui -I src/main \
+-    -I non-free/plugins/satML 
++    -I src/sat -I src/preprocess -I src/parsing -I src/gui -I src/main
+ 
+ INCLUDES = $(ZARITHLIB) $(OCAMLGRAPHLIB) $(LABLGTK2LIB) $(LOCAL_INC)
+ #for coverage # -I /usr/local/lib/ocaml/3.12.1/bisect -pp "camlp4o str.cma /usr/local/lib/ocaml/3.12.1/bisect/bisect_pp.cmo"
+@@ -245,7 +244,7 @@
+ #######
+ 
+ clean:
+-	@for dd in src/util src/structures src/theories src/instances src/sat src/preprocess src/parsing src/gui src/main non-free/plugins/satML ; do \
++	@for dd in src/util src/structures src/theories src/instances src/sat src/preprocess src/parsing src/gui src/main ; do \
+ 	rm -f $$dd/*.cm[ioxtp] $$dd/*.cmti $$dd/*.o $$dd/*~ $$dd/*.annot $$dd/*.owz;\
+ 	rm -f $(GENERATED) $$dd/*.output META ; \
+ 	rm -f $(NAME).byte $(NAME).opt $(GUINAME).opt $(GUINAME).byte *~; \
+@@ -257,7 +256,7 @@
+ ########
+ 
+ .depend depend: $(GENERATED)
+-	$(OCAMLDEP) -slash $(LOCAL_INC) src/util/*.ml* src/structures/*.ml* src/theories/*.ml* src/instances/*.ml* src/sat/*.ml* src/preprocess/*.ml* src/parsing/*.ml* src/gui/*.ml* src/main/*.ml* non-free/plugins/satML/*ml* > .depend
++	$(OCAMLDEP) -slash $(LOCAL_INC) src/util/*.ml* src/structures/*.ml* src/theories/*.ml* src/instances/*.ml* src/sat/*.ml* src/preprocess/*.ml* src/parsing/*.ml* src/gui/*.ml* src/main/*.ml* > .depend
+ 
+ include .depend
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 605b2ad..1d33aa5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-No-need-to-activate-debug-flag.patch
+0002-non-free-dropped

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git