The following commit has been merged in the experimental/master branch:
commit 4310f0edfa4693e2e4adea301543b66562561574
Author: Ralf Treinen <trei...@free.fr>
Date:   Wed Apr 3 20:59:59 2013 +0200

    drop patch 0004-Add-rules-and-targets-for-gui.byte since fixed upstream

diff --git a/debian/changelog b/debian/changelog
index cfed018..f87eaba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,10 @@ 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
+  * Drop patches since issue is fixed upstream:
+     0004-Add-rules-and-targets-for-gui.byte.patch
   
-  
-  
- -- treinen <trei...@debian.org>  Wed, 03 Apr 2013 17:02:05 +0200
+ -- Ralf Treinen <trei...@debian.org>  Wed, 03 Apr 2013 20:58:36 +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
deleted file mode 100644
index d61f138..0000000
--- a/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Mehdi Dogguy <me...@debian.org>
-Date: Sat, 16 Apr 2011 00:46:35 +0200
-Subject: Add rules and targets for gui.byte
-
----
- Makefile.in |   14 ++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 5cc8092..6a84eb4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -63,11 +63,13 @@ BIBBYTE = nums.cma graph.cma unix.cma
- BIBOPT = $(BIBBYTE:.cma=.cmxa)
- 
- BIBGUIOPT = threads.cmxa lablgtk.cmxa lablgtksourceview2.cmxa gtkThread.cmx 
-+BIBGUIBYTE= threads.cma  lablgtk.cma  lablgtksourceview2.cma  gtkThread.cmo
- 
- # main target
- #############
- 
- NAME = alt-ergo
-+GUINAME = altgr-ergo
- LIBNAME = altErgo
- BYTE=$(NAME).byte
- OPT=$(NAME).opt
-@@ -141,9 +143,16 @@ $(NAME).opt: $(PRECMX) $(OPTIONSCMX) $(MAINCMX)
-       $(if $(QUIET),@echo 'Linking $@' &&) 
-       $(OCAMLOPT) $(OFLAGS) -o $@ $(BIBOPT) $^
- 
--gui: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
-+$(GUINAME).opt: $(GUICMX)
-       $(if $(QUIET),@echo 'Linking $@' &&) 
--      $(OCAMLOPT) $(OFLAGS) -o altgr-ergo.opt $(BIBOPT) $(BIBGUIOPT) $^
-+      $(OCAMLOPT) $(OFLAGS) -o $@ $(BIBOPT) $(BIBGUIOPT) $^
-+
-+$(GUINAME).byte: $(GUICMO)
-+      $(if $(QUIET),@echo 'Linking $@' &&)
-+      $(OCAMLC) $(OFLAGS) -o $@ $(BIBBYTE) $(BIBGUIBYTE) $^
-+
-+$(GUINAME) gui: $(GUINAME).$(OCAMLBEST)
-+      cp $^ $@
- 
- test: $(NAME).$(OCAMLBEST)
-       [ ! -f test.mlw ] || ./$^ test.mlw
-@@ -351,6 +360,7 @@ clean::
-       @rm -f *.cm[iox] *.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/series b/debian/patches/series
index 834f7f1..97720c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 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

_______________________________________________
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