[Pkg-ocaml-maint-commits] r5538 - in /trunk/packages/ergo: tarballs/ trunk/debian/

dogguy-guest at users.alioth.debian.org dogguy-guest at users.alioth.debian.org
Mon Apr 21 13:08:19 UTC 2008 

Author: dogguy-guest
Date: Mon Apr 21 13:08:19 2008
New Revision: 5538

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5538
Log:

- Ergo is now Alt-Ergo
- Fix encoding problems in copyright file
- Fix watch file
- DO NOT RELEASE : waiting for a clean tarball from upstream.


Added:
    trunk/packages/ergo/tarballs/alt-ergo_0.7.3.orig.tar.gz
      - copied unchanged from r5506, trunk/packages/ergo/tarballs/ergo_0.7.3.orig.tar.gz
    trunk/packages/ergo/trunk/debian/alt-ergo.dirs
      - copied, changed from r5506, trunk/packages/ergo/trunk/debian/ergo.dirs
    trunk/packages/ergo/trunk/debian/alt-ergo.manpages
      - copied unchanged from r5506, trunk/packages/ergo/trunk/debian/ergo.manpages
Removed:
    trunk/packages/ergo/tarballs/ergo_0.7.3.orig.tar.gz
    trunk/packages/ergo/trunk/debian/ergo.dirs
    trunk/packages/ergo/trunk/debian/ergo.manpages
Modified:
    trunk/packages/ergo/trunk/debian/changelog
    trunk/packages/ergo/trunk/debian/compat
    trunk/packages/ergo/trunk/debian/control
    trunk/packages/ergo/trunk/debian/copyright
    trunk/packages/ergo/trunk/debian/rules
    trunk/packages/ergo/trunk/debian/watch

Copied: trunk/packages/ergo/trunk/debian/alt-ergo.dirs (from r5506, trunk/packages/ergo/trunk/debian/ergo.dirs)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/alt-ergo.dirs?rev=5538&op=diff
==============================================================================
--- trunk/packages/ergo/trunk/debian/ergo.dirs (original)
+++ trunk/packages/ergo/trunk/debian/alt-ergo.dirs Mon Apr 21 13:08:19 2008
@@ -1,2 +1,3 @@
 usr/bin
+usr/lib/alt-ergo
 

Modified: trunk/packages/ergo/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/changelog?rev=5538&op=diff
==============================================================================
--- trunk/packages/ergo/trunk/debian/changelog (original)
+++ trunk/packages/ergo/trunk/debian/changelog Mon Apr 21 13:08:19 2008
@@ -1,8 +1,5 @@
-ergo (0.7.3-1) UNRELEASED; urgency=low
+alt-ergo (0.7.3-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #468557)
-  * Install ergoAPI
-  * Install ergo.byte
-  * Patch upstream makefile to enhance clean target
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Fri, 11 Mar 2008 15:55:41 +0100

Modified: trunk/packages/ergo/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/compat?rev=5538&op=diff
==============================================================================
--- trunk/packages/ergo/trunk/debian/compat (original)
+++ trunk/packages/ergo/trunk/debian/compat Mon Apr 21 13:08:19 2008
@@ -1,1 +1,1 @@
-5
+6

Modified: trunk/packages/ergo/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/control?rev=5538&op=diff
==============================================================================
--- trunk/packages/ergo/trunk/debian/control (original)
+++ trunk/packages/ergo/trunk/debian/control Mon Apr 21 13:08:19 2008
@@ -1,24 +1,24 @@
-Source: ergo
+Source: alt-ergo
 Section: math
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Build-Depends: debhelper (>= 5), autotools-dev, ocaml-nox (>= 3.10.0), libocamlgraph-ocaml-dev, dpatch
-Homepage: http://ergo.lri.fr
+Build-Depends: debhelper (>= 6), autotools-dev, ocaml-nox (>= 3.10.0), libocamlgraph-ocaml-dev, dpatch
+Homepage: http://alt-ergo.lri.fr
 Standards-Version: 3.7.3
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ergo
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/
 
-Package: ergo
+Package: alt-ergo
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlRun}
 Suggests: why
 Description: Automatic theorem prover dedicated to program verification
