New upstream release.

6 files changed, 41 insertions, 44 deletions

diff --git a/debian/changelog b/debian/changelog
index 51db91a9..63d6933f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+coq (8.1+dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+  * Removed system.dpatch and next-ia64.dpatch, integrated upstream.
+  * Removed the subdirectories common, faq, RecTutorial, refman, rt, tools,
+    tutorial of the directory doc since they contain documentation under the
+    Open Publication License which is not DFSG-free (thus the +dfsg in the
+    version number). The script debian/utils/purify_tarball automates this
+    process. This documentation in packaged separately in non-free, in
+    the coq-doc package.
+
+ -- Samuel Mimram <smimram@debian.org>  Tue, 13 Feb 2007 11:38:43 +0000
+
 coq (8.1~gamma-4) experimental; urgency=low
 
   * Correctly build glob.dump on non-native archs, closes: #400535.
diff --git a/debian/coq.install b/debian/coq.install
index 06ab0d12..59bcb594 100644
--- a/debian/coq.install
+++ b/debian/coq.install
@@ -8,6 +8,8 @@ usr/bin/coq-tex
 usr/bin/coqtop*
 usr/bin/coqwc
 usr/bin/gallina
+usr/lib/coq/*.cma
+usr/lib/coq/*.cmxa
 usr/lib/coq/tools/coqdoc/
 usr/share/emacs/site-lisp/coq/*
 usr/share/man/man1/c*
diff --git a/debian/patches/00list b/debian/patches/00list
index aa31c567..8c069e14 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,6 +1,4 @@
 coqdoc_stdlib
 browser
 makefile
-system
 no-complexity-test
-next-ia64
diff --git a/debian/patches/next-ia64.dpatch b/debian/patches/next-ia64.dpatch
deleted file mode 100755
index e9f7635f..00000000
--- a/debian/patches/next-ia64.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## next-ia64.dpatch by Samuel Mimram <smimram@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable not-really-needed ia64 cast which broke with gcc 4.0.
-
-@DPATCH@
-diff -urNad coq-8.1~gamma~/kernel/byterun/coq_interp.c coq-8.1~gamma/kernel/byterun/coq_interp.c
---- coq-8.1~gamma~/kernel/byterun/coq_interp.c	2006-10-27 13:29:22.000000000 +0000
-+++ coq-8.1~gamma/kernel/byterun/coq_interp.c	2006-11-26 18:37:23.000000000 +0000
-@@ -44,11 +44,7 @@
- #  ifdef DEBUG
- #    define Next goto next_instr
- #  else
--#    ifdef __ia64__
--#      define Next goto *(void *)(coq_jumptbl_base + *((uint32 *) pc)++)
--#    else
--#      define Next goto *(void *)(coq_jumptbl_base + *pc++)
--#    endif
-+#    define Next goto *(void *)(coq_jumptbl_base + *pc++)
- #  endif
- #else 
- #  define Instruct(name) case name:
diff --git a/debian/patches/system.dpatch b/debian/patches/system.dpatch
deleted file mode 100755
index ab8bded8..00000000
--- a/debian/patches/system.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## system.dpatch by Hugo Herbelin <hugo.herbelin@inria.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix interpretation of ~.
-
-@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
diff --git a/debian/utils/purify_tarball b/debian/utils/purify_tarball
new file mode 100755
index 00000000..ea7e08f1
--- /dev/null
+++ b/debian/utils/purify_tarball
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+CURDIR=`pwd`
+ORIG=$1
+WORKDIR=`dirname $ORIG`
+ORIGFILE=`basename $ORIG`
+VERSION=`echo "$ORIGFILE" | sed "s/^coq-\([0-9\.]\+\)\.tar\.gz$/\1/"`
+
+cd $WORKDIR
+
+tar zxf $ORIGFILE
+
+rm -rf coq-$VERSION/doc/common
+rm -rf coq-$VERSION/doc/faq
+rm -rf coq-$VERSION/doc/RecTutorial
+rm -rf coq-$VERSION/doc/refman
+rm -rf coq-$VERSION/doc/rt
+rm -rf coq-$VERSION/doc/tools
+rm -rf coq-$VERSION/doc/tutorial
+
+tar zcf coq_$VERSION+dfsg.orig.tar.gz coq-$VERSION/
+rm -rf coq-$VERSION
+
+cd $CURDIR