summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
-rw-r--r--debian/patches/0001-Fix-thumb2-related-build-error.patch25
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules2
4 files changed, 10 insertions, 29 deletions
diff --git a/debian/changelog b/debian/changelog
index e5610bfc..2508e173 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-coq (8.3.pl2+dfsg-2~bpo60+1) squeeze-backports; urgency=low
+coq (8.3.pl3+dfsg-1~bpo60+1) squeeze-backports; urgency=low
* Backport to Squeeze
* Downgrade versioned build-dependency to liblablgtk2-ocaml-dev
- -- Stéphane Glondu <glondu@debian.org> Sat, 12 Nov 2011 15:55:18 +0100
+ -- Stéphane Glondu <glondu@debian.org> Sat, 07 Jan 2012 18:20:49 +0100
+
+coq (8.3.pl3+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ - remove all patches (applied upstream)
+
+ -- Stéphane Glondu <glondu@debian.org> Sun, 25 Dec 2011 13:46:09 +0100
coq (8.3.pl2+dfsg-2) unstable; urgency=low
diff --git a/debian/patches/0001-Fix-thumb2-related-build-error.patch b/debian/patches/0001-Fix-thumb2-related-build-error.patch
deleted file mode 100644
index 3aab299c..00000000
--- a/debian/patches/0001-Fix-thumb2-related-build-error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Tue, 19 Apr 2011 12:45:34 +0200
-Subject: Fix thumb2-related build error
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622882
-Signed-off-by: Konstantinos Margaritis <markos@genesi-usa.com>
-Signed-off-by: Stephane Glondu <steph@glondu.net>
----
- kernel/byterun/coq_interp.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/kernel/byterun/coq_interp.c b/kernel/byterun/coq_interp.c
-index cce2319..a0cb4f1 100644
---- a/kernel/byterun/coq_interp.c
-+++ b/kernel/byterun/coq_interp.c
-@@ -145,7 +145,7 @@ sp is a local copy of the global variable extern_sp. */
- #define SP_REG asm("a4")
- #define ACCU_REG asm("d7")
- #endif
--#ifdef __arm__
-+#if defined(__arm__) && !defined(__thumb2__)
- #define PC_REG asm("r9")
- #define SP_REG asm("r8")
- #define ACCU_REG asm("r7")
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0bde233f..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-thumb2-related-build-error.patch
diff --git a/debian/rules b/debian/rules
index f34c0ae2..a364ad70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ ADDPREF := COQINSTALLPREFIX=$(COQPREF) OLDROOT=
PACKAGES := $(shell dh_listpackages)
-COQ_VERSION := 8.3pl2
+COQ_VERSION := 8.3pl3
COQ_ABI := $(COQ_VERSION)+$(OCAML_ABI)
CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \