From 8e482fc932fa2b1893025d914d42dd17881c2fac Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sun, 15 Nov 2015 18:51:33 +0100
Subject: Being more precise and faithful about the origin of the file
 reporting about the prehistory of Coq.

---
 dev/doc/README-V1-V5 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'dev')

diff --git a/dev/doc/README-V1-V5 b/dev/doc/README-V1-V5
index 2ca62e3d74..ebbc057734 100644
--- a/dev/doc/README-V1-V5
+++ b/dev/doc/README-V1-V5
@@ -1,10 +1,13 @@
 
                  Notes on the prehistory of Coq
 
-This archive contains the sources of the CONSTR ancestor of the Coq proof
-assistant. CONSTR, then Coq, was designed and implemented in the Formel team,
-joint between the INRIA Rocquencourt laboratory and the Ecole Normale Supérieure
-of Paris, from 1984 onwards.
+This document is a copy within the Coq archive of a document written
+in September 2015 by Gérard Huet, Thierry Coquand and Christine Paulin
+to accompany their public release of the archive of versions 1.10 to 6.2
+of Coq and of its CONSTR ancestor. CONSTR, then Coq, was designed and
+implemented in the Formel team, joint between the INRIA Rocquencourt
+laboratory and the Ecole Normale Supérieure of Paris, from 1984
+onwards.
 
 Version 1
 
-- 
cgit v1.2.3


From 23e6963a8168756f225ea2ae75fcf2af6952c6c3 Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Wed, 18 Nov 2015 14:50:35 +0100
Subject: MacOS package script: do not fail if link to /Applications already
 exists.

---
 dev/make-macos-dmg.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dev')

diff --git a/dev/make-macos-dmg.sh b/dev/make-macos-dmg.sh
index a8b5d10dad..70889badc1 100755
--- a/dev/make-macos-dmg.sh
+++ b/dev/make-macos-dmg.sh
@@ -26,6 +26,6 @@ codesign -f -s - $APP
 
 # Create the dmg bundle
 mkdir -p $DMGDIR
-ln -s /Applications $DMGDIR
+ln -sf /Applications $DMGDIR/Applications
 cp -r $APP $DMGDIR
 hdiutil create -imagekey zlib-level=9 -volname CoqIDE_$VERSION -srcfolder $DMGDIR -ov -format UDZO CoqIDE_$VERSION.dmg
-- 
cgit v1.2.3