[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20100401+boron+dfsg-4-10-gf188023

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit f188023dab3b0f4e0c4cb8dfa137c7748186a87b
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Apr 23 18:50:16 2011 +0200

    No need to exclude custom bytecode binaries when running dh_strip

diff --git a/debian/changelog b/debian/changelog
index 3032aff..ba1856a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ frama-c (20110201+carbon+dfsg-1) unstable; urgency=low
       + 0001-Value-Analysis-Carbon-patchlevel-1.patch
       + 0002-Fix-for-issue-727.patch
   * Fix Categories field in frama-c.desktop (Closes: #610432) (LP: #613853).
+  * No need to exclude custom bytecode binaries when running dh_strip.
+    (thanks to patch applied in OCaml >= 3.12.0-5)
 
- -- Mehdi Dogguy <mehdi at debian.org>  Sat, 23 Apr 2011 18:40:20 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Sat, 23 Apr 2011 18:47:13 +0200
 
 frama-c (20100401+boron+dfsg-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 732194f..87632d1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Mehdi Dogguy <mehdi at debian.org>
 Build-Depends:
  debhelper (>= 7.0.50~),
- ocaml-nox (>= 3.11.1-3~),
+ ocaml-nox (>= 3.12.0~),
  ocaml-best-compilers,
  dh-ocaml (>= 0.9~),
  graphviz,
diff --git a/debian/rules b/debian/rules
index 6ce2788..845792e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,6 @@ ifeq ($(OCAML_OPT_ARCH),)
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c.byte
 endif
 
-override_dh_strip:
-# frama-c is compiled with -custom
-ifdef OCAML_OPT_ARCH
-	dh_strip -X frama-c-gui.byte -X frama-c.byte
-endif
-
 override_dh_auto_clean:
 	touch .depend
 	[ ! -f src/kernel/config.ml.debian ] || mv src/kernel/config.ml.debian src/kernel/config.ml

-- 
frama-c packaging