[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.5.3-1-38-ge7912ec

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit e7912ecf8703ae4d8c7ee0338f3027b1918be908
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Fri Nov 13 00:14:14 2009 +0100

    fix bytecode-only build error in OCamlMakefile

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
deleted file mode 100644
index 2c5937b..0000000
--- a/debian/TODO.Debian
+++ /dev/null
@@ -1 +0,0 @@
-* fix build here with bytecode only compiler
diff --git a/debian/changelog b/debian/changelog
index 79f3212..9691fca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-janest-core (0.6.0-1) UNRELEASED; urgency=low
+janest-core (0.6.0-1) unstable; urgency=low
 
   [ Stefano Zacchiroli ]
   * New upstream release
-  * refresh patches from debian/patches/:
+  * refresh and rename patches from debian/patches/:
+    - 0001-bug-fix-libinstall-byte-code-should-not-depend-on-na
     - 0002-extra-targets-to-enable-compilation-of-byte-code-onl
     - 0003-add-missing-META-dep-on-unix
-    - 0004-Fix-build-on-kfreebsd
+    - 0004-fix-build-on-kfreebsd
   * debian/control:
     - add (new) build-dep on libfields-camlp4-dev
     - split 3 new binary packages:
@@ -26,10 +27,10 @@ janest-core (0.6.0-1) UNRELEASED; urgency=low
   [ Mehdi Dogguy ]
   * enable generation of ocamldoc documentation (using dh_ocamldoc)
     - pre-processed some files just after build to avoid markup errors
-    - set up appropriates falgs in debian/*.ocamldoc files
+    - set up appropriates flags in debian/*.ocamldoc files
   * add myself to uploaders
 
- -- Mehdi Dogguy <mehdi at debian.org>  Thu, 12 Nov 2009 15:02:01 +0100
+ -- Stefano Zacchiroli <zack at debian.org>  Fri, 13 Nov 2009 00:12:41 +0100
 
 janest-core (0.5.3-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-bug-fix-libinstall-byte-code-should-not-depend-on-na.patch b/debian/patches/0001-bug-fix-libinstall-b-c-should-not-depend-on-native-c.patch
similarity index 76%
rename from debian/patches/0001-bug-fix-libinstall-byte-code-should-not-depend-on-na.patch
rename to debian/patches/0001-bug-fix-libinstall-b-c-should-not-depend-on-native-c.patch
index 4c54cb1..89d2a52 100644
--- a/debian/patches/0001-bug-fix-libinstall-byte-code-should-not-depend-on-na.patch
+++ b/debian/patches/0001-bug-fix-libinstall-b-c-should-not-depend-on-native-c.patch
@@ -1,15 +1,14 @@
 From: Stefano Zacchiroli <zack at upsilon.cc>
 Date: Sat, 3 May 2008 22:39:14 +0200
-Subject: [PATCH] bug fix: libinstall-byte-code should not depend on native code stuff
+Subject: [PATCH] bug fix: libinstall-b-c should not depend on native code
 
 Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
-Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
  OCamlMakefile |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/OCamlMakefile b/OCamlMakefile
-index b0b9252..d60d0db 100644
+index b0b9252..b51c452 100644
 --- a/OCamlMakefile
 +++ b/OCamlMakefile
 @@ -1170,7 +1170,7 @@ libinstall:	all
@@ -17,7 +16,7 @@ index b0b9252..d60d0db 100644
  
  .PHONY: libinstall-byte-code
 -libinstall-byte-code:	all
-+libinstall-byte-code: byte-code
++libinstall-byte-code: byte-code-library
  	$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
  	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
  	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
diff --git a/debian/patches/0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch b/debian/patches/0002-make-targets-to-enable-bytecode-only-compilation.patch
similarity index 95%
rename from debian/patches/0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch
rename to debian/patches/0002-make-targets-to-enable-bytecode-only-compilation.patch
index 638bbd8..56a5683 100644
--- a/debian/patches/0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch
+++ b/debian/patches/0002-make-targets-to-enable-bytecode-only-compilation.patch
@@ -1,6 +1,6 @@
 From: Stefano Zacchiroli <zack at upsilon.cc>
 Date: Sat, 3 May 2008 22:39:34 +0200
-Subject: [PATCH] extra targets to enable compilation of byte code only
+Subject: [PATCH] make targets to enable bytecode only compilation
 
 Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
 ---
diff --git a/debian/patches/0004-Fix-build-on-kfreebsd.patch b/debian/patches/0004-fix-build-on-kfreebsd.patch
similarity index 93%
rename from debian/patches/0004-Fix-build-on-kfreebsd.patch
rename to debian/patches/0004-fix-build-on-kfreebsd.patch
index 510f997..009759c 100644
--- a/debian/patches/0004-Fix-build-on-kfreebsd.patch
+++ b/debian/patches/0004-fix-build-on-kfreebsd.patch
@@ -1,6 +1,6 @@
 From: Stefano Zacchiroli <zack at upsilon.cc>
 Date: Mon, 9 Nov 2009 13:23:05 +0100
-Subject: [PATCH] Fix build on kfreebsd
+Subject: [PATCH] fix build on kfreebsd
 
 ---
  lib/Makefile |    6 +++++-
diff --git a/debian/patches/series b/debian/patches/series
index 25cf3c1..4af7fbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-0001-bug-fix-libinstall-byte-code-should-not-depend-on-na.patch
-0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch
+0001-bug-fix-libinstall-b-c-should-not-depend-on-native-c.patch
+0002-make-targets-to-enable-bytecode-only-compilation.patch
 0003-add-missing-META-dep-on-unix.patch
-0004-Fix-build-on-kfreebsd.patch
+0004-fix-build-on-kfreebsd.patch

-- 
janest-core packaging