[Pkg-ocaml-maint-commits] [ssreflect] 03/06: Import 1.6

Mon Sep 26 15:36:39 UTC 2016

This is an automated email from the git hooks/post-receive script.

gareuselesinge pushed a commit to branch master
in repository ssreflect.

commit 7087e595203abd721703429e298e8af9987e128b
Author: Enrico Tassi <gares at fettunta.org>
Date:   Fri Sep 2 10:25:51 2016 +0200

    Import 1.6
---
 debian/changelog                         |  7 ++++++
 debian/control                           |  6 ++---
 debian/copyright                         | 40 ++++++++++++++++++++++++++++++++
 debian/libssreflect-coq.doc-base         |  8 +++----
 debian/libssreflect-coq.docs             |  2 +-
 debian/libssreflect-coq.examples         |  3 +--
 debian/libssreflect-coq.install          |  4 +++-
 debian/libssreflect-ocaml-dev.install.in |  4 ++--
 debian/libssreflect-ocaml.install.in     |  4 ++--
 debian/rules                             | 19 ++++++++-------
 10 files changed, 73 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 569d562..ae577d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ssreflect (1.6-1) unstable; urgency=medium
+
+  * Adding myself as co-maintainer.
+  * Update upstream version to 1.6
+
+ -- Enrico Tassi <gareuselesinge at debian.org>  Tue, 30 Aug 2016 16:02:06 +0200
+
 ssreflect (1.5-3) unstable; urgency=medium
 
   * Recompile with OCaml 4.02.3
diff --git a/debian/control b/debian/control
index 4e7d893..865b4a5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ssreflect
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Stéphane Glondu <glondu at debian.org>
+Uploaders: Stéphane Glondu <glondu at debian.org>, Enrico Tassi <gareuselesinge at debian.org>
 Build-Depends:
  debhelper (>= 8),
  coq (>= 8.4),
@@ -12,7 +12,7 @@ Build-Depends:
  ocaml-nox (>= 4)
 Standards-Version: 3.9.5
 Section: math
-Homepage: http://www.msr-inria.fr/projects/mathematical-components/
+Homepage: https://math-comp.github.io/math-comp/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/ssreflect.git
 Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ssreflect.git
 
@@ -53,7 +53,7 @@ Depends:
  libssreflect-ocaml (>= ${source:Version}),
  coq-${F:CoqABI},
  ${misc:Depends}
-Provides: ssreflect
+Provides: ssreflect, libmathcomp-coq
 Description: small scale reflection library for Coq (theories)
  The name Ssreflect stands for "small scale reflection", a style of
  proof that evolved from the computer-checked proof of the Four Colour
diff --git a/debian/copyright b/debian/copyright
index 9f1802c..8a518eb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,6 +28,46 @@ Files: debian/*
 Copyright: © 2008-2011 Stéphane Glondu <glondu at debian.org>
 License: CeCILL-B
 
+Files: htmldoc/js/dagre.js
+Copyright: © 2012-2014 Chris Pettitt <cpettitt at gmail.com>
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+Files: htmldoc/js/cytoscape.js
+Copyright: © 2016 The Cytoscape Consortium
+License: LGPL-3+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-3".
+
 License: CeCILL-B
  CeCILL-B FREE SOFTWARE LICENSE AGREEMENT
  .
diff --git a/debian/libssreflect-coq.doc-base b/debian/libssreflect-coq.doc-base
index 6c49640..7faf4f2 100644
--- a/debian/libssreflect-coq.doc-base
+++ b/debian/libssreflect-coq.doc-base
@@ -1,7 +1,7 @@
-Document: ssreflect-library
-Title: The Ssreflect Library
-Author: The Ssreflect Development Team
-Abstract: This is the coqdoc-generated documentation for Ssreflect
+Document: mathematical-components-library
+Title: The Mathematical Components Library
+Author: The Mathematical Components Development Team
+Abstract: This is the coqdoc-generated documentation for Mathematical Components
 Section: Science/Mathematics
 
 Format: HTML
diff --git a/debian/libssreflect-coq.docs b/debian/libssreflect-coq.docs
index f510413..781dd3a 100644
--- a/debian/libssreflect-coq.docs
+++ b/debian/libssreflect-coq.docs
@@ -1,2 +1,2 @@
-ANNOUNCE
+ChangeLog
 README
diff --git a/debian/libssreflect-coq.examples b/debian/libssreflect-coq.examples
index a1d5761..6b59762 100644
--- a/debian/libssreflect-coq.examples
+++ b/debian/libssreflect-coq.examples
@@ -1,2 +1 @@
-pg-ssr.el
-doc/*.v
+mathcomp/ssreflect/pg-ssr.el
diff --git a/debian/libssreflect-coq.install b/debian/libssreflect-coq.install
index 954a1bf..e49008c 100644
--- a/debian/libssreflect-coq.install
+++ b/debian/libssreflect-coq.install
@@ -1,2 +1,4 @@
-                  usr/lib/coq/user-contrib/Ssreflect/*.vo
+                  usr/lib/coq/user-contrib/mathcomp/*/*.vo
+                  usr/lib/coq/user-contrib/mathcomp/*/*.v
+                  usr/lib/coq/user-contrib/mathcomp/*/*.glob
 html              usr/share/doc/libssreflect-coq
