[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, experimental/master, updated. debian/8.4_gamma0+really8.4beta2+dfsg-1-7-ge0356f0

[Stephane Glondu]

The following commit has been merged in the experimental/master branch:
commit 72deb90ec0aca34501f0476c013e2cee7ccd1f2a
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Aug 20 18:18:30 2012 +0200

    Use filter-pristine-tar and change versioning scheme

diff --git a/debian/README.source b/debian/README.source
index ab1f26c..37984e0 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -16,10 +16,10 @@ Only coqdoc-generated documentation of the standard library is shipped
 in main. The full documentation is shipped in non-free (as coq-doc
 package).
 
-The script debian/purify_tarball removes non-DFSG content from an
-upstream tarball. It should be run first when packaging a new upstream
-version. The suffix "+dfsg" is used to being appended to upstream
-version (the script will do it for you).
+The git-import-orig tool automatically filters out problematic files,
+thanks to the configuration in debian/gbp.conf. It is suggested to
+append the "dfsg" suffix to the upstream version to make repackaging
+explicit.
 
 
 Patch system
@@ -53,4 +53,4 @@ to ../coq.cache, and debian/rules will detect its presence and rsync
 from there instead of really compiling Coq...
 
 
- -- Stéphane Glondu <glondu at debian.org>, Mon, 31 May 2010 15:30:50 +0200
+ -- Stéphane Glondu <glondu at debian.org>, Mon, 20 Aug 2012 18:20:18 +0200
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..126a7b7 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +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" ]
diff --git a/debian/watch b/debian/watch
index 37d7051..07bcf5f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=uversionmangle=s/pl/.pl/,dversionmangle=s/\+dfsg\d*$// \
-        http://coq.inria.fr/download distrib/[^/]+/files/coq-(.*)\.tar\.gz
+opts=dversionmangle=s/dfsg$// \
+        http://coq.inria.fr/download .*/coq-(.*)\.tar\.gz

-- 
coq packaging