- Ergo is an automatic theorem prover dedicated to program verification. 
- Ergo is based on CC(X) a congruence closure algorithm parameterized by an 
+ Alt-Ergo is an automatic theorem prover dedicated to program verification. 
+ Alt-Ergo is based on CC(X) a congruence closure algorithm parameterized by an 
  equational theory X. Currently, CC(X) can be instantiated by the empty 
- equational theory and by the linear arithmetics. Ergo contains also a home 
+ equational theory and by the linear arithmetics. Alt-Ergo contains also a home 
  made SAT-solver and an instantiation mechanism.
  .
- Ergo is both safe and modular: each box is described by a small set of 
+ Alt-Ergo is both safe and modular: each box is described by a small set of 
  inference rules and is implemented as an OCaml functor.

Modified: trunk/packages/ergo/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/copyright?rev=5538&op=diff
==============================================================================
--- trunk/packages/ergo/trunk/debian/copyright (original)
+++ trunk/packages/ergo/trunk/debian/copyright Mon Apr 21 13:08:19 2008
@@ -1,36 +1,25 @@
 This package was debianized by Mehdi Dogguy <dogguy at pps.jussieu.fr> on
 Fri, 22 Feb 2008 10:09:03 +0100.
 
-It was downloaded from <http://ergo.lri.fr/http/>
-
-    Sylvain Conchon <conchon at lri.fr>
-    Evelyne Contejean <contejea at lri.fr>
-    Johannes Kanig <kanig at lri.fr>
-    Stephane Lescuyer <lescuyer at lri.fr>
-
-    Some code is contributed by :
-    Jean-Christophe FILLIATRE <filliatr at lri.fr>
-
-Copyright: 
-
-    <Copyright (C) 2006 Sylvain Conchon>
-
-    heap.ml, heap.mli :
-    <Copyright (C) 2003 Jean-Christophe FILLIATRE>
-    <Copyright (C) 1996 INRIA>
-
-    configure.in, Makefile.in :
-    <Copyright (C) 2001 Jean-Christophe FILLIATRE>
-
-    hashcons.ml, hashcons.mli :
-    <Copyright (C) 2000 Jean-Christophe FILLIATRE>
-
-    why_lexer.mll, why_parser.mly :
-    <Copyright (C) 2002 Jean-Christophe FILLIATRE>
-
-License:
-
-    Ergo's licence is CeCILL-C:
+It was downloaded from <http://alt-ergo.lri.fr/http/>
+
+Files: heap.ml{,i}
+Copyright: © 2003 Jean-Christophe FILLIÂTRE <filliatr at lri.fr>
+           © 1996 INRIA
+
+Files: configure.in,Makefile.in
+Copyright: © 2001 Jean-Christophe FILLIÂTRE <filliatr at lri.fr>
+
+Files: hashcons.ml{,i}
+Copyright: © 2000 Jean-Christophe FILLIÂTRE <filliatr at lri.fr>
+
+Files: why_lexer.mll,why_parser.mly
+Copyright: © 2002 Jean-Christophe FILLIÂTRE <filliatr at lri.fr>
+
+Copyright: © 2006 Sylvain Conchon
+License: CeCILL-C
+
+    Alt-Ergo's licence is CeCILL-C:
 
 
                  CeCILL-C FREE SOFTWARE LICENSE AGREEMENT
@@ -53,7 +42,7 @@
 The authors of the CeCILL-C (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])
 license are:
 
-Commissariat à l'Energie Atomique - CEA, a public scientific, technical
+Commissariat à l'Energie Atomique - CEA, a public scientific, technical
 and industrial research establishment, having its principal place of
 business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France.
 
@@ -372,7 +361,7 @@
 
 The Licensee undertakes not to directly or indirectly infringe the
 intellectual property rights of the Holder and/or Contributors on the