diff --git a/debian/libssreflect-ocaml-dev.install.in b/debian/libssreflect-ocaml-dev.install.in
index d402bff..c7800b0 100644
--- a/debian/libssreflect-ocaml-dev.install.in
+++ b/debian/libssreflect-ocaml-dev.install.in
@@ -1,2 +1,2 @@
-usr/lib/coq/user-contrib/Ssreflect/ssrmatching.cmi
-usr/lib/coq/user-contrib/Ssreflect/ssreflect.cmi
+usr/lib/coq/user-contrib/mathcomp/ssrmatching.cmi
+usr/lib/coq/user-contrib/mathcomp/ssreflect.cmi
diff --git a/debian/libssreflect-ocaml.install.in b/debian/libssreflect-ocaml.install.in
index 525b8ff..821de39 100644
--- a/debian/libssreflect-ocaml.install.in
+++ b/debian/libssreflect-ocaml.install.in
@@ -1,2 +1,2 @@
-     usr/lib/coq/user-contrib/Ssreflect/ssreflect.cma
-DYN: usr/lib/coq/user-contrib/Ssreflect/ssreflect.cmxs
+     usr/lib/coq/user-contrib/mathcomp/ssreflect.cma
+DYN: usr/lib/coq/user-contrib/mathcomp/ssreflect.cmxs
diff --git a/debian/rules b/debian/rules
index f5833c1..39815a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,14 @@ export COQBIN := /usr/bin/
 
 PACKAGES := $(shell dh_listpackages)
 
-INSTALL_DIR := $(CURDIR)/debian/tmp/usr/lib/coq/user-contrib/Ssreflect
+INSTALL_DIR := $(CURDIR)/debian/tmp/usr/lib/coq/user-contrib/mathcomp
 
 # The following must be kept in sync with d/libssreflect-ocaml*.install.in
-PLUGIN_TARGETS := theories/ssreflect.cma
+PLUGIN_TARGETS := ssreflect.cma
 ifeq ($(OCAML_NATDYNLINK),yes)
-  PLUGIN_TARGETS += theories/ssreflect.cmxs
+  PLUGIN_TARGETS += ssreflect.cmxs
 endif
-EXTRA_FILES := src/ssrmatching.cmi src/ssreflect.cmi
+EXTRA_FILES := ssrmatching.cmi ssreflect.cmi
 
 %:
 	+dh $@ --with ocaml
@@ -31,15 +31,16 @@ override_dh_auto_build:
 override_dh_auto_install:
 ifeq ($(findstring libssreflect-coq,$(PACKAGES)),)
 # Express build: only plugins
-	$(MAKE) Makefile.coq
-	$(MAKE) -f Makefile.coq $(PLUGIN_TARGETS)
+	$(MAKE) -C mathcomp Makefile.coq
+	$(MAKE) -C mathcomp -f Makefile.coq $(PLUGIN_TARGETS)
 	install -d $(INSTALL_DIR)
 	install -m 644 $(PLUGIN_TARGETS) $(EXTRA_FILES) $(INSTALL_DIR)
 else
 # Full build
-	$(MAKE)
-	$(MAKE) install DSTROOT=$(CURDIR)/debian/tmp
-	$(MAKE) -f Makefile.coq html
+	$(MAKE) -C mathcomp
+	$(MAKE) -C mathcomp install DSTROOT=$(CURDIR)/debian/tmp
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/libssreflect-coq/html
+	cp -r htmldoc $(CURDIR)/debian/tmp/html
 endif
 
 .PHONY: override_dh_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ssreflect.git

