[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090901+beryllium+dfsg-2-13-g9f4d396

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 38bccd2439a27613b83756dc42e1598b82e6e157
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 10 16:25:21 2010 +0100

    Remove libjessie-ocaml-dev from build-depends

diff --git a/debian/changelog b/debian/changelog
index d063e37..24970c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ frama-c (20090902+beryllium+dfsg-1) UNRELEASED; urgency=low
     + Remove 0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
       (fixed upstream)
   * Update copyright file
+  * Remove libjessie-ocaml-dev from build-deps (Why is not needed anymore
+    to build Frama-C).
 
  -- Mehdi Dogguy <mehdi at debian.org>  Sun, 10 Jan 2010 15:56:17 +0100
 
diff --git a/debian/control b/debian/control
index 08cfa63..d4f8366 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends:
  libocamlgraph-ocaml-dev (>> 1.2+debian),
  liblablgtk2-gnome-ocaml-dev (>= 2.14.0+dfsg-2),
  liblablgtksourceview2-ocaml-dev (>= 2.14.0+dfsg-2),
- libjessie-ocaml-dev (>= 2.19+dfsg-2),
  quilt (>= 0.46-7)
 Standards-Version: 3.8.3
 Homepage: http://frama-c.cea.fr/
@@ -25,10 +24,10 @@ Depends:
  ${misc:Depends},
  ${ocaml:Depends},
  graphviz,
- why (>= 2.19+dfsg-2),
  gcc,
  emacs | emacsen
 Recommends:
+ why (>= 2.19+dfsg-2),
  alt-ergo,
  libwhy-coq
 Description: Framework for source code analysis of software written in C
diff --git a/debian/frama-c.links.in b/debian/frama-c.links.in
index 8879e60..b14e9d1 100644
--- a/debian/frama-c.links.in
+++ b/debian/frama-c.links.in
@@ -1,4 +1,2 @@
      usr/share/man/man1/frama-c.1.gz usr/share/man/man1/frama-c-gui.1.gz
 OPT: usr/share/man/man1/frama-c.1.gz usr/share/man/man1/frama-c.byte.1.gz
-     usr/share/caduceus              usr/share/frama-c/caduceus
-     usr/share/why                   usr/share/frama-c/why
diff --git a/debian/patches/0002-Make-Jessie-plugin-use-Jc-from-Why-2.19.patch b/debian/patches/0002-Make-Jessie-plugin-use-Jc-from-Why-2.19.patch
deleted file mode 100644
index 66cbf70..0000000
--- a/debian/patches/0002-Make-Jessie-plugin-use-Jc-from-Why-2.19.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Wed, 9 Sep 2009 16:51:55 +0200
-Subject: [PATCH] Make Jessie plugin use Jc from Why 2.19
-
----
- src/jessie/interp.ml |   14 ++++++--------
- 1 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/src/jessie/interp.ml b/src/jessie/interp.ml
-index c3057db..84ae55d 100644
---- a/src/jessie/interp.ml
-+++ b/src/jessie/interp.ml
-@@ -2060,8 +2060,8 @@ let global vardefs g =
-     | GCompTag(compinfo,pos) when compinfo.cstruct -> (* struct type *)
-         let field fi =
-           let this =
--            default_field_modifiers, 
--            ctype ?bitsize:fi.fsize_in_bits fi.ftype,
-+            false,
-+            (ctype ?bitsize:fi.fsize_in_bits fi.ftype:Jc_ast.ptype),
-             fi.fname, fi.fsize_in_bits
-           in
-           let padding_size =
-@@ -2069,8 +2069,8 @@ let global vardefs g =
-           in
-           if padding_size = 0 then [this] else
-             let padding =
--              default_field_modifiers, 
--              type_of_padding, unique_name "padding", fi.fpadding_in_bits
-+              false,
-+              (type_of_padding:Jc_ast.ptype), unique_name "padding", fi.fpadding_in_bits
-             in
-             [this;padding]
-         in
-@@ -2131,8 +2131,8 @@ let global vardefs g =
-         in
-         let padding =
-           if union_size = 0 then [] else
--            [default_field_modifiers, 
--             type_of_padding, unique_name "padding", Some union_size]
-+            [false, 
-+             (type_of_padding:Jc_ast.ptype), unique_name "padding", Some union_size]
-         in
-         let union_tag = JCDtag(compinfo.cname,[],None,padding,[]) in
-         let fields = List.map field compinfo.cfields in
-@@ -2397,8 +2397,6 @@ let pragma = function
- 		  [Jc_output.JCfloat_model Jc_env.FMstrict]
-               | "full" -> float_model := `Full;
- 		  [Jc_output.JCfloat_model Jc_env.FMfull]
--              | "multirounding" -> float_model := `Multirounding;
--		  [Jc_output.JCfloat_model Jc_env.FMmultirounding]
-               | s ->
-                   Jessie_options.warning ~current:true
-                     "pragma %s: identifier %s is not a valid value (ignored)." 
--- 
diff --git a/debian/patches/series b/debian/patches/series
index a2222a6..9d1b6fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0002-Make-Jessie-plugin-use-Jc-from-Why-2.19.patch
 0003-Add-dGraphView.cmo-when-linking.patch
 0004-Use-GSourceView2.patch
diff --git a/debian/rules b/debian/rules
index d7758cf..33970cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,6 @@ override_dh_auto_configure: ocamlinit-stamp
 		--mandir=\$${prefix}/share/man   \
 		--infodir=\$${prefix}/share/info \
 		--datarootdir=\$${prefix}/share  \
-		--with-why-dir=no		 \
-		--with-jessie-static		 \
 		--disable-impact		 \
 		--disable-security		 \
 		--enable-verbosemake             \
@@ -33,9 +31,6 @@ override_dh_auto_install:
 	cp debian/icons/frama-c.xpm $(CURDIR)/debian/frama-c/usr/share/pixmaps/
 	cp debian/frama-c.desktop $(CURDIR)/debian/frama-c/usr/share/applications/
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c-gui.byte
-	# Removing this directory because the same content is installed by why.
-	# Thus, make a link /usr/share/why -> /usr/share/frama-c/why instead
-	$(RM) -rf $(CURDIR)/debian/frama-c/usr/share/frama-c/why
 ifeq ($(OCAML_OPT_ARCH),)
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c.byte
 endif

-- 
frama-c packaging