[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e

2013-05-08 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 5f7828e08f3583244ce7f1aa06af76caae69eb27
Author: Stephane Glondu st...@glondu.net
Date:   Wed May 8 17:47:31 2013 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 890aff0..7e91a3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+coq (8.4pl2dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu glo...@debian.org  Wed, 08 May 2013 17:47:25 +0200
+
 coq (8.4pl1dfsg-1) experimental; urgency=low
 
   * New upstream release

-- 
coq packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e

2013-05-08 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 0b14713e3efd7f8f1cc8a06555d0ec8fbe496130
Author: Stephane Glondu st...@glondu.net
Date:   Wed May 8 17:49:57 2013 +0200

Update ABI

diff --git a/debian/rules b/debian/rules
index 29dfdc5..4a033c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ ADDPREF := COQINSTALLPREFIX=$(COQPREF) OLDROOT=
 
 PACKAGES := $(shell dh_listpackages)
 
-COQ_VERSION := 8.4pl1
+COQ_VERSION := 8.4pl2
 COQ_ABI := $(COQ_VERSION)+$(OCAML_ABI)
 
 CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \

-- 
coq packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e

2013-05-08 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 095eac936751bab72e3c6bbdfa3ede51f7198721
Merge: 4e6d6dab2ef2de6c1ad7972fc981e55a4fde7ae3 
0b14713e3efd7f8f1cc8a06555d0ec8fbe496130
Author: Stephane Glondu st...@glondu.net
Date:   Wed May 8 18:01:07 2013 +0200

Merge branch 'experimental/master'

diff --combined debian/changelog
index 5caa0f7,7e91a3d..91ce92b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,63 +1,84 @@@
+ coq (8.4pl2dfsg-1) UNRELEASED; urgency=low
+ 
+   * New upstream release
+ 
+  -- Stéphane Glondu glo...@debian.org  Wed, 08 May 2013 17:47:25 +0200
+ 
+ coq (8.4pl1dfsg-1) experimental; urgency=low
+ 
+   * New upstream release
+ - 0002-Fix-use-of-HASNATDYNLINK-in-coq_makefile-output.patch
+   has been merged upstream
+ - add ocaml-findlib to Build-Depends
+ 
+  -- Stéphane Glondu glo...@debian.org  Sat, 29 Dec 2012 15:56:53 +0100
+ 
+ coq (8.4dfsg-2) experimental; urgency=low
+ 
+   * Upstream bugfix: Fix use of $(HASNATDYNLINK) in coq_makefile output
+ 
+  -- Stéphane Glondu glo...@debian.org  Sat, 22 Sep 2012 12:43:13 +0200
+ 
+ coq (8.4dfsg-1) experimental; urgency=low
+ 
+   * New upstream release
+ 
+  -- Stéphane Glondu glo...@debian.org  Mon, 20 Aug 2012 18:33:45 +0200
+ 
+ coq (8.4~gamma0+really8.4beta2+dfsg-1) experimental; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Stéphane Glondu glo...@debian.org  Tue, 05 Jun 2012 07:38:25 +0200
+ 
+ coq (8.4~beta+dfsg-4) experimental; urgency=low
+ 
+   * Recompile with camlp5 6.05 (no changes)
+ 
+  -- Stéphane Glondu glo...@debian.org  Fri, 06 Apr 2012 10:04:06 +0200
+ 
+ coq (8.4~beta+dfsg-3) experimental; urgency=low
+ 
+   * Replace proofgeneral-coq by proofgeneral in dependencies
+   * Disable a test that uses too much memory, causing random FTBFS
+ 
+  -- Stéphane Glondu glo...@debian.org  Sun, 15 Jan 2012 12:37:23 +0100
+ 
+ coq (8.4~beta+dfsg-2) experimental; urgency=low
+ 
+   * Fix a typo that caused decl_mode_plugin.cmxs not being installed,
+ making coqtop.opt useless
+   * Fix an ordering issue that was causing a test to fail in bytecode
+ 
+  -- Stéphane Glondu glo...@debian.org  Sat, 14 Jan 2012 11:11:48 +0100
+ 
+ coq (8.4~beta+dfsg-1) experimental; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Stéphane Glondu glo...@debian.org  Thu, 12 Jan 2012 18:53:08 +0100
+ 
 +coq (8.3.pl4+dfsg-2) unstable; urgency=low
 +
 +  * Recompile with camlp5 6.06 (no changes)
 +
 + -- Stéphane Glondu glo...@debian.org  Wed, 06 Jun 2012 07:35:26 +0200
 +
 +coq (8.3.pl4+dfsg-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Replace proofgeneral-coq by proofgeneral in dependencies
 +  * Switch debian/copyright to format 1.0
 +  * Bump Standards-Version to 3.9.3
 +
 + -- Stéphane Glondu glo...@debian.org  Tue, 27 Mar 2012 07:59:07 +0200
 +
 +coq (8.3.pl3+dfsg-2) unstable; urgency=low
 +
 +  * Recompile with camlp5 6.04 (no changes)
 +
 + -- Stéphane Glondu glo...@debian.org  Sun, 04 Mar 2012 18:59:12 +0100
 +
  coq (8.3.pl3+dfsg-1) unstable; urgency=low
  
* New upstream release
diff --combined debian/gbp.conf
index cec628c,68cfceb..126a7b7
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,2 -1,20 +1,18 @@@
  [DEFAULT]
  pristine-tar = True
+ filter-pristine-tar = True
+ filter = [
+ doc/common/styles/html/coqremote/cover.html,
+ doc/common/styles/html/coqremote/hevea.css,
+ doc/common/styles/html/coqremote/styles.hva,
+ doc/common/styles/html/simple/cover.html,
+ doc/common/styles/html/simple/hevea.css,
+ doc/common/styles/html/simple/styles.hva,
+ doc/common/macros.tex,
+ doc/common/title.tex,
+ doc/RecTutorial,
+ doc/faq,
+ doc/refman,
+ doc/rt,
+ doc/tools,
+ doc/tutorial ]
 -upstream-branch=experimental/upstream
 -debian-branch=experimental/master

-- 
coq packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e

2013-05-08 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 7a1180e02623fde86faf0dc0587641473b089db5
Merge: 095eac936751bab72e3c6bbdfa3ede51f7198721 
db38bb4ad9aff74576d3b7f00028d48f0447d5bd
Author: Stephane Glondu st...@glondu.net
Date:   Wed May 8 18:05:00 2013 +0200

Merge branch 'upstream'


-- 
coq packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e

2013-05-08 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 0c6687c12b628881d5660d57707f0e7ca9e521b7
Author: Stephane Glondu st...@glondu.net
Date:   Wed May 8 17:45:24 2013 +0200

New debian/watch file by Bart Martens

diff --git a/debian/watch b/debian/watch
index 07bcf5f..5d9c70d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-
-opts=dversionmangle=s/dfsg$// \
-http://coq.inria.fr/download .*/coq-(.*)\.tar\.gz
+opts=dversionmangle=s/\+?(debian|dfsg|ds|deb)\d*$// \
+http://coq.inria.fr/download .*/coq-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+# Bart Martens ba...@debian.org  Sun, 30 Dec 2012 20:22:30 +

-- 
coq packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e

2013-05-08 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 813d651c75cb954677a483b60d880600b421e011
Merge: 0c6687c12b628881d5660d57707f0e7ca9e521b7 
499a11a45b5711d4eaabe84a80f0ad3ae539d500
Author: Stephane Glondu st...@glondu.net
Date:   Wed May 8 17:47:16 2013 +0200

Merge tag 'upstream/8.4pl2dfsg' into experimental/master

Upstream version 8.4pl2dfsg


-- 
coq packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits