Bug#242761: err, patch

2004-04-08 Thread Mike Furr 
_now_ its attached.


-- 
Mike Furr [EMAIL PROTECTED]
1024D/124B26F3 5B9F 587F BC5C D823 50CE  4DB0 ED93 CA29 124B 26F3
diff -urN coq-7.3.1.orig/config/Makefile coq-7.3.1/config/Makefile
--- coq-7.3.1.orig/config/Makefile	2004-04-08 14:25:25.0 -0400
+++ coq-7.3.1/config/Makefile	2004-04-08 14:24:44.0 -0400
@@ -31,7 +31,7 @@
 EMACS=
 
 # Path to Coq distribution
-COQTOP=/home/rt/debian/sponsored/coq/coq-7.3.1
+COQTOP=/home/furrm/foo/coq-7.3.1
 VERSION=7.3.1
 
 # Directory containing Camlp4 binaries. Can be empty if camlp4 is in the PATH
@@ -80,7 +80,7 @@
 EXE=
 
 # the command used to install binaries, libs and help files
-INSTALL=/home/rt/debian/sponsored/coq/coq-7.3.1/bin/i686/coqinstall
+INSTALL=/home/furrm/foo/coq-7.3.1/bin/i686/coqinstall
 
 # the command MKDIR (try to replace it with mkdirhier if you have problems)
 MKDIR=mkdir -p
diff -urN coq-7.3.1.orig/config/coq_config.ml coq-7.3.1/config/coq_config.ml
--- coq-7.3.1.orig/config/coq_config.ml	2004-04-08 14:25:25.0 -0400
+++ coq-7.3.1/config/coq_config.ml	2004-04-08 14:24:45.0 -0400
@@ -3,7 +3,7 @@
 let local = false
 let bindir = /usr/bin 
 let coqlib = /usr/lib/coq
-let coqtop = /home/rt/debian/sponsored/coq/coq-7.3.1
+let coqtop = /home/furrm/foo/coq-7.3.1
 let camllib = /usr/lib/ocaml/3.07
 let camlp4lib = /usr/lib/ocaml/3.07/camlp4
 let best = opt
@@ -12,7 +12,7 @@
 let version = 7.3.1
 let versionsi = 1.0
 let date = Oct 2002
-let compile_date = Okt 07 2003 22:04:49
+let compile_date = Apr 08 2004 14:24:44
 let exec_extension = 
 
 let theories_dirs = [
diff -urN coq-7.3.1.orig/debian/control coq-7.3.1/debian/control
--- coq-7.3.1.orig/debian/control	2004-04-08 14:25:25.0 -0400
+++ coq-7.3.1/debian/control	2004-04-08 14:24:30.0 -0400
@@ -4,7 +4,7 @@
 Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED]
 Uploaders: Ralf Treinen [EMAIL PROTECTED], Sven Luther [EMAIL PROTECTED], Jerome Marant [EMAIL PROTECTED], Remi Vanicat [EMAIL PROTECTED], Stefano Zacchiroli [EMAIL PROTECTED]
 Standards-Version: 3.6.1
-Build-Depends: debhelper (= 3), ocaml-3.07, dpatch
+Build-Depends: debhelper (= 3), ocaml-3.07, ocaml-best-compilers, dpatch
 
 Package: coq
 Architecture: any
diff -urN coq-7.3.1.orig/debian/rules coq-7.3.1/debian/rules
--- coq-7.3.1.orig/debian/rules	2004-04-08 14:25:25.0 -0400
+++ coq-7.3.1/debian/rules	2004-04-08 14:22:42.0 -0400
@@ -14,7 +14,12 @@
 configure: configure-stamp
 configure-stamp: patch
 	dh_testdir
-	./configure -opt ${CONFIGUREOPTS} || ./configure ${CONFIGUREOPTS}
+	if [ -e /usr/bin/ocamlc.opt ]; \
+	then \
+	  ./configure -opt ${CONFIGUREOPTS}; \
+	else \
+	  ./configure ${CONFIGUREOPTS}; \
+	fi
 	if [ `arch` = ppc ] ; then ./configure ${CONFIGUREOPTS} ; fi
 	touch configure-stamp
 


signature.asc
Description: This is a digitally signed message part

Re: Bug#242761: err, patch

2004-04-08 Thread Michael Furr 
On Thu, 8 Apr 2004, Ralf Treinen wrote:

 Mike, thanks a lot for the patch. I'll look into this and upload
 the patched package over the weekend.
I just realize that I forgot to clean it up before sending.  It really
should only include the changes in debian/control and debian/rules.  Sorry
about that.

-mike


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#242761: err, patch

2004-04-08 Thread Mike Furr 
_now_ its attached.