-Software and to take, where applicable, vis-à-vis its staff, any and all
+Software and to take, where applicable, vis-à-vis its staff, any and all
 measures required to ensure respect of said intellectual property rights
 of the Holder and/or Contributors.
 
@@ -551,5 +540,5 @@
 Version 1.0 dated 2006-09-05.
 
 
-The Debian packaging is (C) 2008, Mehdi Dogguy <dogguy at pps.jussieu.fr> and
+The Debian packaging is © 2008, Mehdi Dogguy <dogguy at pps.jussieu.fr> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Modified: trunk/packages/ergo/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/rules?rev=5538&op=diff
==============================================================================
--- trunk/packages/ergo/trunk/debian/rules (original)
+++ trunk/packages/ergo/trunk/debian/rules Mon Apr 21 13:08:19 2008
@@ -16,18 +16,13 @@
 
 OCAMLABI  = $(shell ocamlc -version)
 BYTECODE  = $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
-OCAMLRUN  = ocaml-base-nox-$(OCAMLABI)
+OCAMLRUN  = $(if $(BYTECODE),ocaml-base-nox-$(OCAMLABI),)
 OCAMLBEST = $(if $(BYTECODE),byte,opt)
-OPTTARGET = byte api.byte $(if $(BYTECODE),,opt api.opt)
+OPTTARGET = api.byte $(if $(BYTECODE),byte,opt api.opt)
 APIFILES  = ergoAPI.cma $(if $(BYTECODE),,ergoAPI.cmxa)
 MAKEOPTS  = OCAMLC=ocamlc OCAMLOPT=ocamlopt OCAMLLEX=ocamllex OCAMLLIB=/usr/lib/ocaml/$(OCAMLABI) OCAMLVERSION=$(OCAMLABI)
 
-ocamlinit:
-	if [ -x /usr/bin/ocamlopt ]; then \
-		echo "usr/share/man/man1/ergo.1.gz usr/share/man/man1/ergo.byte.1.gz" > debian/ergo.links; \
-	fi
-
-config.status: ocamlinit
+config.status: 
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 	--build=$(DEB_BUILD_GNU_TYPE)           \
@@ -61,9 +56,10 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	$(MAKE) prefix=$(CURDIR)/debian/ergo/usr install-indep install-$(OCAMLBEST)
-	[ -x /usr/bin/ocamlopt ] && cp ergo.byte $(CURDIR)/debian/ergo/usr/bin/
-	cp $(APIFILES) $(CURDIR)/debian/ergo/usr/lib/ergo/
+#	$(MAKE) prefix=$(CURDIR)/debian/alt-ergo/usr install-$(OCAMLBEST)
+	cp -f ergo.$(OCAMLBEST) $(CURDIR)/debian/alt-ergo/usr/bin/ergo
+	cp -f smt_prelude.mlw $(CURDIR)/debian/alt-ergo/usr/lib/alt-ergo/
+	cp -f $(APIFILES) $(CURDIR)/debian/alt-ergo/usr/lib/alt-ergo/
 
 binary-indep: build install
 
@@ -74,7 +70,9 @@
 	dh_installdocs
 	dh_installman
 	dh_link
-	dh_strip
+	if [ "$(OCAMLBEST)" = "opt" ]; then \
+		dh_strip;                   \
+	fi
 	dh_compress
 	dh_fixperms
 	dh_installdeb

Modified: trunk/packages/ergo/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/watch?rev=5538&op=diff
==============================================================================
--- trunk/packages/ergo/trunk/debian/watch (original)
+++ trunk/packages/ergo/trunk/debian/watch Mon Apr 21 13:08:19 2008
@@ -1,3 +1,3 @@
 version=3
-http://ergo.lri.fr/http/ergo-(.*)\.tar\.gz
+http://alt-ergo.lri.fr/http/alt-ergo-(.*)\.tar\.gz

More information about the Pkg-ocaml-maint-commits mailing list