[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, experimental/master, updated. debian/8.4_gamma0+really8.4beta2+dfsg-1-7-ge0356f0
The following commit has been merged in the experimental/master branch: commit e0356f0d6ec9310a3863f1983f7264847be3c274 Author: Stephane Glondu Date: Mon Aug 20 18:33:50 2012 +0200 Prepare upload to experimental diff --git a/debian/changelog b/debian/changelog index 6dc59d0..3200992 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -coq (8.4dfsg-1) UNRELEASED; urgency=low +coq (8.4dfsg-1) experimental; urgency=low * New upstream release - -- Stéphane Glondu Mon, 20 Aug 2012 18:27:33 +0200 + -- Stéphane Glondu Mon, 20 Aug 2012 18:33:45 +0200 coq (8.4~gamma0+really8.4beta2+dfsg-1) experimental; urgency=low -- 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, experimental/master, updated. debian/8.4_gamma0+really8.4beta2+dfsg-1-7-ge0356f0
The following commit has been merged in the experimental/master branch: commit 72959f444c4247c47f63b2499230cb79c208ce51 Author: Stephane Glondu Date: Mon Aug 20 18:33:26 2012 +0200 Update ABI diff --git a/debian/rules b/debian/rules index d885ece..ad53d1f 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,7 @@ ADDPREF := COQINSTALLPREFIX=$(COQPREF) OLDROOT= PACKAGES := $(shell dh_listpackages) -COQ_VERSION := 8.4beta2 +COQ_VERSION := 8.4 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, experimental/master, updated. debian/8.4_gamma0+really8.4beta2+dfsg-1-7-ge0356f0
The following commit has been merged in the experimental/master branch: commit 65f39a78452feed5f4138ffd4846356b9bc57439 Author: Stephane Glondu Date: Mon Aug 20 18:27:39 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index a67dc78..6dc59d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +coq (8.4dfsg-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Mon, 20 Aug 2012 18:27:33 +0200 + coq (8.4~gamma0+really8.4beta2+dfsg-1) experimental; urgency=low * New upstream beta 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, experimental/master, updated. debian/8.4_gamma0+really8.4beta2+dfsg-1-7-ge0356f0
The following commit has been merged in the experimental/master branch: commit 595aa062e10b8d7100ec2ad9b766f9e624e47295 Merge: ab08ae9f0f944d9f801c44e4ffd3e6b7fcf4b024 e0d682ec25282a348d35c5b169abafec48555690 Author: Stephane Glondu Date: Mon Aug 20 18:27:02 2012 +0200 Merge tag 'upstream/8.4dfsg' into experimental/master Upstream version 8.4dfsg -- 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, experimental/master, updated. debian/8.4_gamma0+really8.4beta2+dfsg-1-7-ge0356f0
The following commit has been merged in the experimental/master branch: commit ab08ae9f0f944d9f801c44e4ffd3e6b7fcf4b024 Author: Stephane Glondu Date: Mon Aug 20 18:25:30 2012 +0200 Use experimental branches diff --git a/debian/gbp.conf b/debian/gbp.conf index 126a7b7..68cfceb 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -16,3 +16,5 @@ filter = [ "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, experimental/master, updated. debian/8.4_gamma0+really8.4beta2+dfsg-1-7-ge0356f0
The following commit has been merged in the experimental/master branch: commit 72deb90ec0aca34501f0476c013e2cee7ccd1f2a Author: Stephane Glondu 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 , Mon, 31 May 2010 15:30:50 +0200 + -- Stéphane Glondu , 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 ___ 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
