[Pkg-ocaml-maint-commits] r3370 - in /trunk/packages/coq/branches: 8.1/debian/changelog 8.1/debian/patches/00list 8.1/debian/patches/assert.dpatch 8.1/debian/patches/system.dpatch 8.1/debian/rules upstream/coq_8.0pl3+8.1beta.2.orig.tar.gz upstream/coq_8.1~gamma.orig.tar.gz

[smimram at users.alioth.debian.org]

Author: smimram
Date: Tue Nov 21 22:38:49 2006
New Revision: 3370

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

Added:
    trunk/packages/coq/branches/8.1/debian/patches/system.dpatch   (with props)
    trunk/packages/coq/branches/upstream/coq_8.1~gamma.orig.tar.gz   (with props)
Removed:
    trunk/packages/coq/branches/8.1/debian/patches/assert.dpatch
    trunk/packages/coq/branches/upstream/coq_8.0pl3+8.1beta.2.orig.tar.gz
Modified:
    trunk/packages/coq/branches/8.1/debian/changelog
    trunk/packages/coq/branches/8.1/debian/patches/00list
    trunk/packages/coq/branches/8.1/debian/rules

Modified: trunk/packages/coq/branches/8.1/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/changelog?rev=3370&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/changelog (original)
+++ trunk/packages/coq/branches/8.1/debian/changelog Tue Nov 21 22:38:49 2006
@@ -1,9 +1,12 @@
-coq (8.0pl3+8.1beta.2-2) UNRELEASED; urgency=low
-
+coq (8.1~gamma-1) experimental; urgency=low
+
+  * New upstream release.
   * Made the package binNMU-safe.
   * Minor improvements of the coqide.desktop file, closes: #383310.
-
- -- Samuel Mimram <smimram at debian.org>  Sat, 11 Nov 2006 12:18:59 +0100
+  * Added system.dpatch to avoid erroneous interpretation of ~.
+  * Removed assert.dpatch, integrated upstream.
+
+ -- Samuel Mimram <smimram at debian.org>  Tue, 21 Nov 2006 13:33:55 +0000
 
 coq (8.0pl3+8.1beta.2-1) experimental; urgency=low
 

Modified: trunk/packages/coq/branches/8.1/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/patches/00list?rev=3370&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/patches/00list (original)
+++ trunk/packages/coq/branches/8.1/debian/patches/00list Tue Nov 21 22:38:49 2006
@@ -1,4 +1,4 @@
 coqdoc_stdlib
 browser
 makefile
-assert
+system

Added: trunk/packages/coq/branches/8.1/debian/patches/system.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/patches/system.dpatch?rev=3370&op=file
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/patches/system.dpatch (added)
+++ trunk/packages/coq/branches/8.1/debian/patches/system.dpatch Tue Nov 21 22:38:49 2006
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## system.dpatch by Hugo Herbelin <hugo.herbelin at inria.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix interpretation of ~.
+
+ at DPATCH@
+diff -urNad coq-8.1~gamma~/lib/system.ml coq-8.1~gamma/lib/system.ml
+--- coq-8.1~gamma~/lib/system.ml	2006-05-30 16:37:04.000000000 +0000
++++ coq-8.1~gamma/lib/system.ml	2006-11-21 21:12:08.000000000 +0000
+@@ -43,7 +43,7 @@
+ 	  let v = safe_getenv (String.sub s (i+1) (n-i-1)) in
+ 	  let s = (String.sub s 0 i)^v^(String.sub s n (l-n)) in
+ 	  expand_macros s (i + String.length v)
+-      | '~' ->
++      | '~' when i = 0 ->
+ 	  let n = expand_atom s (i+1) in
+ 	  let v =
+ 	    if n=i+1 then home

Propchange: trunk/packages/coq/branches/8.1/debian/patches/system.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/coq/branches/8.1/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/rules?rev=3370&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/rules (original)
+++ trunk/packages/coq/branches/8.1/debian/rules Tue Nov 21 22:38:49 2006
@@ -54,7 +54,7 @@
 
 	-$(MAKE) clean
 	-$(MAKE) archclean
-	rm -f bin/parser.opt
+	rm -f bin/*
 	rm -f tools/coqdoc/*.cm[oi]
 	rm -f config/coq_config.ml config/Makefile test-suite/check.log
 	rm -f dev/ocamldebug-v7

Added: trunk/packages/coq/branches/upstream/coq_8.1~gamma.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/upstream/coq_8.1%7Egamma.orig.tar.gz?rev=3370&op=file
==============================================================================
Binary file - no diff available.

Propchange: trunk/packages/coq/branches/upstream/coq_8.1~gamma.orig.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream