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

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

commit 0baf076f406e57b08efbe84a9a9c4429b2e7edd0
Author: Ralf Treinen <trei...@free.fr>
Date:   Sun Feb 28 20:26:20 2016 +0100

    refreshed patches
---
 debian/changelog                             |  2 +-
 debian/patches/0001-dont-activate-debug-flag |  6 +--
 debian/patches/0002-non-free-dropped         | 75 +++++++++++++++++++++++-----
 debian/patches/0003-allow-set-build-date     | 24 +++++----
 4 files changed, 80 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index effdb0a..f25eef0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 alt-ergo (1.01-1) UNRELEASED; urgency=medium
 
-  * new upstream version.
+  * new upstream version. Refreshed patches.
   * debian/watch: version 4. Add option pgpsigurlmangle.
 
  -- Ralf Treinen <trei...@debian.org>  Sun, 28 Feb 2016 20:15:31 +0100
diff --git a/debian/patches/0001-dont-activate-debug-flag 
b/debian/patches/0001-dont-activate-debug-flag
index 62404f2..5b789e1 100644
--- a/debian/patches/0001-dont-activate-debug-flag
+++ b/debian/patches/0001-dont-activate-debug-flag
@@ -4,9 +4,9 @@ Subject: No need to activate debug flag
 
 Index: alt-ergo/Makefile.users
 ===================================================================
---- alt-ergo.orig/Makefile.users       2014-12-30 18:27:36.311316118 +0100
-+++ alt-ergo/Makefile.users    2014-12-30 18:28:37.207317103 +0100
-@@ -9,7 +9,7 @@
+--- alt-ergo.orig/Makefile.users       2016-02-28 20:16:07.051631675 +0100
++++ alt-ergo/Makefile.users    2016-02-28 20:16:07.047631662 +0100
+@@ -10,7 +10,7 @@
  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"
  
diff --git a/debian/patches/0002-non-free-dropped 
b/debian/patches/0002-non-free-dropped
index 1d840f4..3514ede 100644
--- a/debian/patches/0002-non-free-dropped
+++ b/debian/patches/0002-non-free-dropped
@@ -3,33 +3,84 @@ 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
+--- alt-ergo.orig/Makefile.users       2016-02-28 20:18:15.144054395 +0100
++++ alt-ergo/Makefile.users    2016-02-28 20:21:15.712655282 +0100
+@@ -4,8 +4,6 @@
  
  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
+     -I src/sat -I src/preprocess -I src/parsing -I src/gui -I src/main \
+-    -I non-free/plugins/common -I non-free/plugins/satML -I 
non-free/plugins/profiler \
+-    -I non-free/plugins/fm-simplex
  
  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 @@
+@@ -242,7 +240,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 non-free/plugins/common 
non-free/plugins/satML non-free/plugins/common non-free/plugins/common 
non-free/plugins/profiler non-free/plugins/fm-simplex 
non-free/plugins/ctrl-alt-ergo; 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 @@
+@@ -254,11 +252,11 @@
  ########
  
  .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
