The following commit has been merged in the experimental/master branch:
commit f1eab69a9f433b932b7d6c4a41b81b00881499be
Author: Ralf Treinen <trei...@free.fr>
Date: Wed Apr 3 21:43:30 2013 +0200
adapt patch 0009-fix-install-gui-target to new upstream
diff --git a/debian/changelog b/debian/changelog
index c0d8816..11a6976 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ alt-ergo (0.95.1-1) UNRELEASED; urgency=low
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
diff --git a/debian/patches/0009-fix-install-gui-target.patch
b/debian/patches/0009-fix-install-gui-target.patch
index d99b296..d419768 100644
--- a/debian/patches/0009-fix-install-gui-target.patch
+++ b/debian/patches/0009-fix-install-gui-target.patch
@@ -2,23 +2,16 @@ From: Mehdi Dogguy <me...@dogguy.org>
Date: Wed, 14 Dec 2011 16:04:05 +0100
Subject: 'fix' install-gui target
----
- Makefile.in | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 4b02288..3df30e2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -222,8 +222,8 @@ install-man:
-
- install-gui: install-indep
+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 @@
mkdir -p $(BINDIR)
+ cp -f $(NAME).$(OCAMLBEST) $(BINDIR)/$(NAME)$(EXE)
+ ifeq ($(ENABLEGUI),yes)
- cp -f altgr-ergo.opt $(BINDIR)/altgr-ergo$(EXE)
-- cp -f util/gtk-lang/alt-ergo.lang
/usr/share/gtksourceview-2.0/language-specs/alt-ergo.lang
+ cp -f altgr-ergo.$(OCAMLBEST) $(BINDIR)/altgr-ergo$(EXE)
-+ cp -f util/gtk-lang/alt-ergo.lang
$(prefix)/share/gtksourceview-2.0/language-specs/alt-ergo.lang
-
- install-pack-opt: xpack
- mkdir -p $(LIBDIR)
---
+ 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
--
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
