[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit 93e069bdad63034e5089ddd3f5f7b214b29cc094 Merge: df5e005184a5a08d0e3672c6e75f062781bbc94f ab72b872572793778e5276796add719af4d71a44 Author: Stephane Glondu st...@glondu.net Date: Tue Jun 5 11:12:17 2012 +0200 Merge tag 'upstream/1.3.1' Upstream version 1.3.1 -- findlib 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] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit c4d50331333455368c42fc10042946ec8ce0b490 Author: Stephane Glondu st...@glondu.net Date: Tue Jun 5 11:12:28 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index bb19307..71e09ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +findlib (1.3.1-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Tue, 05 Jun 2012 11:12:22 +0200 + findlib (1.2.8+debian-1) unstable; urgency=low * New upstream release -- findlib 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] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit 1d5ee1e1597c600d69022f17b79919a863bf81ba Author: Stephane Glondu st...@glondu.net Date: Tue Jun 5 11:23:39 2012 +0200 Refresh patches diff --git a/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch b/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch index 090d6d0..8d67103 100644 --- a/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch +++ b/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch @@ -11,7 +11,7 @@ Forwarded: not-needed Signed-off-by: Stephane Glondu st...@glondu.net --- findlib.conf.in |4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/findlib.conf.in b/findlib.conf.in index 261d2c8..05f6c3d 100644 diff --git a/debian/patches/0002-Extra-configuration-search-path.patch b/debian/patches/0002-Extra-configuration-search-path.patch index 6f80b50..f81e68a 100644 --- a/debian/patches/0002-Extra-configuration-search-path.patch +++ b/debian/patches/0002-Extra-configuration-search-path.patch @@ -10,13 +10,13 @@ Signed-off-by: Stephane Glondu st...@glondu.net --- src/findlib/findlib.ml |9 - src/findlib/findlib_config.mlp |1 + - 2 files changed, 9 insertions(+), 1 deletions(-) + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml -index 28c86a0..8894ed6 100644 +index 8f99932..4f8fe9f 100644 --- a/src/findlib/findlib.ml +++ b/src/findlib/findlib.ml -@@ -106,6 +106,8 @@ let init +@@ -108,6 +108,8 @@ let init let configd_file = config_file ^ .d in @@ -25,7 +25,7 @@ index 28c86a0..8894ed6 100644 let vars_of_file f = let ch = open_in f in try -@@ -143,12 +145,17 @@ let init +@@ -151,12 +153,17 @@ let init vars_of_file config_file else [] in @@ -42,8 +42,8 @@ index 28c86a0..8894ed6 100644 - let vars = config_vars @ configd_vars in + let vars = config_vars @ configd_vars @ extra_configd_vars in if vars [] then ( + let found = ref false in let lookup name default = - try Fl_metascanner.lookup name config_preds vars diff --git a/src/findlib/findlib_config.mlp b/src/findlib/findlib_config.mlp index 5b4ab69..09d0089 100644 --- a/src/findlib/findlib_config.mlp diff --git a/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch b/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch index f1c8f17..8bf41b3 100644 --- a/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch +++ b/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch @@ -6,7 +6,7 @@ Subject: META.num*: bugfix, moved directory directive outside core --- site-lib-src/num-top/META.in |1 + site-lib-src/num/META.in |2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/site-lib-src/num-top/META.in b/site-lib-src/num-top/META.in index 184d65f..1b18b74 100644 diff --git a/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch b/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch index 6e5dc32..a38056c 100644 --- a/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch +++ b/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch @@ -4,14 +4,14 @@ Subject: Camlp4 depends on Dynlink on every architecture --- site-lib-src/camlp4.310/META.in |4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site-lib-src/camlp4.310/META.in b/site-lib-src/camlp4.310/META.in -index 637d848..a490ab1 100644 +index abd..1bd6fc2 100644 --- a/site-lib-src/camlp4.310/META.in +++ b/site-lib-src/camlp4.310/META.in @@ -6,7 +6,7 @@ dnl This file is input of the m4 macro processor. - `directory = 'camlp4_dir`' + `directory = +camlp4' `# For the toploop:' -`requires(byte,toploop) = 'camlp4_dynlink`' diff --git a/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch b/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch index 4ce9e6c..38b0447 100644 --- a/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch +++ b/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch @@ -4,10 +4,10 @@ Subject: Do not use an absolute path in META.camlp4 --- configure |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index bdb3379..d2bf393 100755 +index 52199b6..fc803a0 100755 --- a/configure +++ b/configure @@ -416,7 +416,7 @@ fi diff --git a/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch
[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit 26b9c5160aeb8ccded50c440d1121ce617a849fc Author: Stephane Glondu st...@glondu.net Date: Tue Jun 5 11:20:39 2012 +0200 Update debian/copyright diff --git a/debian/copyright b/debian/copyright index f7b04f3..05e6d73 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,19 +3,15 @@ Upstream-Contact: Gerd Stolpmann g...@gerd-stolpmann.de Source: http://projects.camlcity.org/projects/findlib.html Files: * -Copyright: 1999-2012, Gerd Stolpmann -License: other - -Files: src/findlib/num_top* -Copyright: 2003, Stefano Zacchiroli z...@debian.org -License: LGPL-2.1+ +Copyright: 1999-2012, Gerd Stolpmann and others +License: findlib Files: debian/* Copyright: 2001-2009, Stefano Zacchiroli z...@debian.org 2009-2012, Stéphane Glondu glo...@debian.org -License: LGPL-2.1+ +License: findlib -License: other +License: findlib Permission is hereby granted, free of charge, to any person obtaining a copy of this document and the findlib software (the Software), to deal in the Software without restriction, including without @@ -35,11 +31,117 @@ License: other tort or otherwise, arising from, out of or in connection with the Software or the use or other dealings in the software. -License: LGPL-2.1+ - This 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 2.1 of the License, or - (at your option) any later version. - . - On Debian systems, the complete text of the GNU Lesser General Public - License can be found in `/usr/share/common-licenses/LGPL-2.1'. +Files: tools/make-package-macosx +Copyright: 2003, Inria +License: ocaml + The Compiler is distributed under the terms of the Q Public License + version 1.0 with a change to choice of law (included below). + . + As a special exception to the Q Public Licence, you may develop + application programs, reusable components and other software items + that link with the original or modified versions of the Compiler and + are not made available to the general public, without any of the + additional requirements listed in clause 6c of the Q Public licence. + . +THE Q PUBLIC LICENSE version 1.0 + . + Copyright (C) 1999 Troll Tech AS, Norway. + Everyone is permitted to copy and + distribute this license document. + . + The intent of this license is to establish freedom to share and change + the software regulated by this license under the open source model. + . + This license applies to any software containing a notice placed by the + copyright holder saying that it may be distributed under the terms of + the Q Public License version 1.0. Such software is herein referred to + as the Software. This license covers modification and distribution of + the Software, use of third-party application programs based on the + Software, and development of free software which uses the Software. + . + Granted Rights + . + 1. You are granted the non-exclusive rights set forth in this license + provided you agree to and comply with any and all conditions in this + license. Whole or partial distribution of the Software, or software + items that link with the Software, in any form signifies acceptance of + this license. + . + 2. You may copy and distribute the Software in unmodified form + provided that the entire package, including - but not restricted to - + copyright, trademark notices and disclaimers, as released by the + initial developer of the Software, is distributed. + . + 3. You may make modifications to the Software and distribute your + modifications, in a form that is separate from the Software, such as + patches. The following restrictions apply to modifications: + . + a. Modifications must not alter or remove any copyright notices + in the Software. + . + b. When modifications to the Software are released under this + license, a non-exclusive royalty-free right is granted to the + initial developer of the Software to distribute your + modification in future versions of the Software provided such + versions remain available under these terms in addition to any + other license(s) of the initial developer. + . + 4. You may distribute machine-executable forms of the Software or + machine-executable forms of modified versions of the Software, + provided that you meet these restrictions: + . + a. You must include this license document in the distribution. + . + b. You must ensure that all recipients of the machine-executable + forms are also able to receive the complete machine-readable + source code to the distributed Software, including all + modifications, without any charge beyond the costs of data + transfer, and place prominent notices in the distribution + explaining
[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit a4ca03a16435aec1137f21a44bf47adfca6c9a06 Author: Stephane Glondu st...@glondu.net Date: Tue Jun 5 11:26:28 2012 +0200 Misc updates diff --git a/debian/rules b/debian/rules index d8f0594..32df080 100755 --- a/debian/rules +++ b/debian/rules @@ -52,7 +52,6 @@ endif .PHONY: override_dh_auto_clean override_dh_auto_clean: if [ -f Makefile.config ]; then $(MAKE) clean; fi - ln -sf doc/README README -find . -name META -delete -rm -f src/findlib/depend src/findlib/fl_metascanner.ml -rm -f Makefile.config ocargs.log src/findlib/ocaml_args.ml -- findlib 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] findlib packaging branch, master, updated. debian/1.2.8+debian-1-8-ge7e1d87
The following commit has been merged in the master branch: commit e7e1d87c99fdb8727d9412d3392d477c55208b85 Author: Stephane Glondu st...@glondu.net Date: Tue Jun 5 11:22:23 2012 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 71e09ca..43278b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -findlib (1.3.1-1) UNRELEASED; urgency=low +findlib (1.3.1-1) unstable; urgency=low * New upstream release +- documentation sources are now included in the official upstream + tarball, repackaging is no longer needed + * Update debian/copyright - -- Stéphane Glondu glo...@debian.org Tue, 05 Jun 2012 11:12:22 +0200 + -- Stéphane Glondu glo...@debian.org Tue, 05 Jun 2012 11:24:23 +0200 findlib (1.2.8+debian-1) unstable; urgency=low -- findlib 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
