[Pkg-ocaml-maint-commits] [SCM] alt-ergo packaging branch, experimental/master, updated. debian/0.94-2-15-gf4ba249

Thu Apr 4 12:17:40 UTC 2013

The following commit has been merged in the experimental/master branch:
commit 4890c568b40dd3a2f5ee895d2fe8f46dfd7d6885
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date:   Thu Apr 4 14:08:52 2013 +0200

    restore patch 0004-Add-rules-and-targets-for-gui.byte, adapt to new uspstream

diff --git a/debian/changelog b/debian/changelog
index 11a6976..e9d4606 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,15 +6,14 @@ alt-ergo (0.95.1-1) UNRELEASED; urgency=low
      0001-No-need-to-activate-debug-flag.patch
      0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch
      0003-Fix-a-typo.patch
+     0004-Add-rules-and-targets-for-gui.byte.patch
      0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2
      0006-PRECM-O-X-is-needed-to-link-altgr-ergo
      0007-Fix-all-target
      0008-Split-install-pack-into-two-separate-targets-opt-and
      0009-fix-install-gui-target
-  * Drop patches since issue is fixed upstream:
-     0004-Add-rules-and-targets-for-gui.byte.patch
   
- -- Ralf Treinen <treinen at debian.org>  Wed, 03 Apr 2013 20:58:36 +0200
+ -- Ralf Treinen <treinen at debian.org>  Thu, 04 Apr 2013 14:06:25 +0200
 
 alt-ergo (0.94-2) unstable; urgency=high
 
