[Pkg-ocaml-maint-commits] [js-of-ocaml] 11/15: Refresh remaining patch

Mehdi Dogguy mehdi at moszumanska.debian.org
Sun Oct 18 08:48:23 UTC 2015


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

mehdi pushed a commit to branch master
in repository js-of-ocaml.

commit 10ea402b3f337bb67c28c7985225922f50c1e4bb
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Oct 18 10:12:45 2015 +0200

    Refresh remaining patch
---
 debian/changelog                                                    | 1 +
 ...Bytecode-only-support.patch => 0001-Bytecode-only-support.patch} | 6 +++---
 debian/patches/series                                               | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9935087..b3b5626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ js-of-ocaml (2.5-1) UNRELEASED; urgency=medium
   * Team upload
   * New upstream release
     - Remove 0001-Fix-generation-of-compiler.cm.patch, integrated upstream.
+    - Refresh remaining patch
 
  -- Mehdi Dogguy <mehdi at debian.org>  Sun, 18 Oct 2015 09:59:10 +0200
 
diff --git a/debian/patches/0002-Bytecode-only-support.patch b/debian/patches/0001-Bytecode-only-support.patch
similarity index 85%
rename from debian/patches/0002-Bytecode-only-support.patch
rename to debian/patches/0001-Bytecode-only-support.patch
index 2c5a6ad..fee4a80 100644
--- a/debian/patches/0002-Bytecode-only-support.patch
+++ b/debian/patches/0001-Bytecode-only-support.patch
@@ -7,16 +7,16 @@ Subject: Bytecode-only support
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/compiler/Makefile b/compiler/Makefile
-index 4d1b306..539b902 100644
+index 0878911..3c62ad9 100644
 --- a/compiler/Makefile
 +++ b/compiler/Makefile
 @@ -3,7 +3,7 @@ include ../Makefile.conf
  
- all: $(COMPILER) $(MINIFIER)
+ all: $(COMPILER) $(MINIFIER) man
  
 -lib: compiler.cma compiler.cmxa compiler.cmxs
 +lib: compiler.cma $(if $(wildcard /usr/bin/ocamlopt),compiler.cmxa) $(if $(wildcard /usr/lib/ocaml/dynlink.cmxa),compiler.cmxs)
  
- PACKAGES=findlib
+ PACKAGES=findlib,cmdliner
  
 -- 
diff --git a/debian/patches/series b/debian/patches/series
index 36cdc44..5698c3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0002-Bytecode-only-support.patch
+0001-Bytecode-only-support.patch

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



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