-- 
Mike Furr [EMAIL PROTECTED]
1024D/124B26F3 5B9F 587F BC5C D823 50CE  4DB0 ED93 CA29 124B 26F3
diff -urN coq-7.3.1.orig/config/Makefile coq-7.3.1/config/Makefile
--- coq-7.3.1.orig/config/Makefile	2004-04-08 14:25:25.0 -0400
+++ coq-7.3.1/config/Makefile	2004-04-08 14:24:44.0 -0400
@@ -31,7 +31,7 @@
 EMACS=
 
 # Path to Coq distribution
-COQTOP=/home/rt/debian/sponsored/coq/coq-7.3.1
+COQTOP=/home/furrm/foo/coq-7.3.1
 VERSION=7.3.1
 
 # Directory containing Camlp4 binaries. Can be empty if camlp4 is in the PATH
@@ -80,7 +80,7 @@
 EXE=
 
 # the command used to install binaries, libs and help files
-INSTALL=/home/rt/debian/sponsored/coq/coq-7.3.1/bin/i686/coqinstall
+INSTALL=/home/furrm/foo/coq-7.3.1/bin/i686/coqinstall
 
 # the command MKDIR (try to replace it with mkdirhier if you have problems)
 MKDIR=mkdir -p
diff -urN coq-7.3.1.orig/config/coq_config.ml coq-7.3.1/config/coq_config.ml
--- coq-7.3.1.orig/config/coq_config.ml	2004-04-08 14:25:25.0 -0400
+++ coq-7.3.1/config/coq_config.ml	2004-04-08 14:24:45.0 -0400
@@ -3,7 +3,7 @@
 let local = false
 let bindir = /usr/bin 
 let coqlib = /usr/lib/coq
-let coqtop = /home/rt/debian/sponsored/coq/coq-7.3.1
+let coqtop = /home/furrm/foo/coq-7.3.1
 let camllib = /usr/lib/ocaml/3.07
 let camlp4lib = /usr/lib/ocaml/3.07/camlp4
 let best = opt
@@ -12,7 +12,7 @@
 let version = 7.3.1
 let versionsi = 1.0
 let date = Oct 2002
-let compile_date = Okt 07 2003 22:04:49
+let compile_date = Apr 08 2004 14:24:44
 let exec_extension = 
 
 let theories_dirs = [
diff -urN coq-7.3.1.orig/debian/control coq-7.3.1/debian/control
--- coq-7.3.1.orig/debian/control	2004-04-08 14:25:25.0 -0400
+++ coq-7.3.1/debian/control	2004-04-08 14:24:30.0 -0400
@@ -4,7 +4,7 @@
 Maintainer: Debian OCaml Maintainers debian-ocaml-maint@lists.debian.org
 Uploaders: Ralf Treinen [EMAIL PROTECTED], Sven Luther [EMAIL PROTECTED], Jerome Marant [EMAIL PROTECTED], Remi Vanicat [EMAIL PROTECTED], Stefano Zacchiroli [EMAIL PROTECTED]
 Standards-Version: 3.6.1
-Build-Depends: debhelper (= 3), ocaml-3.07, dpatch
+Build-Depends: debhelper (= 3), ocaml-3.07, ocaml-best-compilers, dpatch
 
 Package: coq
 Architecture: any
diff -urN coq-7.3.1.orig/debian/rules coq-7.3.1/debian/rules
--- coq-7.3.1.orig/debian/rules	2004-04-08 14:25:25.0 -0400
+++ coq-7.3.1/debian/rules	2004-04-08 14:22:42.0 -0400
@@ -14,7 +14,12 @@
 configure: configure-stamp
 configure-stamp: patch
 	dh_testdir
-	./configure -opt ${CONFIGUREOPTS} || ./configure ${CONFIGUREOPTS}
+	if [ -e /usr/bin/ocamlc.opt ]; \
+	then \
+	  ./configure -opt ${CONFIGUREOPTS}; \
+	else \
+	  ./configure ${CONFIGUREOPTS}; \
+	fi
 	if [ `arch` = ppc ] ; then ./configure ${CONFIGUREOPTS} ; fi
 	touch configure-stamp
 


signature.asc
Description: This is a digitally signed message part

Re: Bug#242761: err, patch

2004-04-08 Thread Ralf Treinen 
On Thu, Apr 08, 2004 at 03:06:29PM -0400, Mike Furr wrote:
 _now_ its attached.

Mike, thanks a lot for the patch. I'll look into this and upload
the patched package over the weekend.

Cheers -Ralf.
--

Re: Bug#242761: err, patch

2004-04-08 Thread Michael Furr 
On Thu, 8 Apr 2004, Ralf Treinen wrote:

 Mike, thanks a lot for the patch. I'll look into this and upload
 the patched package over the weekend.
I just realize that I forgot to clean it up before sending.  It really
should only include the changes in debian/control and debian/rules.  Sorry
about that.

-mike