[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090902+beryllium+dfsg-1-4-gd7d9ec3

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit c580bafff95a688100c9bb7635c6e39e4a70d14f
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 17 19:55:48 2010 +0100

    Remove empty dirs

diff --git a/debian/changelog b/debian/changelog
index fe83aa2..fcbbdac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 frama-c (20090902+beryllium+dfsg-2) unstable; urgency=low
 
   * Fix installability problem by installing frama-c-gui.1 only once.
+  * Remove empty dirs
 
  -- Mehdi Dogguy <mehdi at debian.org>  Sun, 17 Jan 2010 19:33:00 +0100
 
diff --git a/debian/dirs b/debian/dirs
index ebac527..b7b0594 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,6 +1,4 @@
 usr/bin
-usr/lib/frama-c
-usr/share/man/man1
 usr/share/doc/frama-c
 usr/share/icons/hicolor/scalable/apps/
 usr/share/pixmaps/
diff --git a/debian/rules b/debian/rules
index 37dac12..c8130c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,8 @@ override_dh_auto_install:
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/ptests.byte
 	# Same file as frama-c.1. We use a symlink instead of copying the file twice
 	$(RM) -f $(FRAMA_DIR)/usr/share/man/man1/frama-c-gui.1
+	# Empty directory
+	$(RM) -rf $(FRAMA_DIR)/usr/lib/frama-c/plugins/gui/
 ifeq ($(OCAML_OPT_ARCH),)
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c.byte
 endif

-- 
frama-c packaging