summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Stephane Glondu <steph@glondu.net>2011-02-26 18:02:53 +0100
committerGravatar Stephane Glondu <steph@glondu.net>2011-02-26 18:02:53 +0100
commitfd881d28abea04fa7f4613054903129c7a633dbf (patch)
tree0b37b2129baec4e8a83b7cdcd5fa8a81cad4f69d
parent2ac35e66973d32cee6afb62f81d2abf657ab511a (diff)
parent9a65bba53c76358913f02222c968c5880ea34208 (diff)
Merge sid branch
-rw-r--r--debian/changelog34
-rw-r--r--debian/control2
2 files changed, 9 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog
index b2352fbc..d87646b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,38 +5,20 @@ coq (8.3.pl1+dfsg-1) experimental; urgency=low
* debian/rules:
- run test-suite in override_dh_auto_test, skip coqchk run
- make "build" explicitly a phony target
-
- -- Stéphane Glondu <glondu@debian.org> Fri, 24 Dec 2010 12:51:59 +0100
-
-coq (8.3+dfsg-1) experimental; urgency=low
-
- * New upstream release
- - add 0001-Fix-missing-coqlib-argument-to-coqdep-in-test-suite.patch
- * Bump Standards-Version to 3.9.1 (no changes)
-
- -- Stéphane Glondu <glondu@debian.org> Sat, 16 Oct 2010 09:56:23 +0200
-
-coq (8.3~rc1+dfsg-1) experimental; urgency=low
-
- * New upstream release candidate
-
- -- Stéphane Glondu <glondu@debian.org> Tue, 10 Aug 2010 19:22:15 +0200
-
-coq (8.3~beta0+13323-1) experimental; urgency=low
-
- * New upstream snapshot
* Update copyright file
* Fix installation of emacs files
+ * Install plugins in new binary package libcoq-ocaml
+ * Bump Standards-Version to 3.9.1 (no changes)
- -- Stéphane Glondu <glondu@debian.org> Sat, 24 Jul 2010 20:17:44 +0200
+ -- Stéphane Glondu <glondu@debian.org> Fri, 24 Dec 2010 12:51:59 +0100
-coq (8.3~beta0+13298-1) experimental; urgency=low
+coq (8.2.pl2+dfsg-2) unstable; urgency=low
- * New upstream snapshot
- - remove all patches
- * Install plugins in new binary package libcoq-ocaml
+ * Add Fix-build-with-camlp5-6.02.1.patch
+ * Bump versioned build-dependency on liblablgtk2-ocaml-dev to ease
+ lablgtk2 transition
- -- Stéphane Glondu <glondu@debian.org> Wed, 21 Jul 2010 15:16:53 +0200
+ -- Stéphane Glondu <glondu@debian.org> Mon, 21 Feb 2011 16:51:11 +0100
coq (8.2.pl2+dfsg-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cc64c1b2..d093e79e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
ocaml-nox (>= 3.11.1-3~),
ocaml-best-compilers,
camlp5 (>= 5.12-2~),
- liblablgtk2-ocaml-dev (>= 2.14),
+ liblablgtk2-ocaml-dev (>= 2.14.2),
texlive-latex-extra,
hevea (>= 1.10-7)
Homepage: http://coq.inria.fr/