+-      $(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/common/*ml* 
non-free/plugins/satML/*ml* non-free/plugins/fm-simplex/*ml* 
non-free/plugins/profiler/*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
  
+-#### BUILD & INSTALL non-free plugins and tools
++#### BUILD & INSTALL  plugins and tools
+ 
+ ifeq ($(OCAMLBEST),opt)
+ cae: ctrl-alt-ergo.opt
+@@ -266,21 +264,11 @@
+ cae: ctrl-alt-ergo.byte
+ endif
+ 
+-ctrl-alt-ergo.opt:
+-      cd non-free/ctrl-alt-ergo && $(OCAMLOPT) $(OFLAGS) -o 
../../ctrl-alt-ergo.opt $(BIBOPT) ctrlAltErgo.mli ctrlAltErgo.ml
+-
+-ctrl-alt-ergo.byte:
+-      cd non-free/ctrl-alt-ergo && $(OCAMLC) $(BFLAGS) -o 
../../ctrl-alt-ergo.byte $(BIBBYTE) ctrlAltErgo.mli ctrlAltErgo.ml
+-
+ install-cae: ctrl-alt-ergo.$(OCAMLBEST)
+       mkdir -p $(BINDIR)
+       cp -f ctrl-alt-ergo.$(OCAMLBEST) $(BINDIR)/ctrl-alt-ergo$(EXE)
+ 
+ 
+-SATML-CMO = non-free/plugins/common/vec.cmo \
+-            non-free/plugins/satML/satml.cmo \
+-            non-free/plugins/satML/satml_frontend.cmo
+-
+ SATML-CMX = $(SATML-CMO:.cmo=.cmx)
+ 
+ satML-plugin.cmxs: $(CMX) $(SATML-CMX)
+@@ -305,11 +293,6 @@
+ endif
+ 
+ 
+-FM-SIMPLEX-CMO = non-free/plugins/common/vec.cmo \
+-                 non-free/plugins/fm-simplex/simplex_cache.cmo \
+-                 non-free/plugins/fm-simplex/simplex.cmo \
+-                 non-free/plugins/fm-simplex/fmSimplexIneqs.cmo
+-
+ FM-SIMPLEX-CMX = $(FM-SIMPLEX-CMO:.cmo=.cmx)
+ 
+ fm-simplex-plugin.cmxs: $(CMX) $(FM-SIMPLEX-CMX)
+@@ -334,12 +317,6 @@
+ endif
+ 
+ 
+-profiler-plugin.cmxs: $(CMX) non-free/plugins/profiler/profiler.cmx
+-      $(if $(QUIET),@echo 'Library $@' &&) $(OCAMLOPT) $(INCLUDES)  -shared 
-o $@ non-free/plugins/profiler/profiler.cmx
+-
+-profiler-plugin.cma: $(CMO) non-free/plugins/profiler/profiler.cmo
+-      $(if $(QUIET),@echo 'Library $@' &&) $(OCAMLC) $(INCLUDES)  -a        
-o $@ non-free/plugins/profiler/profiler.cmo
+-
+ ifeq ($(OCAMLBEST),opt)
+ profiler: profiler-plugin.cmxs
+ else
diff --git a/debian/patches/0003-allow-set-build-date 
b/debian/patches/0003-allow-set-build-date
index 6a8de5c..3d019fc 100644
--- a/debian/patches/0003-allow-set-build-date
+++ b/debian/patches/0003-allow-set-build-date
@@ -5,20 +5,22 @@ Author: Juan Picca <jumap...@gmail.com>,
  updated by Jakub Wilk <jw...@debian.org>
 Last-Update: 2015-05-25
 ---
---- a/Makefile.users
-+++ b/Makefile.users
+Index: alt-ergo/Makefile.users
+===================================================================
+--- alt-ergo.orig/Makefile.users       2016-02-28 20:22:21.608875706 +0100
++++ alt-ergo/Makefile.users    2016-02-28 20:24:24.277287302 +0100
 @@ -1,4 +1,5 @@
  ARCH = $(shell uname -m)
 +BUILD_DATE ?= $(shell LANG=C date)
  
- VERSION=0.99.1
+ VERSION=$(shell grep "=" src/util/version.ml | cut -d"=" -f2 | head -n 1)
  
-@@ -157,7 +158,7 @@ endif
+@@ -153,7 +154,7 @@
+ .PHONY: gui
  
- src/util/version.ml: config.status
-       @echo "let version = \""$(VERSION)"\"" >> src/util/version.ml
--      @echo "let date = \""`LANG=en_US; date`"\"" >> src/util/version.ml
-+      @echo "let date = \""$(BUILD_DATE)"\"" >> src/util/version.ml
-       @echo "let bindir = \""$(BINDIR)"\"" >> src/util/version.ml
-       @echo "let libdir = \""$(LIBDIR)"\"" >> src/util/version.ml
-       @echo "let pluginsdir = \""$(PLUGINSDIR)"\"" >> src/util/version.ml
+ src/util/config.ml: config.status
+-      @echo "let date = \""`LANG=en_US; date`"\"" >> src/util/config.ml
++      @echo "let date = \""$(BUILD_DATE)"\"" >> src/util/config.ml
+       @echo "let bindir = \""$(BINDIR)"\"" >> src/util/config.ml
+       @echo "let libdir = \""$(LIBDIR)"\"" >> src/util/config.ml
+       @echo "let pluginsdir = \""$(PLUGINSDIR)"\"" >> src/util/config.ml

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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to