[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 94992a1b7857daaabdc1fb6eb7ffe08daf76b946
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 17 19:33:51 2010 +0100

    Fix installability problem by installing frama-c-gui.1 only once.

diff --git a/debian/changelog b/debian/changelog
index a99393c..fe83aa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frama-c (20090902+beryllium+dfsg-2) unstable; urgency=low
+
+  * Fix installability problem by installing frama-c-gui.1 only once.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sun, 17 Jan 2010 19:33:00 +0100
+
 frama-c (20090902+beryllium+dfsg-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/frama-c.links.in b/debian/links
similarity index 100%
rename from debian/frama-c.links.in
rename to debian/links
diff --git a/debian/rules b/debian/rules
index d397374..37dac12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,8 @@ override_dh_auto_install:
 	cp debian/frama-c.desktop $(CURDIR)/debian/frama-c/usr/share/applications/
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c-gui.byte
 	$(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
 ifeq ($(OCAML_OPT_ARCH),)
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c.byte
 endif

-- 
frama-c packaging