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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 095eac936751bab72e3c6bbdfa3ede51f7198721
Merge: 4e6d6dab2ef2de6c1ad7972fc981e55a4fde7ae3 0b14713e3efd7f8f1cc8a06555d0ec8fbe496130
Author: Stephane Glondu <steph at 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 <glondu at 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 <glondu at 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 <glondu at debian.org>  Sat, 22 Sep 2012 12:43:13 +0200
+ 
+ coq (8.4dfsg-1) experimental; urgency=low
+ 
+   * New upstream release
+ 
+  -- Stéphane Glondu <glondu at 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 <glondu at 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 <glondu at 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 <glondu at 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 <glondu at 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 <glondu at 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 <glondu at 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 <glondu at 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 <glondu at 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