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

2011-04-24 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit f188023dab3b0f4e0c4cb8dfa137c7748186a87b
Author: Mehdi Dogguy 
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   Sat, 23 Apr 2011 18:40:20 +0200
+ -- Mehdi Dogguy   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 

 Uploaders: Mehdi Dogguy 
 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

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

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

2011-04-24 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 17eab41af7680548f95442a21e42055bd8e8bf90
Author: Mehdi Dogguy 
Date:   Sat Apr 23 18:40:59 2011 +0200

Add fix for issue 727

diff --git a/debian/changelog b/debian/changelog
index 4f75129..3032aff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,11 @@ frama-c (20110201+carbon+dfsg-1) unstable; urgency=low
 - Update copyright file.
 - Remove all patches, integrated by upstream.
 - Add patches:
-  + 0001-Value-Analysis-Carbon-patchlevel-1.patch 
+  + 0001-Value-Analysis-Carbon-patchlevel-1.patch
+  + 0002-Fix-for-issue-727.patch
   * Fix Categories field in frama-c.desktop (Closes: #610432) (LP: #613853).
 
- -- Mehdi Dogguy   Fri, 15 Apr 2011 23:06:36 +0200
+ -- Mehdi Dogguy   Sat, 23 Apr 2011 18:40:20 +0200
 
 frama-c (20100401+boron+dfsg-5) unstable; urgency=low
 
diff --git a/debian/patches/0002-Fix-for-issue-727.patch 
b/debian/patches/0002-Fix-for-issue-727.patch
new file mode 100644
index 000..5b5fcb9
--- /dev/null
+++ b/debian/patches/0002-Fix-for-issue-727.patch
@@ -0,0 +1,79 @@
+From: Mehdi Dogguy 
+Date: Sat, 23 Apr 2011 18:39:43 +0200
+Subject: [PATCH] Fix for issue 727
+
+---
+ src/kernel/visitor.ml |   26 ++
+ 1 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/src/kernel/visitor.ml b/src/kernel/visitor.ml
+index 5c6f69f..d09774e 100644
+--- a/src/kernel/visitor.ml
 b/src/kernel/visitor.ml
+@@ -178,30 +178,38 @@ object(self)
+   self#get_filling_actions
+   end
+ in
+-let post_action stmt = change_stmt stmt (make_children_annot self); stmt 
in
++let post_action f stmt =
++  let annots = make_children_annot self in
++  let stmt = f stmt in
++  change_stmt stmt annots; stmt
++in
+ let copy stmt =
+   change_stmt stmt
+ (make_children_annot self#frama_c_plain_copy); stmt
+ in
++let plain_post = post_action (fun x -> x) in
+ match res with
+ | SkipChildren -> res
+ | JustCopy -> JustCopyPost copy
+ | JustCopyPost f -> JustCopyPost (f $ copy)
+-| DoChildren -> ChangeDoChildrenPost (stmt, post_action)
++| DoChildren -> ChangeDoChildrenPost (stmt, plain_post)
+ | ChangeTo _ | ChangeToPost _ -> res
+ | ChangeDoChildrenPost (stmt,f) ->
+-  ChangeDoChildrenPost (stmt, f $ post_action)
++  ChangeDoChildrenPost (stmt, post_action f)
+ 
+   method vstmt_aux _ = DoChildren
+   method vglob_aux _ = DoChildren
+ 
+   method vglob g =
+-let has_kf =
++let fundec, has_kf =
+   match g with
+ GVarDecl(_,v,_) when isFunctionType v.vtype ->
+-  self#set_current_kf (Globals.Functions.get v); true
+-  | GFun(f,_) -> self#set_current_kf (Globals.Functions.get f.svar); true
+-  | _ -> false
++  self#set_current_kf (Globals.Functions.get v);
++  None, true
++  | GFun(f,_) ->
++self#set_current_kf (Globals.Functions.get f.svar);
++Some f, true
++  | _ -> None, false
+ in
+ let res = self#vglob_aux g in
+ let make_funspec () =
+@@ -283,8 +291,10 @@ object(self)
+ in
+ let post_action g =
+   let spec = lazy (make_funspec ()) in
++  Extlib.may self#set_current_func fundec;
+   List.iter (fun g -> change_glob g (Lazy.force spec)) g;
+   if has_kf then self#reset_current_kf();
++  Extlib.may (fun _ -> self#reset_current_func ()) fundec;
+   g
+ in
+ match res with
+@@ -299,7 +309,7 @@ object(self)
+   if has_kf then self#reset_current_kf();
+   res
+ | ChangeToPost (l,f) -> ChangeToPost (l, f $ post_action)
+-| ChangeDoChildrenPost (g,f) -> ChangeDoChildrenPost (g, f $ post_action)
++| ChangeDoChildrenPost (g,f) -> ChangeDoChildrenPost (g, post_action $ f)
+ end
+ 
+ class frama_c_copy prj = generic_frama_c_visitor prj (copy_visit ())
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 09bf248..4757ee4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Value-Analysis-Carbon-patchlevel-1.patch
+0002-Fix-for-issue-727.patch

-- 
frama-c packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

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

2011-04-24 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 293a03142ad93954273864d9dc640b25e075d8f9
Author: Mehdi Dogguy 
Date:   Fri Apr 15 23:08:02 2011 +0200

Fix Categories field in frama-c.desktop (Closes: #610432) (LP: #613853).

diff --git a/debian/changelog b/debian/changelog
index 95b171b..4f75129 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ frama-c (20110201+carbon+dfsg-1) unstable; urgency=low
 - Remove all patches, integrated by upstream.
 - Add patches:
   + 0001-Value-Analysis-Carbon-patchlevel-1.patch 
+  * Fix Categories field in frama-c.desktop (Closes: #610432) (LP: #613853).
 
- -- Mehdi Dogguy   Fri, 15 Apr 2011 22:36:53 +0200
+ -- Mehdi Dogguy   Fri, 15 Apr 2011 23:06:36 +0200
 
 frama-c (20100401+boron+dfsg-5) unstable; urgency=low
 
diff --git a/debian/frama-c.desktop b/debian/frama-c.desktop
index bccd2ea..6839f5c 100644
--- a/debian/frama-c.desktop
+++ b/debian/frama-c.desktop
@@ -3,6 +3,7 @@ Name=Frama-C
 Comment=Framework for source code analysis of software written in C
 Exec=frama-c-gui
 Type=Application
-Categories=Development;Science;IDE;GTK;
+Categories=Development;ComputerScience;IDE;GTK;
+OnlyShowIn=Development
 Terminal=false
 Icon=frama-c

-- 
frama-c packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

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

2011-04-24 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit f5a9b1a8cf2a9f797b73036629bac7646b791fc2
Author: Mehdi Dogguy 
Date:   Fri Apr 15 22:23:25 2011 +0200

New upstream release

 - Update copyright file.
 - Remove all patches, integrated by upstream.

diff --git a/debian/changelog b/debian/changelog
index 28698b5..3a216d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+frama-c (20110201+carbon+dfsg-1) unstable; urgency=low
+
+  * New upstream release:
+- Update copyright file.
+- Remove all patches, integrated by upstream.
+
+ -- Mehdi Dogguy   Fri, 15 Apr 2011 21:58:27 +0200
+
 frama-c (20100401+boron+dfsg-5) unstable; urgency=low
 
   [ Stéphane Glondu ]
diff --git a/debian/copyright b/debian/copyright
index febd2a1..6bdf17b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
 Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Packaged-By: Mehdi Dogguy 
 Packaged-Date: Mon, 11 May 2009 15:11:37 +0200
 Original-Source-Location: http://frama-c.cea.fr/download.html
 Upstream-Author: Software Reliability Laboratory (LSL) and INRIA ProVal project
 
 Files: debian/*
-Copyright: © 2008-2010 Mehdi Dogguy 
+Copyright: © 2008-2011 Mehdi Dogguy 
 License: LGPL-2.1
   See `/usr/share/common-licenses/LGPL-2.1'.
 
@@ -16,6 +16,7 @@ Files: src/logic/*.ml*
 Files: cil/src/logic/*.ml*
 Files: src/pdg_types/*.ml*
 Files: src/pdg/*.ml*
+Files: src/report/*
 Files: src/slicing_types/*.ml*
 Files: src/slicing/*.ml*
 Files: src/scope/Scope.mli
@@ -23,8 +24,8 @@ Files: src/scope/datascope.ml
 Files: src/scope/dpds_gui.ml
 Files: src/scope/zones.ml
 Files: src/scope/zones.mli
-Copyright: © 2007-2010 CEA (Commissariat à l'Énergie Atomique)
-  © 2007-2010 INRIA (Institut National de Recherche en Informatique et 
Automatique)
+Copyright: © 2007-2011 CEA (Commissariat à l'Énergie Atomique)
+  © 2007-2011 INRIA (Institut National de Recherche en Informatique et 
Automatique)
 License: LGPL-2.1
   See `/usr/share/common-licenses/LGPL-2.1'.
 
@@ -35,8 +36,8 @@ License: LGPL-2.1
   See `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: src/aorai/*
-Copyright: © 2007-2010 INSA (Institut National des Sciences Appliquees)
-  © 2007-2010 INRIA (Institut National de Recherche en Informatique et 
en Automatique)
+Copyright: © 2007-2011 INSA (Institut National des Sciences Appliquees)
+  © 2007-2011 INRIA (Institut National de Recherche en Informatique et 
en Automatique)
 License: LGPL-2.1
   See `/usr/share/common-licenses/LGPL-2.1'.
 
@@ -98,7 +99,11 @@ Files: share/Makefile.dynamic_config.internal
 Files: src/ai/ival.ml
 Files: src/ai/ival.mli
 Files: src/dummy/*
-Copyright: © 2007-2010 CEA (Commissariat à l'Énergie Atomique)
+Files: src/impact/*
+Files: src/security_slicing/*
+Files: src/rte/*
+Files: src/type/*
+Copyright: © 2007-2011 CEA (Commissariat à l'Énergie Atomique)
 License: LGPL-2.1
   See `/usr/share/common-licenses/LGPL-2.1'.
 
@@ -110,10 +115,9 @@ License: GPL-3
 Files: cil/src/logic/*
 Files: doc/code/*
 Files: man/frama-c.1
-Files: share/why/*
 Files: src/sparecode/*.ml*
-Copyright: © 2007-2010 CEA (Commissariat à l'Énergie Atomique et aux énergies 
alternatives)
-   © 2007-2010 INRIA (Institut National de Recherche en Informatique 
et en Automatique)
+Copyright: © 2007-2011 CEA (Commissariat à l'Énergie Atomique et aux énergies 
alternatives)
+   © 2007-2011 INRIA (Institut National de Recherche en Informatique 
et en Automatique)
 License: LGPL-2.1
   See `/usr/share/common-licenses/LGPL-2.1'.
 
@@ -141,8 +145,8 @@ Copyright: © 2009-2010 Institut National de Recherche en 
Informatique et en Aut
 License: BSD-3
   See `/usr/share/common-licenses/BSD'.
 
-Files: external/ptmap.ml
-Files: external/ptmap.mli
+Files: external/hptmap.ml
+Files: external/hptmap.mli
 Copyright: © 2005 Institut National de Recherche en Informatique et en 
Automatique
 License: QPL modified
   See `./licenses/Q_MODIFIED_LICENSE`.
diff --git a/debian/patches/0001-Fix-hyphen-used-as-minus-sign-and-a-typo.patch 
b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-and-a-typo.patch
deleted file mode 100644
index 8bac7de..000
--- a/debian/patches/0001-Fix-hyphen-used-as-minus-sign-and-a-typo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Mehdi Dogguy 
-Date: Sun, 25 Apr 2010 16:06:51 +0200
-Subject: [PATCH] Fix hyphen-used-as-minus-sign and a typo
-

- man/frama-c.1 |6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/man/frama-c.1 b/man/frama-c.1
-index 90d4393..fb9fa88 100644
 a/man/frama-c.1
-+++ b/man/frama-c.1
-@@ -44,7 +44,7 @@ framework. This framework can be extended by additional 
plugins placed in the
- .B $FRAMAC_PLUGIN
- directory. The command
- .IP
--frama-c -help
-+frama\-c \-help
- .PP
- will provide the full list of the plugins that are currently installed.
- .P
-@@ -146,7 +146,7 @@ as the command to pre-process C files. Defaults to the
- .B CPP
- environme

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

2011-04-24 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 2415f504b6a315816f5ee6551c23592970dc6d21
Merge: 060d85847bc8d3287d88900317214b8538b5e6ca 
6e7820bfdceae2ad99815a88094a9db445fad25a
Author: Mehdi Dogguy 
Date:   Fri Apr 15 21:45:17 2011 +0200

Merge commit 'upstream/20110201+carbon+dfsg'


-- 
frama-c packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

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

2011-04-24 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 060d85847bc8d3287d88900317214b8538b5e6ca
Author: Mehdi Dogguy 
Date:   Fri Apr 15 21:44:12 2011 +0200

No need to filter out src/{impact,security} from tarball

diff --git a/debian/gbp.conf b/debian/gbp.conf
index c8c1dca..1d83450 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -5,8 +5,6 @@ filter = [
 "ocamlgraph",
 "ocamlgraph.tar.gz",
 "doc/manuals",
-"src/impact",
-"src/security",
 "cil/doc",
 "tests/test/adpcm.c"
 ]

-- 
frama-c packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits