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

Ralf Treinen treinen at free.fr
Wed Apr 3 19:52:23 UTC 2013


The following commit has been merged in the experimental/master branch:
commit f65efc6569dfbd6c73a2a13febd5817ff1e08f45
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Apr 3 21:22:04 2013 +0200

    dapt patch 0007-Fix-all-target to new upstream

diff --git a/debian/changelog b/debian/changelog
index 7994652..aef433a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ alt-ergo (0.95.1-1) UNRELEASED; urgency=low
      0003-Fix-a-typo.patch
      0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2
      0006-PRECM-O-X-is-needed-to-link-altgr-ergo
+     0007-Fix-all-target
   * Drop patches since issue is fixed upstream:
      0004-Add-rules-and-targets-for-gui.byte.patch
   
diff --git a/debian/patches/0007-Fix-all-target.patch b/debian/patches/0007-Fix-all-target.patch
index d7309c2..e18faaf 100644
--- a/debian/patches/0007-Fix-all-target.patch
+++ b/debian/patches/0007-Fix-all-target.patch
@@ -6,23 +6,22 @@ Subject: Fix 'all' target
  Makefile.in |    8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index b9d9afc..a59ec52 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -74,7 +74,13 @@ LIBNAME = altErgo
+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 @@
  BYTE=$(NAME).byte
  OPT=$(NAME).opt
  
--all: pack xpack $(OCAMLBEST) pack xpack
+-all: pack xpack $(OCAMLBEST) pack xpack gui META
 +all::
 +
 +ifeq ($(OCAMLBEST),opt)
-+all:: pack xpack opt pack xpack
++all:: pack xpack opt pack xpack gui META
 +else
-+all:: pack byte pack
++all:: pack byte pack gui META
 +endif
  
+ 
  # bytecode and native-code compilation
- ######################################
--- 

-- 
alt-ergo packaging



More information about the Pkg-ocaml-maint-commits mailing list