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

Wed Sep 9 15:40:11 UTC 2009

The following commit has been merged in the master branch:
commit 3c199399c68fac81fcfcb8782f74bdf53375057f
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Fri Sep 4 15:19:11 2009 +0200

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 8f23b86..99a9a4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,21 @@
-frama-c (20090601~beta1+dfsg-2) unstable; urgency=low
+frama-c (20090901+beryllium+dfsg-1) unstable; urgency=low
 
-  * Add two patches:
+  * Change the version number to reflect the codename in the version string
+  * New Upstream Version
+    + Fixes the issues related the static Jessie plugin. Thus, removing:
+      0004-Add-JCCM-O-X-to-BYTE-OPT-_LIBS-when-linking-statical.patch
+      (Closes: #544404).
+    + Provides toc_head.htm and toc_tail.htm
+    + Fixes linking problem for the viewer. Thus, removing:
+      0002-Do-not-add-GRAPH_GUICMO-to-BYTE_GUI_LIBS.patch
+    + Removing 0006-Do-not-install-non-existant-files.patch (now integrated
+      upstream)
+  * Add a patch:
     + Fix weak pattern-matching in dynlink_lower_311_byte.ml, fixes FTBFS
-      on non-native architectures.
+      on non-native architectures (Closes: #544833).
       0003-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
-    + Fix issuess when linking statically Jessie plugin (Closes: #544404)
-      0004-Add-JCCM-O-X-to-BYTE-OPT-_LIBS-when-linking-statical.patch
 
- -- Mehdi Dogguy <mehdi at debian.org>  Tue, 01 Sep 2009 15:41:15 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Fri, 04 Sep 2009 14:59:15 +0200
 
 frama-c (20090601~beta1+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/0002-Do-not-add-GRAPH_GUICMO-to-BYTE_GUI_LIBS.patch b/debian/patches/0002-Do-not-add-GRAPH_GUICMO-to-BYTE_GUI_LIBS.patch
deleted file mode 100644
index 1df3e41..0000000
--- a/debian/patches/0002-Do-not-add-GRAPH_GUICMO-to-BYTE_GUI_LIBS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Fri, 28 Aug 2009 08:43:22 +0200
-Subject: [PATCH] Do not add $(GRAPH_GUICMO) to $(BYTE_GUI_LIBS)
-
-Otherwise, they will appear before lablgtk.cma and lablgnomecanvas.cma
-when linking which are needed by viewGraph.cmo (and al.).
----
- Makefile.in |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index fbf5f4d..2e0f6b3 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -358,8 +358,6 @@ GRAPH_GUICMO=$(GRAPH_GUICMO_BASE:%=$(OCAMLGRAPH_HOME)/%)
- GRAPH_GUICMX= $(GRAPH_GUICMO:.cmo=.cmx)
- GRAPH_GUIO= $(GRAPH_GUICMO:.cmo=.o)
- HAS_VIEWGRAPH=yes
--BYTE_GUI_LIBS+= $(GRAPH_GUICMO)
--OPT_GUI_LIBS+= $(GRAPH_GUICMX)
- endif
- endif
- 
--- 
diff --git a/debian/patches/0004-Add-JCCM-O-X-to-BYTE-OPT-_LIBS-when-linking-statical.patch b/debian/patches/0004-Add-JCCM-O-X-to-BYTE-OPT-_LIBS-when-linking-statical.patch
deleted file mode 100644
index 9f922aa..0000000
--- a/debian/patches/0004-Add-JCCM-O-X-to-BYTE-OPT-_LIBS-when-linking-statical.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Tue, 1 Sep 2009 14:26:15 +0200
-Subject: [PATCH] Add JCCM{O,X} to {BYTE,OPT}_LIBS when linking statically the jessie plugin
-
----
- Makefile.in |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 2e0f6b3..7e935b9 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -933,6 +933,14 @@ JCCMO		:=@JCCMO@
- JCCMX		:=@JCCMX@
- WHY_DISTRIB	:=@WHYDISTRIB@
- 
-+ifeq (@JESSIE_LOCAL@,no)
-+ifneq (@ENABLE_JESSIE@,no)
-+INCLUDES  += $(JESSIE_INCLUDES)
-+BYTE_LIBS += $(JCCMO)
-+OPT_LIBS  += $(JCCMX)
-+endif
-+endif
-+
- DISTRIB_FILES += $(PLUGIN_DIR)/Makefile
- include $(PLUGIN_DIR)/Makefile
- 
--- 
diff --git a/debian/patches/0006-Do-not-install-non-existant-files.patch b/debian/patches/0006-Do-not-install-non-existant-files.patch
deleted file mode 100644
index 707adf3..0000000
--- a/debian/patches/0006-Do-not-install-non-existant-files.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Fri, 28 Aug 2009 00:14:42 +0200
-Subject: [PATCH] Do not install non-existant files
-
----
- Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f4585bd..fbf5f4d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1483,7 +1483,7 @@ install-kernel:
- 	$(MKDIR) $(FRAMAC_LIBDIR)
- # 	line below does not work if INCLUDES contains twice the same directory
- #       Do not attempt to copy gui interfaces if gui is disabled
--	$(CP) $(foreach d,$(filter-out $(FILTER_INTERFACE_DIRS),$(INCLUDES:-I%=%)), $(d)/*.cmi) $(FRAMAC_LIBDIR)
-+	$(CP) $(wildcard $(foreach d,$(filter-out $(FILTER_INTERFACE_DIRS),$(INCLUDES:-I%=%)), $(d)/*.cmi)) $(FRAMAC_LIBDIR)
- 
- install-gui:
- 	$(PRINT_CP) gui API
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 6e3670a..3e8bf98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-0006-Do-not-install-non-existant-files.patch
-0002-Do-not-add-GRAPH_GUICMO-to-BYTE_GUI_LIBS.patch
 0003-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
-0004-Add-JCCM-O-X-to-BYTE-OPT-_LIBS-when-linking-statical.patch

-- 
frama-c packaging

