[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.7-1-15-g24cc7c2
The following commit has been merged in the master branch: commit 8c7c8071593f2a5d8979e93972e970b18a377fcb Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 16:52:28 2011 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index df3f226..47dab67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -ocamlgraph (1.7-2) UNRELEASED; urgency=low +ocamlgraph (1.8.1-1) UNRELEASED; urgency=low + + [ Stéphane Glondu ] + * New upstream release [ Stefano Zacchiroli ] * remove myself from uploaders - -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 19:23:37 +0200 + -- Stéphane Glondu glo...@debian.org Sat, 03 Dec 2011 16:52:21 +0100 ocamlgraph (1.7-1) unstable; urgency=low -- ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.7-1-15-g24cc7c2
The following commit has been merged in the master branch: commit 36929a3024bbf451e698bc6f945924c8ba5394fd Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 16:56:26 2011 +0100 Switch source package format to 3.0 (quilt) diff --git a/debian/control b/debian/control index cec247a..91f3f51 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Build-Depends: cdbs, dh-ocaml (= 0.9), debhelper (= 7), - quilt, ocaml-nox (= 3.11.1), ocaml-findlib ( 1.2.4-2), liblablgtk2-ocaml-dev, diff --git a/debian/rules b/debian/rules index 2e492fa..56f1238 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,6 @@ include /usr/share/cdbs/1/rules/ocaml.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk include $(CURDIR)/debian/mk/docbook-manpage.mk DEV_PKG = libocamlgraph-ocaml-dev diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 000..c4cf480 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +abort-on-upstream-changes +unapply-patches -- ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.7-1-15-g24cc7c2
The following commit has been merged in the master branch: commit 348079165093888678298539c922f35d399b44c1 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 16:58:48 2011 +0100 1.81 is not (really) a new version diff --git a/debian/watch b/debian/watch index 570a3a3..959bb9e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -opts=dversionmangle=s/\+debian$// \ +opts=dversionmangle=s/\+debian$//,uversionmangle=s/^1\.81$/1.8.1/ \ http://ocamlgraph.lri.fr/download/ocamlgraph-([0-9a-z.]+).tar.gz -- ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.7-1-15-g24cc7c2
The following commit has been merged in the master branch: commit 887bf013f7057b6bcc54931f028518759d611356 Merge: 9db6cd10ea5cc3de04ae48ab35e57c805fa98476 0bfeb99104c5bf12206bd09f90912acdd8422872 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 16:52:15 2011 +0100 Merge commit 'upstream/1.8.1' -- ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.7-1-15-g24cc7c2
The following commit has been merged in the master branch: commit 707df99ae74a9344c81b92594b87386c2bb01868 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 17:12:54 2011 +0100 Typo in Description (Lintian) diff --git a/debian/control b/debian/control index 91f3f51..34b8dd9 100644 --- a/debian/control +++ b/debian/control @@ -114,9 +114,9 @@ Conflicts: libocamlgraph-ocaml-dev ( 1.3+debian-2~) Replaces: libocamlgraph-ocaml-dev ( 1.3+debian-2~) -Description: Documentation for the OCamlgraph library - This package provides the API reference documentation generated by - ocamldoc. +Description: documentation for the OCamlgraph library + This package provides the API reference documentation generated by + ocamldoc. Package: ocamlgraph-editor Architecture: any -- ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.7-1-15-g24cc7c2
The following commit has been merged in the master branch: commit 16556431f281af89f6164ff331387acee9aa0119 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 17:08:32 2011 +0100 Update debian/copyright diff --git a/debian/copyright b/debian/copyright index 839aaed..4626857 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,10 +1,15 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat -Upstream-Author: Sylvain Conchon sylvain.conc...@lri.fr - Jean-Christophe Filliâtre jean-christophe.fillia...@lri.fr - Julien Signoles julien.signo...@lri.fr +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202 +Source: http://ocamlgraph.lri.fr/ +Upstream-Contact: + Sylvain Conchon sylvain.conc...@lri.fr, + Jean-Christophe Filliâtre jean-christophe.fillia...@lri.fr, + Julien Signoles julien.signo...@lri.fr Packaged-By: Sylvain Le Gall gil...@debian.org Packaged-Date: Sun, 22 Feb 2004 22:45:00 +0100 -Original-Source-Location: http://ocamlgraph.lri.fr/ + +License: LGPL-2.1 + The full text of the GNU Library General Public License version 2.1 + can be found in `/usr/share/common-licenses/LGPL-2.1'. Files: dgraph/* Copyright: © 2009 CEA @@ -13,50 +18,49 @@ License: LGPL-2.1 Files: view_graph/* Copyright: © 2008 Anne Pacalet License: LGPL-2.1 + linking exception - -The Library is distributed under the terms of the GNU Library General -Public License version 2.1 (included below). - -As a special exception to the GNU Library General Public License, you -may link, statically or dynamically, a work that uses the Library -with a publicly distributed version of the Library to produce an -executable file containing portions of the Library, and distribute -that executable file under terms of your choice, without any of the -additional requirements listed in clause 6 of the GNU Library General -Public License. By a publicly distributed version of the Library, we -mean either the unmodified Library as distributed, or a -modified version of the Library that is distributed under the -conditions defined in clause 3 of the GNU Library General Public -License. This exception does not however invalidate any other reasons -why the executable file might be covered by the GNU Library General -Public License. - + The Library is distributed under the terms of the GNU Library General + Public License version 2.1. + . + As a special exception to the GNU Library General Public License, you + may link, statically or dynamically, a work that uses the Library + with a publicly distributed version of the Library to produce an + executable file containing portions of the Library, and distribute + that executable file under terms of your choice, without any of the + additional requirements listed in clause 6 of the GNU Library General + Public License. By a publicly distributed version of the Library, + we mean either the unmodified Library as distributed, or a modified + version of the Library that is distributed under the conditions + defined in clause 3 of the GNU Library General Public License. This + exception does not however invalidate any other reasons why the + executable file might be covered by the GNU Library General Public + License. Files: * Copyright: © 2004-2010 Sylvain Conchon sylvain.conc...@lri.fr © 2004-2010 Jean-Christophe Filliâtre jean-christophe.fillia...@lri.fr © 2004-2010 Julien Signoles julien.signo...@lri.fr License: LGPL-2.1 - -The Library is distributed under the terms of the GNU Library General -Public License version 2.1 (included below). - -As a special exception to the GNU Library General Public License, you -may link, statically or dynamically, a work that uses the Library -with a publicly distributed version of the Library to produce an -executable file containing portions of the Library, and distribute -that executable file under terms of your choice, without any of the -additional requirements listed in clause 6 of the GNU Library General -Public License. By a publicly distributed version of the Library, we -mean either the unmodified Library as distributed, or a -modified version of the Library that is distributed under the -conditions defined in clause 3 of the GNU Library General Public -License. This exception does not however invalidate any other reasons -why the executable file might be covered by the GNU Library General -Public License. + The Library is distributed under the terms of the GNU Library General + Public License version 2.1. + . + As a special exception to the GNU Library General Public License, you + may link, statically or dynamically, a work that uses the Library + with a publicly distributed version of the Library to produce an + executable file containing portions of the Library, and distribute + that executable file under terms of your choice, without any of the + additional requirements listed in clause 6 of the GNU Library General + Public License. By a
[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.7-1-15-g24cc7c2
The following commit has been merged in the master branch:
commit 87a0e96e176dabf70e0d0d29529f7cc6b583251a
Author: Stephane Glondu st...@glondu.net
Date: Sat Dec 3 17:13:50 2011 +0100
Bump Standards-Version to 3.9.2
diff --git a/debian/control b/debian/control
index 34b8dd9..2de1b65 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
libxml2-utils,
xsltproc,
po4a
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Homepage: http://ocamlgraph.lri.fr/
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlgraph.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlgraph.git
@@ -67,7 +67,7 @@ Depends:
${misc:Depends}
Provides:
${ocaml:Provides}
-Conflicts:
+Breaks:
libocamlgraph-ocaml-dev ( 1.3+debian-2~)
Replaces:
libocamlgraph-ocaml-dev ( 1.3+debian-2~)
@@ -110,7 +110,7 @@ Depends:
${ocaml:Depends},
${shlibs:Depends},
${misc:Depends}
-Conflicts:
+Breaks:
libocamlgraph-ocaml-dev ( 1.3+debian-2~)
Replaces:
libocamlgraph-ocaml-dev ( 1.3+debian-2~)
--
ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.7-1-15-g24cc7c2
The following commit has been merged in the master branch:
commit d7a07bb57e727e85e2ff8981d3516315cec471fb
Author: Stephane Glondu st...@glondu.net
Date: Sat Dec 3 17:53:08 2011 +0100
Fix permissions on *.mli files (Lintian)
diff --git a/debian/rules b/debian/rules
index 56f1238..385c659 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,7 @@ DEB_MAKE_INSTALL_TARGET = install \
OCAML_DHOCAML_FLAGS += --nodefined-map $(DEV_PKG):Dgraph
install/libocamlgraph-ocaml-dev:: install/libocamlgraph-ocaml-doc
+ find $(CURDIR)/debian -name '*.mli' -exec chmod 644 '{}' ';'
mkdir -p $(CURDIR)/debian/$(VIW_PKG)/$(OCAML_STDLIB_DIR)/ocamlgraph/
for file in dgraph.cmx viewGraph_select.mli dGraphRandModel.mli
viewgraph.cmo \
dGraphViewItem.mli dGraphModel.mli dgraph.cmo viewgraph.cmx
viewgraph.cmi \
--
ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.7-1-15-g24cc7c2
The following commit has been merged in the master branch:
commit d918587cae090215695f231fc18571dbf4cc74ac
Author: Stephane Glondu st...@glondu.net
Date: Sat Dec 3 18:01:24 2011 +0100
Recommend ocaml-findlib
diff --git a/debian/control b/debian/control
index 2de1b65..2adfe60 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,8 @@ Depends:
${misc:Depends}
Provides:
${ocaml:Provides}
+Recommends:
+ ocaml-findlib
Description: graph library for OCaml
Ocamlgraph is a graph library for OCaml. Its contribution is
three-fold:
--
ocamlgraph 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
