[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090601.beta1+dfsg-1-19-g4b31c19

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 4b31c19b43e7b14a208a53df9e86333c56c6d684
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Sep 10 13:44:23 2009 +0200

    Various changes

diff --git a/debian/changelog b/debian/changelog
index 6dc9e5e..a85a6ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,16 +13,20 @@ frama-c (20090901+beryllium+dfsg-1) unstable; urgency=low
   * Add some patches:
     + Fix weak pattern-matching in dynlink_lower_311_byte.ml, fixes FTBFS
       on non-native architectures (Closes: #544833).
-      0003-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
+      0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
     + Make the Jessie plugin compile with Jc 2.19:
       0002-Make-Jessie-plugin-use-Jc-from-Why-2.19.patch
     + Fix linking problem for the viewer (add dGraphView.cmo):
       0003-Add-dGraphView.cmo-when-linking.patch
-  * Bump libocamlgraph-ocaml-dev version from 1.1 to 1.2 in the build
+  * Bump libocamlgraph-ocaml-dev version from 1.1 to 1.2+debian in build
     dependencies.
   * Don't strip bytecode binaries since they are compiled with -custom
-  * Recommends alt-ergo
+  * Recommends alt-ergo and libwhy-coq
   * Remove useless runtime dependency libocamlgraph-ocaml-dev
+  * Install data needed by frama-c in /usr/share/frama-c
+  * Make some additional links to follow default upstream installation:
+    + /usr/share/frama-c/why      -> /usr/share/why/
+    + /usr/share/frama-c/caduceus -> /usr/share/caduceus
 
  -- Mehdi Dogguy <mehdi at debian.org>  Wed, 09 Sep 2009 17:30:41 +0200
 
diff --git a/debian/control b/debian/control
index f9bbf5c..6dfdead 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  libocamlgraph-ocaml-dev (>= 1.2+debian),
  liblablgtk2-gnome-ocaml-dev (>= 2.12.0-3),
  liblablgtksourceview-ocaml-dev (>= 2.12.0-3),
- libjessie-ocaml-dev (>= 2.19+dfsg),
+ libjessie-ocaml-dev (>= 2.19+dfsg-2),
  quilt (>= 0.46-7)
 Standards-Version: 3.8.3
 Homepage: http://frama-c.cea.fr/
@@ -24,11 +24,13 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  graphviz,
- why (>= 2.19+dfsg),
+ why (>= 2.19+dfsg-2),
  gcc,
  emacs | emacsen,
  ${F:FramaCRuntime}
-Recommends: alt-ergo
+Recommends:
+ alt-ergo,
+ libwhy-coq
 Description: Framework for source code analysis of software written in C
  Frama-C is a framework dedicated to the analysis of the source code
  of software written in C.
diff --git a/debian/frama-c.links.in b/debian/frama-c.links.in
index b14e9d1..8879e60 100644
--- a/debian/frama-c.links.in
+++ b/debian/frama-c.links.in
@@ -1,2 +1,4 @@
      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/0003-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch b/debian/patches/0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
similarity index 100%
rename from debian/patches/0003-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
rename to debian/patches/0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
diff --git a/debian/patches/series b/debian/patches/series
index 46ae203..89bb7db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-0003-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
+0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
 0002-Make-Jessie-plugin-use-Jc-from-Why-2.19.patch
 0003-Add-dGraphView.cmo-when-linking.patch
diff --git a/debian/rules b/debian/rules
index 764f4de..6af6503 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,9 +33,12 @@ 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
-	echo 'F:FramaCRuntime=liblablgtk2-gnome-ocaml,liblablgtksourceview-ocaml,ocaml-base-$(OCAML_ABI)' >> debian/frama-c.substvars
+#	echo 'F:FramaCRuntime=liblablgtk2-gnome-ocaml,liblablgtksourceview-ocaml,ocaml-base-$(OCAML_ABI)' >> debian/frama-c.substvars
 endif
 
 override_dh_strip:

-- 
frama-c packaging