*** empty log message ***

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@2405 85f007b7-540e-0410-9357-904b9bb8a0f7

4 files changed, 17 insertions, 21 deletions

diff --git a/configure b/configure
index 26d3212dbe..e82539903e 100755
--- a/configure
+++ b/configure
@@ -460,22 +460,13 @@ subdirs () {
     (cd $1; find . -type d ! -name CVS ! -name . -exec $PRINTF "\"%s\";\n" {} \; >> $mlconfig_file)
 }
 
-echo_e () {
-    case "`uname -s`" in
-	OSF1|SunOS )
-	echo $*;;
-    *)
-	echo -e $*;;
-  esac
-}
-
-echo_e "\nlet theories_dirs = [" >> $mlconfig_file
+echo "let theories_dirs = [" >> $mlconfig_file
 subdirs theories
-echo_e "]\n" >> $mlconfig_file
+echo "]" >> $mlconfig_file
 
-echo_e "\nlet contrib_dirs = [" >> $mlconfig_file
+echo "let contrib_dirs = [" >> $mlconfig_file
 subdirs contrib
-echo_e "]\n" >> $mlconfig_file
+echo "]" >> $mlconfig_file
 
 if test "$CAMLOSTYPE" = "Win32" ; then
 # We change: / -> \\ and \ -> \\ (dos paths)
diff --git a/distrib/Makefile b/distrib/Makefile
index 0563057a25..2bdf0fb03c 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -311,5 +311,6 @@ deb: ${COQPACKAGE}.tar.gz
 	cd deb_build ; mv ${COQPACKAGE} ${COQPACKAGE}.orig
 	cd deb_build ; tar xzf ../${COQPACKAGE}.tar.gz
 	cp -a debian deb_build/${COQPACKAGE}
+	rm -rf deb_build/${COQPACKAGE}/debian/CVS
 	cd deb_build/${COQPACKAGE} ; dpkg-buildpackage -rfakeroot -uc -us
 	lintian deb_build/${COQDEBCHANGES}
diff --git a/distrib/debian/changelog b/distrib/debian/changelog
index 522bae7744..1bff808863 100644
--- a/distrib/debian/changelog
+++ b/distrib/debian/changelog
@@ -1,8 +1,14 @@
+coq (7.2-2) unstable; urgency=low
+
+  * Build-Depends now requires camlp4 instead of camlp4 (>=3.01) since
+    camlp4 is a virtual package provided by ocaml >=3.04.
+
+ -- Judicaël Courant <Judicael.Courant@lri.fr>  Fri, 11 Jan 2002 11:08:03 +0100
+
 coq (7.2-1) unstable; urgency=low
   * New upstream version.
 
- -- Judicaël Courant <Judicael.Courant@lri.fr>  Fri, 21 Dec 2001 14:10:31 +0200
-
+ -- Judicaël Courant <Judicael.Courant@lri.fr>  Wed,  9 Jan 2002 14:02:42 +0100
 
 coq (7.1-2) unstable; urgency=low
 
@@ -12,7 +18,7 @@ coq (7.1-2) unstable; urgency=low
   * Errors raised by the Simpl tactic is an upstream bug and should
     have been fixed in 7.0 (closes: Bug#74518).
 
- -- Judicaël Courant <Judicael.Courant@lri.fr>  Tue, 11 Dec 2001 13:33:15 +0200
+ -- Judicaël Courant <Judicael.Courant@lri.fr>  Tue, 11 Dec 2001 13:33:15 +0100
 
 coq (7.1-1) unstable; urgency=low
   * New upstream version.
@@ -52,6 +58,4 @@ coq (6.3.1-1) unstable; urgency=low
 
  -- Fernando Sanchez <fer@debian.org>  Fri,  3 Dec 1999 22:06:04 +0100
 
-Local variables:
-mode: debian-changelog
-End:
+
diff --git a/distrib/debian/control b/distrib/debian/control
index 5bc413fdc6..afd46f1fc9 100644
--- a/distrib/debian/control
+++ b/distrib/debian/control
@@ -3,12 +3,12 @@ Section: devel
 Priority: optional
 Maintainer: Judicaël Courant <Judicael.Courant@lri.fr>
 Standards-Version: 3.5.3
-Build-Depends: debhelper (>= 2), ocaml (>= 3.01), camlp4 (>= 3.01)
+Build-Depends: debhelper (>= 3), ocaml (>= 3.01), camlp4
 
 Package: coq
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: coq-doc, ocaml (>= 3.01-1), camlp4 (>= 3.01-1), cle
+Suggests: coq-doc, ocaml (>= 3.01-1), camlp4, cle
 Recommends: coq-doc
 Description: a proof assistant for higher-order logic.
  Coq is a proof assistant for higher-order logic, which allows the