[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.14-3-5-gc89c704

[Ralf Treinen]

The following commit has been merged in the master branch:
commit c89c704bc3d968cccf92980bc265fd1e4012f773
Author: Ralf Treinen <treinen at pps.jussieu.fr>
Date:   Fri Mar 30 15:30:02 2012 +0200

    new upstream 2.9.15.
    
    patch dont-strip-bytecode now integrated by upstream

diff --git a/debian/changelog b/debian/changelog
index 07a8c36..dfdb180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dose3 (2.9.15-1) UNRELEASED; urgency=low
+
+  * New upstream version. This version fixes a bug in the printing of
+    debian package versions (closes: #665378)
+  * Remove patch dont-strip-bytecode, now integrated by upstream.
+
+ -- Ralf Treinen <treinen at debian.org>  Fri, 30 Mar 2012 15:29:07 +0200
+
 dose3 (2.9.14-3) unstable; urgency=low
 
   * fix a typo in long description of dose-extra
diff --git a/debian/patches/dont-strip-bytecode b/debian/patches/dont-strip-bytecode
deleted file mode 100644
index 72e98bb..0000000
--- a/debian/patches/dont-strip-bytecode
+++ /dev/null
@@ -1,32 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: install must not try to strip bytecode executables
-
-Index: dose3/Makefile
-===================================================================
---- dose3.orig/Makefile	2012-03-17 19:11:32.000000000 +0100
-+++ dose3/Makefile	2012-03-17 19:22:17.000000000 +0100
-@@ -153,7 +153,7 @@
- 	cd _build/applications ; \
- 	install -d $(BINDIR) ; \
- 	for f in $$(ls *.$(OCAMLBEST)) ; do \
--	  install -s $$f $(BINDIR)/$${f%.$(OCAMLBEST)} ; \
-+	  install $(INSTALLOPTS) $$f $(BINDIR)/$${f%.$(OCAMLBEST)} ; \
- 	done
- 	ln -s $(BINDIR)/distcheck $(BINDIR)/debcheck
- 	ln -s $(BINDIR)/distcheck $(BINDIR)/rpmcheck
-Index: dose3/Makefile.config.in
-===================================================================
---- dose3.orig/Makefile.config.in	2012-03-17 19:20:11.000000000 +0100
-+++ dose3/Makefile.config.in	2012-03-17 19:21:50.000000000 +0100
-@@ -30,9 +30,11 @@
- ifeq ("@OCAMLBEST@","opt")
-   OCAMLBEST=native
-   OCAMLBUILD=@OCAMLBUILD@
-+  INSTALLOPTS=-s
- else
-   OCAMLBEST=byte
-   OCAMLBUILD=@OCAMLBUILD@ -byte-plugin
-+  INSTALLOPTS=
- endif
- 
- TARGETS= \
diff --git a/debian/patches/series b/debian/patches/series
index e740134..9dceec7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 binaries-prefix-edos
-dont-strip-bytecode

-- 
dose3 packaging