This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository frama-c.

commit 58841e1f7c21f5d6dd1aabd453c29e4b840a1503
Author: Mehdi Dogguy <me...@debian.org>
Date:   Mon Aug 31 22:17:27 2015 +0000

    Install GUI plugins in frama-c package only (Closes: #792612).
---
 debian/changelog               |  2 ++
 debian/frama-c-base.install.in |  3 ++-
 debian/frama-c.install         |  1 +
 debian/rules                   | 11 +++++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3121b98..5dddd6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ frama-c (20150201+sodium+dfsg-1) UNRELEASED; urgency=medium
     - Drop 0004-Port-to-OCamlgraph-1.8.5.patch: Integrated upstream.
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Disable DH_VERBOSE in d/rules.
+  * Install GUI plugins and modules using GTK2 in frama-c package
+    only (Closes: #792612).
 
  -- Mehdi Dogguy <me...@debian.org>  Mon, 31 Aug 2015 12:56:01 +0000
 
diff --git a/debian/frama-c-base.install.in b/debian/frama-c-base.install.in
index 62f0f42..90b5dcb 100644
--- a/debian/frama-c-base.install.in
+++ b/debian/frama-c-base.install.in
@@ -1,4 +1,5 @@
-       usr/lib
+       usr/lib/frama-c/*.*
+       usr/lib/frama-c/plugins/*.*
        usr/share
        usr/bin/frama-c
 OPT:   usr/bin/frama-c.byte
diff --git a/debian/frama-c.install b/debian/frama-c.install
index 974ce3e..89a4f7a 100644
--- a/debian/frama-c.install
+++ b/debian/frama-c.install
@@ -1 +1,2 @@
 usr/bin/frama-c-gui
+usr/lib/frama-c/plugins/gui
diff --git a/debian/rules b/debian/rules
index 1cfcb97..a404dea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@
 include /usr/share/ocaml/ocamlvars.mk
 
 FRAMA_DIR=$(CURDIR)/debian/tmp
+FRAMA_GUI_DIR=$(CURDIR)/debian/frama-c/usr/lib/frama-c
 
 override_dh_auto_configure:
        mkdir -p lib/plugins
@@ -24,6 +25,8 @@ override_dh_auto_configure:
                CFLAGS="$(CFLAGS)"               \
                LDFLAGS="-Wl,-z,defs"
 
+FRAMA_GUI_LIBS=$(patsubst src/gui/%.ml, $(FRAMA_DIR)/usr/lib/frama-c/%, 
$(wildcard src/gui/*.ml))
+
 override_dh_auto_install:
        $(MAKE) prefix=$(FRAMA_DIR)/usr 
FRAMAC_DATADIR=$(FRAMA_DIR)/usr/share/frama-c install
        # Fix permission of .c and .h files (they don't have to be executable)
@@ -41,6 +44,14 @@ override_dh_auto_install:
 ifeq ($(OCAML_OPT_ARCH),)
        $(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c.byte
 endif
+       # Move GUI related objects in the appropriate package
+       mkdir -p $(FRAMA_GUI_DIR)
+       mv $(patsubst %, %.cmo, $(FRAMA_GUI_LIBS))      $(FRAMA_GUI_DIR)
+       mv $(patsubst %, %.cmi, $(FRAMA_GUI_LIBS))      $(FRAMA_GUI_DIR)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+       mv $(patsubst %, %.cmx, $(FRAMA_GUI_LIBS))      $(FRAMA_GUI_DIR)
+       mv $(patsubst %, %.o, $(FRAMA_GUI_LIBS))        $(FRAMA_GUI_DIR)
+endif
 
 override_dh_auto_clean:
        touch .depend

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/frama-c.git

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

Reply via email to