[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.3.pl3+dfsg-2-8-g7ea6f00

2012-03-27 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit ad988252cac876f0b9998b5223f565d0a22aebb8
Merge: 11b04078a227fd8849972d05417487520177fb04 
6e34b272d789455a9be589e27ad3a998cf25496b
Author: Stephane Glondu st...@glondu.net
Date:   Tue Mar 27 07:48:23 2012 +0200

Merge tag 'upstream/8.3.pl4+dfsg'

Upstream version 8.3.pl4+dfsg


-- 
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.3.pl3+dfsg-2-8-g7ea6f00

2012-03-27 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 4482ea1edb5570f0beca73183c1d32756970c317
Author: Stephane Glondu st...@glondu.net
Date:   Sat Jan 14 11:13:29 2012 +0100

Call dh_install with --fail-missing

diff --git a/debian/rules b/debian/rules
index f35e0de..3e9a883 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ override_dh_auto_install:
 
 .PHONY: override_dh_install
 override_dh_install:
-   dh_install --list-missing
+   dh_install --fail-missing
cp debian/coq.xpm debian/coqide/usr/share/pixmaps/coqide.xpm
 
 .PHONY: override_dh_gencontrol

-- 
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.3.pl3+dfsg-2-8-g7ea6f00

2012-03-27 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit d06daee9d257c470bba9c29c283b506201db86fa
Author: Stephane Glondu st...@glondu.net
Date:   Tue Mar 27 07:50:59 2012 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 6367865..05e3385 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+coq (8.3.pl4+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu glo...@debian.org  Tue, 27 Mar 2012 07:50:16 +0200
+
 coq (8.3.pl3+dfsg-2) unstable; urgency=low
 
   * Recompile with camlp5 6.04 (no changes)
diff --git a/debian/rules b/debian/rules
index a364ad7..f35e0de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ ADDPREF := COQINSTALLPREFIX=$(COQPREF) OLDROOT=
 
 PACKAGES := $(shell dh_listpackages)
 
-COQ_VERSION := 8.3pl3
+COQ_VERSION := 8.3pl4
 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.3.pl3+dfsg-2-8-g7ea6f00

2012-03-27 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit b2e7bf847ea2669ec3231cfd62e8d77c901df363
Author: Stephane Glondu st...@glondu.net
Date:   Sat Jan 14 15:11:23 2012 +0100

proofgeneral-coq has been dropped in favour of proofgeneral

diff --git a/debian/control b/debian/control
index 98b15dc..f2a5e66 100644
--- a/debian/control
+++ b/debian/control
@@ -29,10 +29,10 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: coq-${F:CoqABI}
-Recommends: coqide | proofgeneral-coq
+Recommends: coqide | proofgeneral
 Suggests:
  ocaml-nox,
- proofgeneral-coq,
+ proofgeneral,
  ledit | readline-editor,
  libcoq-ocaml-dev,
  why (= 2.19),
@@ -48,7 +48,7 @@ Description: proof assistant for higher-order logic (toplevel 
and compiler)
  .
  A graphical interface for Coq is provided in the coqide package.
  Coq can also be used with ProofGeneral, which allows proofs to be
- edited using emacs and xemacs. This requires the proofgeneral-coq
+ edited using emacs and xemacs. This requires the proofgeneral
  package to be installed.
 
 Package: coqide

-- 
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.3.pl3+dfsg-2-8-g7ea6f00

2012-03-27 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 62d9cc7bb328a0a3a803f9b638a398fc4fec1ad9
Author: Stephane Glondu st...@glondu.net
Date:   Tue Mar 27 07:54:24 2012 +0200

Bump Standards-Version to 3.9.3

diff --git a/debian/control b/debian/control
index f2a5e66..2e104f0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Ralf Treinen trei...@debian.org,
  Samuel Mimram smim...@debian.org,
  Stéphane Glondu glo...@debian.org
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Build-Depends:
  debhelper (= 7.2.11~),
  dh-ocaml (= 0.9.5~),

-- 
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.3.pl3+dfsg-2-8-g7ea6f00

2012-03-27 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 7ea6f0085c0c5ba14e846bad255923e505e7b168
Author: Stephane Glondu st...@glondu.net
Date:   Tue Mar 27 07:57:05 2012 +0200

Update changelog and prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 05e3385..2dc21b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-coq (8.3.pl4+dfsg-1) UNRELEASED; urgency=low
+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:50:16 +0200
+ -- Stéphane Glondu glo...@debian.org  Tue, 27 Mar 2012 07:59:07 +0200
 
 coq (8.3.pl3+dfsg-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 6ff2511..4a84b1d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,23 @@
-Packaged-By: Fernando Sanchez f...@debian.org
-Packaged-Date: Fri, 03 Dec 1999 22:06:04 +0100
-Original-Source-Location: http://coq.inria.fr/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
-Files: *
-Copyright: © 1999-2010 The Coq development team,
-   INRIA, CNRS, University Paris Sud,
-   University Paris 7, Ecole Polytechnique.
 License: LGPL-2.1
+ The Coq Proof Assistant is distributed under the terms of the GNU
+ Lesser General Public Licence, version 2.1, see
+ /usr/share/common-licenses/LGPL-2.1.
 
-  This product includes also software developed by
-Pierre Crégut, France Telecom R  D (plugins/omega and plugins/romega)
-Pierre Courtieu and Julien Forest, CNAM (plugins/funind)
-Claudio Sacerdoti Coen, HELM, University of Bologna, (plugins/xml)
-Pierre Corbineau, Radbout University, Nijmegen (declarative mode)
-John Harrison, University of Cambridge (csdp wrapper)
-
-  The file /usr/share/doc/coq/CREDITS.gz contains a list of contributors.
-
-  The Coq Proof Assistant is distributed under the terms of the GNU
-  Lesser General Public Licence, version 2.1, see
-  /usr/share/common-licenses/LGPL-2.1.
+Files: *
+Copyright: 1999-2010, The Coq development team,
+  INRIA, CNRS, University Paris Sud,
+  University Paris 7, Ecole Polytechnique.
+License: LGPL-2.1
+ This product includes also software developed by
+   Pierre Crégut, France Telecom R  D (plugins/omega and plugins/romega)
+   Pierre Courtieu and Julien Forest, CNAM (plugins/funind)
+   Claudio Sacerdoti Coen, HELM, University of Bologna, (plugins/xml)
+   Pierre Corbineau, Radbout University, Nijmegen (declarative mode)
+   John Harrison, University of Cambridge (csdp wrapper)
+ .
+ The file /usr/share/doc/coq/CREDITS.gz contains a list of contributors.
 
 Files: debian/*
 Copyright: © 1999-2000 Fernando Sanchez f...@debian.org

-- 
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