The following commit has been merged in the experimental/master branch:
commit d1ba553ac59360e5b5142e19334cea22d792da20
Author: Ralf Treinen <trei...@free.fr>
Date:   Wed Apr 3 21:35:44 2013 +0200

    adapt patch 0008-Split-install-pack-into-two-separate-targets-opt-and to 
new upstream

diff --git a/debian/changelog b/debian/changelog
index aef433a..c0d8816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ alt-ergo (0.95.1-1) UNRELEASED; urgency=low
      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
   * Drop patches since issue is fixed upstream:
      0004-Add-rules-and-targets-for-gui.byte.patch
   
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 a4459d8..8006793 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
@@ -2,28 +2,24 @@ From: Mehdi Dogguy <me...@dogguy.org>
 Date: Wed, 14 Dec 2011 15:29:53 +0100
 Subject: Split install-pack into two separate targets (opt and byte)
 
----
- Makefile.in |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index a59ec52..4b02288 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -225,13 +225,21 @@ install-gui: install-indep
-       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
+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 @@
+       cp -f util/gtk-lang/alt-ergo.lang 
$(DATADIR)/gtksourceview-2.0/language-specs/alt-ergo.lang
+ endif
  
--install-pack: xpack pack
+-install-pack: xpack pack META
 +install-pack-opt: xpack
        mkdir -p $(LIBDIR)
        cp -f $(LIBNAME).cmx $(LIBDIR)
        cp -f $(LIBNAME).o $(LIBDIR)
 +
-+install-pack-byte: pack
-+      mkdir -p $(LIBDIR)
++install-pack-byte: pack META
        cp -f $(LIBNAME).cmo $(LIBDIR)
        cp -f $(LIBNAME).cmi $(LIBDIR)
+       cp -f META $(LIBDIR)
  
 +install-pack:: install-pack-byte
 +ifeq ($(OCAMLBEST),opt)
@@ -33,4 +29,3 @@ index a59ec52..4b02288 100644
  # documentation
  ###############
  
--- 

-- 
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