[Pkg-ocaml-maint-commits] [alt-ergo] 06/15: drop patch 0004-Add-rules-and-targets-for-gui.byte.patch

[Ralf Treinen]

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

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

commit eeac213cc26269b15f5e933b0408a448a08fd282
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date:   Tue Nov 5 15:33:25 2013 +0100

    drop patch 0004-Add-rules-and-targets-for-gui.byte.patch
---
 debian/changelog                                   |    1 +
 .../0004-Add-rules-and-targets-for-gui.byte.patch  |   72 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertion(+), 73 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56dd562..ba8101c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ alt-ergo (0.95.2-1) UNRELEASED; urgency=low
     for dh_auto_test to select the right test target.
   * drop patches that have been applied by upstream:
     - 0003-Fix-a-typo.patch
+    - 0004-Add-rules-and-targets-for-gui.byte.patch
 
  -- Ralf Treinen <treinen at debian.org>  Tue, 05 Nov 2013 14:16:57 +0100
 
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 2acea51..0000000
--- a/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Sat, 16 Apr 2011 00:46:35 +0200
-Subject: Add rules and targets for gui.byte
-Forwarded: https://gforge.inria.fr/tracker/index.php?func=detail&aid=15593&group_id=2340&atid=8106
-
-Index: alt-ergo/Makefile.in
-===================================================================
---- alt-ergo.orig/Makefile.in	2013-04-12 15:06:08.000000000 +0200
-+++ alt-ergo/Makefile.in	2013-04-12 15:09:59.000000000 +0200
-@@ -70,6 +70,7 @@
- #############
- 
- NAME = alt-ergo
-+GUINAME=altgr-ergo
- LIBNAME = altErgo
- BYTE=$(NAME).byte
- OPT=$(NAME).opt
-@@ -148,23 +149,23 @@
- 	$(if $(QUIET), at echo 'Linking $@' &&) 
- 	$(OCAMLOPT) $(OFLAGS) -o $@ $(BIBOPT) $^
- 
--.PHONY: gui
--
--ifeq ($(ENABLEGUI),yes)
--gui: altgr-ergo.opt
-+$(GUINAME).opt: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
-+	$(if $(QUIET), at echo 'Linking $@' &&) 
-+	$(OCAMLOPT) $(OFLAGS) -o $(GUINAME).opt $(BIBOPT) $(BIBGUIOPT) $^
- 
--altgr-ergo.opt: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
-+$(GUINAME).byte: $(PRECMO) $(OPTIONSCMO) $(GUICMO)
- 	$(if $(QUIET), at echo 'Linking $@' &&) 
--	$(OCAMLOPT) $(OFLAGS) -o altgr-ergo.opt $(BIBOPT) $(BIBGUIOPT) $^
-+	$(OCAMLC) $(BFLAGS) -o $(GUINAME).byte $(BIBBYTE) $(BIBGUIBYTE) $^
-+
-+ifeq ($(ENABLEGUI),yes)
-+gui: $(GUINAME).$(OCAMLBEST)
- else
--gui: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
-+gui:
- 	@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
-@@ -244,7 +245,7 @@
- 	mkdir -p $(BINDIR)
- 	cp -f $(NAME).$(OCAMLBEST) $(BINDIR)/$(NAME)$(EXE)
- ifeq ($(ENABLEGUI),yes)
--	cp -f altgr-ergo.opt $(BINDIR)/altgr-ergo$(EXE)
-+	cp -f $(GUINAME).$(OCAMLBEST) $(BINDIR)/$(GUINAME)$(EXE)
- 	mkdir -p $(DATADIR)/gtksourceview-2.0/language-specs
- 	cp -f util/gtk-lang/alt-ergo.lang $(DATADIR)/gtksourceview-2.0/language-specs/alt-ergo.lang
- endif
-@@ -399,10 +400,10 @@
- 	@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
--	@rm -f altgr-ergo.opt
- 	@rm -f *.$(REVISIONSUFFIX)
- 
- dist-clean distclean:: clean
diff --git a/debian/patches/series b/debian/patches/series
index f37769b..e4ee171 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-No-need-to-activate-debug-flag.patch
-0004-Add-rules-and-targets-for-gui.byte.patch
 0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch
 0007-Fix-all-target.patch
 0008-Split-install-pack-into-two-separate-targets-opt-and.patch

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