diff --git a/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch b/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch
new file mode 100644
index 0000000..9d00a61
--- /dev/null
+++ b/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch
@@ -0,0 +1,60 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sat, 16 Apr 2011 00:46:35 +0200
+Subject: Add rules and targets for gui.byte
+
+
+Index: alt-ergo/Makefile.in
+===================================================================
+--- alt-ergo.orig/Makefile.in	2013-04-04 12:04:54.000000000 +0200
++++ alt-ergo/Makefile.in	2013-04-04 12:16:54.000000000 +0200
+@@ -70,6 +70,7 @@
+ #############
+ 
+ NAME = alt-ergo
++GUINAME=altgr-ergo
+ LIBNAME = altErgo
+ BYTE=$(NAME).byte
+ OPT=$(NAME).opt
+@@ -148,23 +149,24 @@
+ 	$(if $(QUIET), at echo 'Linking $@' &&) 
+ 	$(OCAMLOPT) $(OFLAGS) -o $@ $(BIBOPT) $^
+ 
+-.PHONY: gui
+-
+-ifeq ($(ENABLEGUI),yes)
+-gui: altgr-ergo.opt
+-
+-altgr-ergo.opt: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
++$(GUINAME).opt: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
+ 	$(if $(QUIET), at echo 'Linking $@' &&) 
+ 	$(OCAMLOPT) $(OFLAGS) -o altgr-ergo.opt $(BIBOPT) $(BIBGUIOPT) $^
++
++$(GUINAME).byte: $(PRECMO) $(OPTIONSCMO) $(GUICMO)
++	$(if $(QUIET), at echo 'Linking $@' &&) 
++	$(OCAMLC) $(BFLAGS) -o altgr-ergo.byte $(BIBBYTE) $(BIBGUIBYTE) $^
++
++ifeq ($(ENABLEGUI),yes)
++gui $(GUINAME): $(GUINAME).$(OCAMLBEST)
++	cp $^ $@
+ else
+-gui: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
++gui $(GUINAME):
+ 	@echo "gui compilation skipped (lablgtksourceview not detected)"
+ endif
+ 
++.PHONY:: gui
+ 
+-guibyte: $(PRECMO) $(OPTIONSCMO) $(GUICMO)
+-	$(if $(QUIET), at echo 'Linking $@' &&) 
+-	$(OCAMLC) $(BFLAGS) -o altgr-ergo.byte $(BIBBYTE) $(BIBGUIBYTE) $^
+ 
+ test: $(NAME).$(OCAMLBEST)
+ 	[ ! -f test.mlw ] || ./$^ test.mlw
+@@ -399,6 +401,7 @@
+ 	@rm -f *.cm[ioxt] *.cmti *.o *~ *.annot *.owz *mlocamlwizard_tmp_file*
+ 	@rm -f $(GENERATED) *.output
+ 	@rm -f $(NAME).byte $(NAME).opt
++	@rm -f $(GUINAME) $(GUINAME).opt $(GUINAME).byte
+ 	@rm -f unittest/*.cm[iox] unittest/*.o unittest/*.annot
+ 	@rm -f *.aux *.log $(NAME).tex $(NAME).dvi $(NAME).ps
+ 	@rm -f version.ml
diff --git a/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch b/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch
index 2fc0c96..9d7dbb5 100644
--- a/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch
+++ b/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch
@@ -4,9 +4,9 @@ Subject: PRECM{O,X} is needed to link altgr-ergo
 
 Index: alt-ergo/Makefile.in
 ===================================================================
---- alt-ergo.orig/Makefile.in	2013-04-03 21:09:54.000000000 +0200
-+++ alt-ergo/Makefile.in	2013-04-03 21:13:22.000000000 +0200
-@@ -115,7 +115,7 @@
+--- alt-ergo.orig/Makefile.in	2013-04-04 14:06:41.000000000 +0200
++++ alt-ergo/Makefile.in	2013-04-04 14:06:46.000000000 +0200
+@@ -116,7 +116,7 @@
  
  
  ifeq ($(ENABLEGUI),yes)
diff --git a/debian/patches/0007-Fix-all-target.patch b/debian/patches/0007-Fix-all-target.patch
index e18faaf..4fe76a1 100644
--- a/debian/patches/0007-Fix-all-target.patch
+++ b/debian/patches/0007-Fix-all-target.patch
@@ -8,9 +8,9 @@ Subject: Fix 'all' target
 
 Index: alt-ergo/Makefile.in
 ===================================================================
---- alt-ergo.orig/Makefile.in	2013-04-03 21:21:10.000000000 +0200
-+++ alt-ergo/Makefile.in	2013-04-03 21:21:10.000000000 +0200
-@@ -74,7 +74,13 @@
+--- alt-ergo.orig/Makefile.in	2013-04-04 14:07:02.000000000 +0200
++++ alt-ergo/Makefile.in	2013-04-04 14:07:14.000000000 +0200
+@@ -75,7 +75,13 @@
  BYTE=$(NAME).byte
  OPT=$(NAME).opt
  
diff --git a/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch b/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch
index 8006793..a4cc9e1 100644
--- a/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch
+++ b/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch
@@ -4,9 +4,9 @@ Subject: Split install-pack into two separate targets (opt and byte)
 
 Index: alt-ergo/Makefile.in
 ===================================================================
---- alt-ergo.orig/Makefile.in	2013-04-03 21:28:55.000000000 +0200
-+++ alt-ergo/Makefile.in	2013-04-03 21:33:19.000000000 +0200
-@@ -255,14 +255,21 @@
+--- alt-ergo.orig/Makefile.in	2013-04-04 14:07:29.000000000 +0200
++++ alt-ergo/Makefile.in	2013-04-04 14:07:43.000000000 +0200
+@@ -257,14 +257,21 @@
  	cp -f util/gtk-lang/alt-ergo.lang $(DATADIR)/gtksourceview-2.0/language-specs/alt-ergo.lang
  endif
  
diff --git a/debian/patches/0009-fix-install-gui-target.patch b/debian/patches/0009-fix-install-gui-target.patch
index d419768..2dfcd2f 100644
--- a/debian/patches/0009-fix-install-gui-target.patch
+++ b/debian/patches/0009-fix-install-gui-target.patch
@@ -4,9 +4,9 @@ Subject: 'fix' install-gui target
 
 Index: alt-ergo/Makefile.in
 ===================================================================
---- alt-ergo.orig/Makefile.in	2013-04-03 21:36:11.000000000 +0200
-+++ alt-ergo/Makefile.in	2013-04-03 21:40:12.000000000 +0200
-@@ -250,7 +250,7 @@
+--- alt-ergo.orig/Makefile.in	2013-04-04 14:07:55.000000000 +0200
++++ alt-ergo/Makefile.in	2013-04-04 14:08:05.000000000 +0200
+@@ -252,7 +252,7 @@
  	mkdir -p $(BINDIR)
  	cp -f $(NAME).$(OCAMLBEST) $(BINDIR)/$(NAME)$(EXE)
  ifeq ($(ENABLEGUI),yes)
diff --git a/debian/patches/series b/debian/patches/series
index 97720c1..834f7f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 0001-No-need-to-activate-debug-flag.patch
 0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch
 0003-Fix-a-typo.patch
+0004-Add-rules-and-targets-for-gui.byte.patch
 0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch
 0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch
 0007-Fix-all-target.patch

-- 
alt-ergo packaging

