[Pkg-ocaml-maint-commits] [SCM] js-of-ocaml packaging branch, master, updated. debian/1.0.8-1-6-g0784ea3
The following commit has been merged in the master branch: commit 0784ea347e05585c0e0b29cddd3ee5db153ea218 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 13:44:01 2011 +0100 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 88fabe8..101ca11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -js-of-ocaml (1.0.9-1) UNRELEASED; urgency=low +js-of-ocaml (1.0.9-1) unstable; urgency=low * New upstream release + * Fix FTBFS on bytecode architectures + * Do not install plugins on architectures without natdynlink - -- Stéphane Glondu glo...@debian.org Wed, 30 Nov 2011 21:29:07 +0100 + -- Stéphane Glondu glo...@debian.org Sat, 03 Dec 2011 13:43:57 +0100 js-of-ocaml (1.0.8-1) unstable; urgency=low -- js-of-ocaml 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] js-of-ocaml packaging branch, master, updated. debian/1.0.8-1-6-g0784ea3
The following commit has been merged in the master branch:
commit 2688803a751bda4e597a4a9811078e370e0dcb96
Author: Stephane Glondu st...@glondu.net
Date: Sat Dec 3 11:29:52 2011 +0100
Fix FTBFS on bytecode architectures
diff --git
a/debian/patches/0001-Better-support-for-disabling-native-compilation.patch
b/debian/patches/0001-Better-support-for-disabling-native-compilation.patch
new file mode 100644
index 000..5d8055c
--- /dev/null
+++ b/debian/patches/0001-Better-support-for-disabling-native-compilation.patch
@@ -0,0 +1,103 @@
+From: Stephane Glondu st...@glondu.net
+Date: Sat, 3 Dec 2011 12:29:59 +0100
+Subject: Better support for disabling native compilation
+
+Introduce BEST variable in Makefile.conf, used to determine if native
+compiler and libraries should be compiled and
+installed. Unconditionally set to opt (meaning ocamlopt is
+available), it can be overridden in calls to make.
+---
+ Makefile |2 +-
+ Makefile.conf |2 ++
+ Makefile.filelist |4
+ compiler/Makefile |9 ++---
+ lib/Makefile |5 -
+ 5 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3591d62..c244edc 100644
+--- a/Makefile
b/Makefile
+@@ -31,7 +31,7 @@ include Makefile.filelist
+
+ VERSION := $(shell head -n 1 VERSION)
+ install:
+- ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF)
$(IMPL) $(NATIMPL) $(OTHERS) $(DOC)
++ ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF)
$(IMPL) $(OTHERS) $(DOC)
+ install -d -m 755 $(BINDIR)
+ install $(BIN) $(BINDIR)
+
+diff --git a/Makefile.conf b/Makefile.conf
+index ef72bfa..8a5c69d 100644
+--- a/Makefile.conf
b/Makefile.conf
+@@ -15,6 +15,8 @@ OBJEXT := .o
+ LIBEXT := .a
+ DLLEXT := .so
+
++BEST := opt
++
+ ### Optional dependencies: ocsigen-deriving
+
+ DERIVING := $(shell ocamlfind query deriving-ocsigen 2 /dev/null)
+diff --git a/Makefile.filelist b/Makefile.filelist
+index 025573e..6d51fe6 100644
+--- a/Makefile.filelist
b/Makefile.filelist
+@@ -25,6 +25,10 @@ NATIMPL := lib/deriving_json.cmxa \
+
+ NATIMPL += $(JSON:.cmi=.cmx)
+
++ifeq $(BEST) opt
++IMPL += $(NATIMPL)
++endif
++
+ endif
+
+ DOC := ${INTF:.cmi=.mli}
+diff --git a/compiler/Makefile b/compiler/Makefile
+index 8a5adb6..5569da5 100644
+--- a/compiler/Makefile
b/compiler/Makefile
+@@ -12,10 +12,13 @@ OBJS=pretty_print.cmx util.cmx dgraph.cmx \
+
+ COMPOBJS=$(OBJS) main.cmx
+
+-compile: $(COMPOBJS:cmx=cmo)
++$(COMPILER): compile.$(BEST)
++ cp -f $ $@
++
++compile.byte: $(COMPOBJS:cmx=cmo)
+ ocamlfind ocamlc -package findlib,str -linkpkg -o $@ $^
+
+-$(COMPILER): $(COMPOBJS)
++compile.opt: $(COMPOBJS)
+ ocamlfind ocamlopt -package findlib,str -linkpkg -o $@ $^
+
+ compiler.cma: $(OBJS:cmx=cmo)
+@@ -32,7 +35,7 @@ compiler.cma: $(OBJS:cmx=cmo)
+
+ clean:
+ rm -f *.cm[aiox] *.o
+- rm -f js_of_ocaml compile
++ rm -f js_of_ocaml compile.opt compile.byte
+
+ depend:
+ ocamldep *.ml *.mli .depend
+diff --git a/lib/Makefile b/lib/Makefile
+index 6de96a4..5fe3d5a 100644
+--- a/lib/Makefile
b/lib/Makefile
+@@ -10,7 +10,10 @@ include ../Makefile.conf
+
+ ifneq ${DERIVING}
+ PA_DERIVING=syntax/pa_deriving_Json.cmo
+-DERIVING_JSON=deriving_json.cma deriving_json.cmxs
++DERIVING_JSON=deriving_json.cma
++ifeq $(BEST) opt
++DERIVING_JSON += deriving_json.cmxs
++endif
+ endif
+
+ all: $(LIBNAME).cma syntax/pa_js.cmo ${PA_DERIVING} ${DERIVING_JSON}
+--
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..3156972
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Better-support-for-disabling-native-compilation.patch
diff --git a/debian/rules b/debian/rules
index f9d252d..d36d7eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
DESTDIR=$(CURDIR)/debian/tmp
BINDIR=$(DESTDIR)/usr/bin
DOCDIR=$(DESTDIR)/usr/share/doc/libjs-of-ocaml-dev
-COMPILER=$(shell awk '/COMPILER/{print $$NF}' Makefile.conf)
include /usr/share/ocaml/ocamlvars.mk
@@ -14,16 +13,6 @@ export OCAMLFIND_LDCONF=ignore
%:
dh $@ --with ocaml
-.PHONY: override_dh_auto_build
-override_dh_auto_build:
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
- make -C compiler
-else
- make -C compiler compile
- mv compiler/compile compiler/$(COMPILER)
-endif
- make library runtime doc
-
.PHONY: override_dh_install
override_dh_install:
dh_install -X.so.owner --fail-missing
@@ -32,10 +21,14 @@ override_dh_install:
override_dh_compress:
dh_compress -X.js
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+ $(MAKE) BEST=$(OCAML_BEST)
+
.PHONY: override_dh_auto_install
override_dh_auto_install:
mkdir -p $(OCAMLFIND_DESTDIR) $(BINDIR) $(DESTDIR)$(OCAML_DLL_DIR)
- $(MAKE) install BINDIR=$(BINDIR)
+ $(MAKE) install BINDIR=$(BINDIR) BEST=$(OCAML_BEST)
mkdir -p $(DOCDIR)/html $(DOCDIR)/examples
cp
[Pkg-ocaml-maint-commits] [SCM] js-of-ocaml packaging annotated tag, debian/1.0.9-1, created. debian/1.0.9-1
The annotated tag, debian/1.0.9-1 has been created at d8fc8d6c3cf6a2e69a35a858baab4f2e91f089c6 (tag) tagging 0784ea347e05585c0e0b29cddd3ee5db153ea218 (commit) replaces debian/1.0.8-1 tagged by Stephane Glondu on Sat Dec 3 13:57:08 2011 +0100 - Shortlog Debian release 1.0.9-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJO2hykAAoJEHhT2k1JiBrTNpgP/jmkRnk9BfvfX0Jxsc0vGXJQ WlsZ7RuwMx3+yTHRUP0jNgXHb0kYQoiyyktagtm26Gsp1ieHRSi0gz2OFkPTbdMP E6Scuf23rowwU0ViJDYg/F5E9ZcsaPnoIOf9OPHDgQdgYyt//Ma0MpnPNxary5Bp C6aC+vuLKig8z3Ft6Ay/zSLyn70XL70f/DRFlWYJRbWarz/e8E9GlYhMARzSvKhV WkMrNMr+2I5O3sACEFz7eRiBH8PVGJUgWwUWyUhPthb70yWMZKYE8USvmpRON5yE I0Zyc/xw80HVE/haRvdXJFo+XQnxJ0+aowya+T0Cs0tcZ8CAPHXRD4PvgNiDxv9O T5ZIetkrfTqz/Aj/xW8xL6qKNzRFyddrydGjH84qTtp9aX9vI2b7FieOQvPsP0t3 2CzG8juu5AA3u2PWCRMMAx93/PzoctfVt+R8Wq6w2HxzDgR6uNOB6061WHaNfj9s YKjrhGDBokRuWpJk9gUicHgTsDLwQbclsdJmYpDvQa4Wk8Ib+KPVYvpcTeZ/gS9M bCaUZNeckTvgcjqW5RXccpeAdlD+lYapMROc3NVFcCN6LvmJadALF2frwYOBnbB1 ArkCFBvV3T12fmfWjn+tGonHaj+N7u/WXuekGUhkpe3jO4gDM08VIF/iMRFKIyXZ f/9IkQi1J0K5bPhpNn9u =/CWo -END PGP SIGNATURE- Stephane Glondu (6): Imported Upstream version 1.0.9 Merge commit 'upstream/1.0.9' New upstream release Fix FTBFS on bytecode architectures Do not install plugins on architectures without natdynlink Update changelog and prepare upload to unstable --- -- js-of-ocaml 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] js-of-ocaml packaging branch, master, updated. debian/1.0.8-1-6-g0784ea3
The following commit has been merged in the master branch: commit 0453d674197d4faed558e9317f8ff2bf8e364ebe Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 13:42:24 2011 +0100 Do not install plugins on architectures without natdynlink Fixes FTBFS on armel. diff --git a/debian/rules b/debian/rules index d36d7eb..54279f5 100755 --- a/debian/rules +++ b/debian/rules @@ -33,6 +33,9 @@ override_dh_auto_install: cp -a doc/api-html $(DOCDIR)/html/api cp -a examples/* $(DOCDIR)/examples rm -f $(DOCDIR)/examples/*/*.cm* $(DOCDIR)/examples/*/*.byte +ifeq ($(OCAML_NATDYNLINK),no) + find $(DESTDIR) -name '*.cmxs' -delete +endif .PHONY: override_dh_auto_clean override_dh_auto_clean: -- js-of-ocaml 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] ocaml-sqlexpr packaging branch, master, updated. debian/0.2.3-1-8-geee71c8
The following commit has been merged in the master branch: commit eee71c83480a5c603e1aff69fe2c2e79b25674ca Merge: 0beadeda2d501a2da58f9e2beab4e55895cab2bd 6cef5196dcc0067be40de0ee16cbab9eab70ceb5 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 14:05:23 2011 +0100 Merge commit 'debian/0.2.3-1' -- ocaml-sqlexpr 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] ocaml-sqlexpr packaging branch, fix-0.2.3, deleted. debian/0.2.3-1
The branch, fix-0.2.3 has been deleted was 6cef5196dcc0067be40de0ee16cbab9eab70ceb5 --- 6cef5196dcc0067be40de0ee16cbab9eab70ceb5 No previous ACCEPTED upload, so use -1 as version --- -- ocaml-sqlexpr 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] ocaml-sqlexpr packaging branch, master, updated. debian/0.2.3-1-18-gef52d2a
The following commit has been merged in the master branch: commit 69c64437c9b15c7f75bff93318748bb834df132c Merge: eee71c83480a5c603e1aff69fe2c2e79b25674ca da815d2d8f29ac30a8cc33d78b2bb0dfab48c5e6 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 14:10:00 2011 +0100 Merge commit 'upstream/0.4.1' -- ocaml-sqlexpr 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] ocaml-sqlexpr packaging branch, master, updated. debian/0.2.3-1-18-gef52d2a
The following commit has been merged in the master branch: commit 4b9d6bbae01408d2a9b74e53e9e0e14a21e0be18 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 14:10:08 2011 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index 2182b95..d75eed0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-sqlexpr (0.4.1-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Sat, 03 Dec 2011 14:10:03 +0100 + ocaml-sqlexpr (0.2.3-1) unstable; urgency=low * Initial release. (Closes: #605683) -- ocaml-sqlexpr 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] ocaml-sqlexpr packaging branch, master, updated. debian/0.2.3-1-18-gef52d2a
The following commit has been merged in the master branch: commit 7bd155ca9d7619549a4ee9c6bd43c9bb978fa9b6 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 14:21:39 2011 +0100 Remove buggy @param directive that makes ocamldoc choke diff --git a/debian/patches/0001-Remove-buggy-param-directive.patch b/debian/patches/0001-Remove-buggy-param-directive.patch new file mode 100644 index 000..a3f02dc --- /dev/null +++ b/debian/patches/0001-Remove-buggy-param-directive.patch @@ -0,0 +1,23 @@ +From: Stephane Glondu st...@glondu.net +Date: Sat, 3 Dec 2011 14:21:23 +0100 +Subject: Remove buggy @param directive + +ocamldoc doesn't like it. +--- + sqlexpr_sqlite.mli |2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/sqlexpr_sqlite.mli b/sqlexpr_sqlite.mli +index 122f51a..bf501a5 100644 +--- a/sqlexpr_sqlite.mli b/sqlexpr_sqlite.mli +@@ -53,7 +53,7 @@ sig + + + (** Open the DB whose filename is given. [:memory:] refers to an in-mem DB. +-* @param [init] function to be applied to [Sqlite3.db] handle(s) before ++* [init] function to be applied to [Sqlite3.db] handle(s) before + * they are used (can be used to register functions or initialize schema in + * in-mem tables. *) + val open_db : ?init:(Sqlite3.db - unit) - string - db +-- diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..a1b4f47 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Remove-buggy-param-directive.patch -- ocaml-sqlexpr 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] ocaml-sqlexpr packaging branch, master, updated. debian/0.2.3-1-18-gef52d2a
The following commit has been merged in the master branch: commit b0f73d043dce914ae9e58c88956bf51d44aee2c9 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 14:25:02 2011 +0100 Remove useless OCAMLFIND_LDCONF stuff diff --git a/debian/rules b/debian/rules index e6bc344..b4b1f33 100755 --- a/debian/rules +++ b/debian/rules @@ -10,8 +10,6 @@ include /usr/share/ocaml/ocamlvars.mk OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) export OCAMLFIND_DESTDIR -OCAMLFIND_LDCONF=ignore -export OCAMLFIND_LDCONF %: dh --with ocaml $@ -- ocaml-sqlexpr 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] ocaml-sqlexpr packaging branch, master, updated. debian/0.2.3-1-18-gef52d2a
The following commit has been merged in the master branch: commit 996d0ebf8f45bc78d58d88116f3728df2fc4c70f Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 14:26:25 2011 +0100 Doc installed upstream diff --git a/debian/libsqlexpr-ocaml-dev.docs b/debian/libsqlexpr-ocaml-dev.docs deleted file mode 100644 index b1d69cd..000 --- a/debian/libsqlexpr-ocaml-dev.docs +++ /dev/null @@ -1 +0,0 @@ -_build/sqlexpr.docdir diff --git a/debian/libsqlexpr-ocaml-dev.install.in b/debian/libsqlexpr-ocaml-dev.install.in index 57f6b26..103d037 100644 --- a/debian/libsqlexpr-ocaml-dev.install.in +++ b/debian/libsqlexpr-ocaml-dev.install.in @@ -1,3 +1,4 @@ +usr/share/doc @OCamlStdlibDir@/sqlexpr/*.cmi @OCamlStdlibDir@/sqlexpr/*.ml* OPT: @OCamlStdlibDir@/sqlexpr/*.cmx* diff --git a/debian/libsqlexpr-ocaml-dev.ocamldoc b/debian/libsqlexpr-ocaml-dev.ocamldoc index 66aee0e..bb2ccfc 100644 --- a/debian/libsqlexpr-ocaml-dev.ocamldoc +++ b/debian/libsqlexpr-ocaml-dev.ocamldoc @@ -1,2 +1,2 @@ --d sqlexpr.docdir +-d sqlexpr --doc-base-generate -- ocaml-sqlexpr 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] ocaml-sqlexpr packaging branch, master, updated. debian/0.2.3-1-18-gef52d2a
The following commit has been merged in the master branch:
commit f5546991ea8f49de26b8d7a71c03e0ceac331b3f
Author: Stephane Glondu st...@glondu.net
Date: Sat Dec 3 14:34:48 2011 +0100
Fix Description fields (Lintian)
diff --git a/debian/control b/debian/control
index 5401d6e..6d89ee5 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Architecture: any
Depends: ${ocaml:Depends}, ${misc:Depends}
Provides: ${ocaml:Provides}
Recommends: ocaml-findlib
-Description: Type-safe, convenient SQLite database access.
+Description: type-safe, convenient SQLite database access (development)
Minimalistic library and syntax extension for type-safe, convenient execution
of SQL statements. Currently compatible with Sqlite3.
.
@@ -44,7 +44,7 @@ Package: libsqlexpr-ocaml
Architecture: any
Depends: ${ocaml:Depends}, ${misc:Depends}
Provides: ${ocaml:Provides}
-Description: Type-safe, convenient SQLite database access.
+Description: type-safe, convenient SQLite database access (runtime)
Minimalistic library and syntax extension for type-safe, convenient execution
of SQL statements. Currently compatible with Sqlite3.
.
--
ocaml-sqlexpr 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] ocaml-sqlexpr packaging branch, master, updated. debian/0.2.3-1-18-gef52d2a
The following commit has been merged in the master branch: commit b700379dce5b606c61ac6dc158815adc529fe5e7 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 14:39:02 2011 +0100 Bump Standards-Version to 3.9.2 diff --git a/debian/control b/debian/control index 6d89ee5..ef08c94 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: dh-ocaml (= 0.9~), debhelper (= 7.0.50~), camlp4 -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://github.com/mfp/ocaml-sqlexpr Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlexpr.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-sqlexpr.git -- ocaml-sqlexpr 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] ocaml-sqlexpr packaging branch, master, updated. debian/0.2.3-1-18-gef52d2a
The following commit has been merged in the master branch: commit e1659971859b09a946dc30c85f302eb37ef0fde4 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 14:51:26 2011 +0100 Update d/copyright to more recent format specification diff --git a/debian/copyright b/debian/copyright index e39c650..3ac22fe 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,11 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=135 -Name: ocaml-sqlexpr -Maintainer: Sylvain Le Gall gil...@debian.org -Source: http://forge.ocamlcore.org/frs/?group_id=190 +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202 +Source: http://forge.ocamlcore.org/frs/?group_id=190 Files: * Copyright: Mauricio Fernandez License: LGPL-2.1 with OCaml linking exception - See '/usr/share/common-licenses/LGPL-2.1' for full text. - + . 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 @@ -25,6 +22,4 @@ License: LGPL-2.1 with OCaml linking exception Files: debian/* Copyright: (C) 2010 Sylvain Le Gall gil...@debian.org License: GPL-3+ - See '/usr/share/common-licenses/GPL-3' for full text. - -- ocaml-sqlexpr 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] ocaml-sqlexpr packaging branch, master, updated. debian/0.2.3-1-18-gef52d2a
The following commit has been merged in the master branch: commit ef52d2a4f79589cb780ce9404115a4d87b6742db Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 14:59:24 2011 +0100 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index d75eed0..32a80ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -ocaml-sqlexpr (0.4.1-1) UNRELEASED; urgency=low +ocaml-sqlexpr (0.4.1-1) unstable; urgency=low + * Team upload * New upstream release + * Bump Standards-Version to 3.9.2 (no changes) - -- Stéphane Glondu glo...@debian.org Sat, 03 Dec 2011 14:10:03 +0100 + -- Stéphane Glondu glo...@debian.org Sat, 03 Dec 2011 14:59:18 +0100 ocaml-sqlexpr (0.2.3-1) unstable; urgency=low -- ocaml-sqlexpr 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] ocaml-sqlexpr packaging branch, pristine-tar, updated. 0f3efd61d09faead7bd865462c0175a2d75d9352
The following commit has been merged in the pristine-tar branch: commit 0f3efd61d09faead7bd865462c0175a2d75d9352 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 14:09:59 2011 +0100 pristine-tar data for ocaml-sqlexpr_0.4.1.orig.tar.gz diff --git a/ocaml-sqlexpr_0.4.1.orig.tar.gz.delta b/ocaml-sqlexpr_0.4.1.orig.tar.gz.delta new file mode 100644 index 000..9501ca0 Binary files /dev/null and b/ocaml-sqlexpr_0.4.1.orig.tar.gz.delta differ diff --git a/ocaml-sqlexpr_0.4.1.orig.tar.gz.id b/ocaml-sqlexpr_0.4.1.orig.tar.gz.id new file mode 100644 index 000..1fb580b --- /dev/null +++ b/ocaml-sqlexpr_0.4.1.orig.tar.gz.id @@ -0,0 +1 @@ +da815d2d8f29ac30a8cc33d78b2bb0dfab48c5e6 -- ocaml-sqlexpr 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] ocaml-sqlexpr packaging annotated tag, upstream/0.4.1, created. upstream/0.4.1
The annotated tag, upstream/0.4.1 has been created at 8b712e374c1373aab04d8e7787f58feef1f40605 (tag) tagging da815d2d8f29ac30a8cc33d78b2bb0dfab48c5e6 (commit) replaces upstream/0.4.0 tagged by Stephane Glondu on Sat Dec 3 14:09:59 2011 +0100 - Shortlog Upstream version 0.4.1 Stephane Glondu (1): Imported Upstream version 0.4.1 --- -- ocaml-sqlexpr 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] Debian packaging for coccinelle branch, master, updated. debian/1.0.0_rc7.deb-1-5-g6caf4bb
The following commit has been merged in the master branch: commit 46b39e5469c9cc1fa53234b5c5a37cec318e3e99 Author: Eugeniy Meshcheryakov eu...@debian.org Date: Sat Dec 3 14:30:01 2011 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index d138ced..c9dc730 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +coccinelle (1.0.0~rc7.deb-2) experimental; urgency=low + + * Upload to unstable + + -- Євгеній Мещеряков eu...@debian.org Sat, 03 Dec 2011 14:29:36 +0100 + coccinelle (1.0.0~rc7.deb-1) experimental; urgency=low * New upstream RC (closes: #646590) -- Debian packaging for coccinelle ___ 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] Debian packaging for coccinelle branch, master, updated. debian/1.0.0_rc7.deb-1-5-g6caf4bb
The following commit has been merged in the master branch: commit 6612857362e14f00ce901a46ecc4fc9b8ee76e14 Author: Eugeniy Meshcheryakov eu...@debian.org Date: Sat Dec 3 14:47:59 2011 +0100 Build-depend on debhelper = 8.1.0~ for build-arch and build-indep targets diff --git a/debian/changelog b/debian/changelog index c9dc730..5972afa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ coccinelle (1.0.0~rc7.deb-2) experimental; urgency=low * Upload to unstable + * Build-depend on debhelper = 8.1.0~ for build-arch and build-indep +targets - -- Євгеній Мещеряков eu...@debian.org Sat, 03 Dec 2011 14:29:36 +0100 + -- Євгеній Мещеряков eu...@debian.org Sat, 03 Dec 2011 14:47:23 +0100 coccinelle (1.0.0~rc7.deb-1) experimental; urgency=low diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index 8907eb7..d1a9d6d 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Євгеній Мещеряков eu...@debian.org Build-Depends: - debhelper (= 7.0.50~), + debhelper (= 8.1.0~), dh-ocaml (= 0.9.4~), ocaml-nox (= 3.11.1-3~), libpycaml-ocaml-dev (= 0.82-13~), -- Debian packaging for coccinelle ___ 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] Debian packaging for coccinelle branch, master, updated. debian/1.0.0_rc7.deb-1-5-g6caf4bb
The following commit has been merged in the master branch: commit ae220039c0c33a086d002fb93e150faf1d4418e3 Author: Eugeniy Meshcheryakov eu...@debian.org Date: Sat Dec 3 14:50:26 2011 +0100 Add build-arch and build-indep targets, fixes lintian warning diff --git a/debian/changelog b/debian/changelog index 5972afa..6136b2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ coccinelle (1.0.0~rc7.deb-2) experimental; urgency=low * Upload to unstable * Build-depend on debhelper = 8.1.0~ for build-arch and build-indep targets + * Add build-arch and build-indep targets, fixes lintian warning - -- Євгеній Мещеряков eu...@debian.org Sat, 03 Dec 2011 14:47:23 +0100 + -- Євгеній Мещеряков eu...@debian.org Sat, 03 Dec 2011 14:49:50 +0100 coccinelle (1.0.0~rc7.deb-1) experimental; urgency=low diff --git a/debian/rules b/debian/rules index e488942..fd787e3 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ CONFIG_FLAGS = $(COMMON_CONFIG) --no-opt MAKE_TGT = all endif -build clean binary binary-arch binary-indep install: +build build-arch build-indep clean binary binary-arch binary-indep install: dh --with ocaml,python2 $@ override_dh_auto_configure: @@ -63,5 +63,5 @@ override_dh_auto_clean: override_dh_compress: dh_compress -X.pdf -X.cocci -X.c -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install .PHONY: override_dh_auto_configure override_dh_auto_build override_dh_auto_test override_dh_auto_install -- Debian packaging for coccinelle ___ 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] Debian packaging for coccinelle branch, master, updated. debian/1.0.0_rc7.deb-1-5-g6caf4bb
The following commit has been merged in the master branch: commit 4e2954212575ffa35419c20390d71d9190689dad Author: Eugeniy Meshcheryakov eu...@debian.org Date: Sat Dec 3 14:52:10 2011 +0100 Put --with option of dh after the sequence name diff --git a/debian/changelog b/debian/changelog index 6136b2d..aa2da44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ coccinelle (1.0.0~rc7.deb-2) experimental; urgency=low * Build-depend on debhelper = 8.1.0~ for build-arch and build-indep targets * Add build-arch and build-indep targets, fixes lintian warning + * Put --with option of dh after the sequence name - -- Євгеній Мещеряков eu...@debian.org Sat, 03 Dec 2011 14:49:50 +0100 + -- Євгеній Мещеряков eu...@debian.org Sat, 03 Dec 2011 14:51:36 +0100 coccinelle (1.0.0~rc7.deb-1) experimental; urgency=low diff --git a/debian/rules b/debian/rules index fd787e3..704d204 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ MAKE_TGT = all endif build build-arch build-indep clean binary binary-arch binary-indep install: - dh --with ocaml,python2 $@ + dh $@ --with ocaml,python2 override_dh_auto_configure: ./configure $(CONFIG_FLAGS) -- Debian packaging for coccinelle ___ 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] Debian packaging for coccinelle branch, master, updated. debian/1.0.0_rc7.deb-1-5-g6caf4bb
The following commit has been merged in the master branch: commit 6caf4bb4b5c077698a1eccb7336316aa7343dfba Author: Eugeniy Meshcheryakov eu...@debian.org Date: Sat Dec 3 14:58:42 2011 +0100 Make more targets phony diff --git a/debian/rules b/debian/rules index 704d204..568fd58 100755 --- a/debian/rules +++ b/debian/rules @@ -65,3 +65,4 @@ override_dh_compress: .PHONY: build build-arch build-indep clean binary-indep binary-arch binary install .PHONY: override_dh_auto_configure override_dh_auto_build override_dh_auto_test override_dh_auto_install +.PHONY: override_dh_auto_clean override_dh_compress -- Debian packaging for coccinelle ___ 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] Debian packaging for coccinelle annotated tag, debian/1.0.0_rc7.deb-2, created. debian/1.0.0_rc7.deb-2
The annotated tag, debian/1.0.0_rc7.deb-2 has been created at 9f00b5b4d30a5806d7d0f808861a3e0e9f9d4b2c (tag) tagging 6caf4bb4b5c077698a1eccb7336316aa7343dfba (commit) replaces debian/1.0.0_rc7.deb-1 tagged by Eugeniy Meshcheryakov on Sat Dec 3 15:48:46 2011 +0100 - Shortlog Debian release 1.0.0~rc7.deb-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk7aNs4ACgkQKaC6+zmozOK+kgCghvxAQreylEdOD8ShhMACVsnu hPYAn16JAJxg+HEd25vcS7izKX0V0by8 =zPte -END PGP SIGNATURE- Eugeniy Meshcheryakov (5): Upload to unstable Build-depend on debhelper = 8.1.0~ for build-arch and build-indep targets Add build-arch and build-indep targets, fixes lintian warning Put --with option of dh after the sequence name Make more targets phony --- -- Debian packaging for coccinelle ___ 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] frama-c packaging branch, master, updated. debian/20110201+carbon+dfsg-2-1-g67ef5ec
The following commit has been merged in the master branch:
commit 67ef5ec22bdcc9d1484123e2e422463a74efb983
Author: Stephane Glondu st...@glondu.net
Date: Sat Dec 3 17:58:52 2011 +0100
Accept ocamlgraph 1.8*
diff --git a/debian/changelog b/debian/changelog
index c1a9293..ec8c2d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frama-c (20110201+carbon+dfsg-3) UNRELEASED; urgency=low
+
+ * Accept ocamlgraph 1.8*
+
+ -- Stéphane Glondu glo...@debian.org Sat, 03 Dec 2011 17:59:23 +0100
+
frama-c (20110201+carbon+dfsg-2) unstable; urgency=low
* Add -I +ocamlgraph to DYN_{O,B}LINKFLAGS, needed for plugins to link.
diff --git a/debian/patches/0004-Accept-ocamlgraph-1.8.patch
b/debian/patches/0004-Accept-ocamlgraph-1.8.patch
new file mode 100644
index 000..9b1d3e8
--- /dev/null
+++ b/debian/patches/0004-Accept-ocamlgraph-1.8.patch
@@ -0,0 +1,36 @@
+From: Stephane Glondu st...@glondu.net
+Date: Sat, 3 Dec 2011 17:58:39 +0100
+Subject: Accept ocamlgraph 1.8*
+
+---
+ configure|2 +-
+ configure.in |2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 89ba34d..b5b6835 100755
+--- a/configure
b/configure
+@@ -3108,7 +3108,7 @@ if test $OCAMLGRAPH_EXISTS = yes; then
+ then
+ OCAMLGRAPH_VERSION=`./test_ocamlgraph`
+ case $OCAMLGRAPH_VERSION in
+-1.7) { $as_echo $as_me:${as_lineno-$LINENO}: OcamlGraph
$OCAMLGRAPH_VERSION found: great! 5
++1.[78]*) { $as_echo $as_me:${as_lineno-$LINENO}: OcamlGraph
$OCAMLGRAPH_VERSION found: great! 5
+ $as_echo $as_me: OcamlGraph $OCAMLGRAPH_VERSION found: great! 6;};;
+ *) { $as_echo $as_me:${as_lineno-$LINENO}: OcamlGraph
$OCAMLGRAPH_VERSION is incompatible with Frama-C. 5
+ $as_echo $as_me: OcamlGraph $OCAMLGRAPH_VERSION is incompatible with
Frama-C. 6;}
+diff --git a/configure.in b/configure.in
+index 79e197b..6a64d8b 100644
+--- a/configure.in
b/configure.in
+@@ -240,7 +240,7 @@ if test $OCAMLGRAPH_EXISTS = yes; then
+ then
+ OCAMLGRAPH_VERSION=`./test_ocamlgraph`
+ case $OCAMLGRAPH_VERSION in
+-1.7) AC_MSG_NOTICE([OcamlGraph $OCAMLGRAPH_VERSION found: great!]);;
++1.[78]*) AC_MSG_NOTICE([OcamlGraph $OCAMLGRAPH_VERSION found: great!]);;
+ *) AC_MSG_NOTICE([OcamlGraph $OCAMLGRAPH_VERSION is incompatible with
Frama-C.])
+ OCAMLGRAPH_EXISTS=no
+OCAMLGRAPH_INCLUDE=;;
+--
diff --git a/debian/patches/series b/debian/patches/series
index 43a7827..5e1b27b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-Value-Analysis-Carbon-patchlevel-1.patch
0002-Fix-for-issue-727.patch
0003-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch
+0004-Accept-ocamlgraph-1.8.patch
--
frama-c 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] Debian packaging for coccinelle branch, master, updated. debian/1.0.0_rc7.deb-2-1-g3dee150
The following commit has been merged in the master branch: commit 3dee1505633729da84a638fed3744c6c7384b2a2 Author: Eugeniy Meshcheryakov eu...@debian.org Date: Sat Dec 3 16:52:11 2011 +0100 REALLY upload to unstable diff --git a/debian/changelog b/debian/changelog index aa2da44..6eee760 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +coccinelle (1.0.0~rc7.deb-3) unstable; urgency=low + + * REALLY upload to unstable + + -- Євгеній Мещеряков eu...@debian.org Sat, 03 Dec 2011 16:51:36 +0100 + coccinelle (1.0.0~rc7.deb-2) experimental; urgency=low * Upload to unstable -- Debian packaging for coccinelle ___ 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] Debian packaging for coccinelle annotated tag, debian/1.0.0_rc7.deb-3, created. debian/1.0.0_rc7.deb-3
The annotated tag, debian/1.0.0_rc7.deb-3 has been created at 4554b370ccdcd9b729c3aebc66ec55a23ebe883d (tag) tagging 3dee1505633729da84a638fed3744c6c7384b2a2 (commit) replaces debian/1.0.0_rc7.deb-2 tagged by Eugeniy Meshcheryakov on Sat Dec 3 16:58:43 2011 +0100 - Shortlog Debian release 1.0.0~rc7.deb-3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk7aRzMACgkQKaC6+zmozOK6KQCeIRyT8Gl0cV4CQsEzN5y56EPZ BJIAoJOA8YenzKS1aMpWXSJ8o/FuZr7J =Pavm -END PGP SIGNATURE- Eugeniy Meshcheryakov (1): REALLY upload to unstable --- -- Debian packaging for coccinelle ___ 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 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
[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, pristine-tar, updated. ef76ca5051c899336d2be79ccffc5e6f1d52c88f
The following commit has been merged in the pristine-tar branch: commit d4707a2ea1710eb02d3ba7292f11f775af705836 Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 16:43:41 2011 +0100 pristine-tar data for ocamlgraph_1.8.orig.tar.gz diff --git a/ocamlgraph_1.8.orig.tar.gz.delta b/ocamlgraph_1.8.orig.tar.gz.delta new file mode 100644 index 000..b0aad1e Binary files /dev/null and b/ocamlgraph_1.8.orig.tar.gz.delta differ diff --git a/ocamlgraph_1.8.orig.tar.gz.id b/ocamlgraph_1.8.orig.tar.gz.id new file mode 100644 index 000..89f00bf --- /dev/null +++ b/ocamlgraph_1.8.orig.tar.gz.id @@ -0,0 +1 @@ +e33b174e87569af2eaa6c93edd853a8469c90141 -- 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, pristine-tar, updated. ef76ca5051c899336d2be79ccffc5e6f1d52c88f
The following commit has been merged in the pristine-tar branch: commit ef76ca5051c899336d2be79ccffc5e6f1d52c88f Author: Stephane Glondu st...@glondu.net Date: Sat Dec 3 16:52:15 2011 +0100 pristine-tar data for ocamlgraph_1.8.1.orig.tar.gz diff --git a/ocamlgraph_1.8.1.orig.tar.gz.delta b/ocamlgraph_1.8.1.orig.tar.gz.delta new file mode 100644 index 000..7f4310c Binary files /dev/null and b/ocamlgraph_1.8.1.orig.tar.gz.delta differ diff --git a/ocamlgraph_1.8.1.orig.tar.gz.id b/ocamlgraph_1.8.1.orig.tar.gz.id new file mode 100644 index 000..37be851 --- /dev/null +++ b/ocamlgraph_1.8.1.orig.tar.gz.id @@ -0,0 +1 @@ +0bfeb99104c5bf12206bd09f90912acdd8422872 -- 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 annotated tag, upstream/1.8, created. upstream/1.8
The annotated tag, upstream/1.8 has been created at 8e903c8f5e70efc4dfa0cf314281ce58717647d4 (tag) tagging e33b174e87569af2eaa6c93edd853a8469c90141 (commit) replaces upstream/1.7 tagged by Stephane Glondu on Sat Dec 3 16:43:41 2011 +0100 - Shortlog Upstream version 1.8 Stephane Glondu (1): Imported Upstream version 1.8 --- -- 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 annotated tag, upstream/1.8.1, created. upstream/1.8.1
The annotated tag, upstream/1.8.1 has been created at 9577c0b0770567358c34da80e484e1cfb1f51725 (tag) tagging 0bfeb99104c5bf12206bd09f90912acdd8422872 (commit) replaces upstream/1.8 tagged by Stephane Glondu on Sat Dec 3 16:52:15 2011 +0100 - Shortlog Upstream version 1.8.1 Stephane Glondu (1): Imported Upstream version 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 annotated tag, debian/1.8.1-1, created. debian/1.8.1-1
The annotated tag, debian/1.8.1-1 has been created at e2850d294d5f82291457272c55a296f727ea5400 (tag) tagging 24cc7c28cdd47cb3d97daddcadc1c5f3e5b0c7b4 (commit) replaces debian/1.7-1 tagged by Stephane Glondu on Sat Dec 3 18:11:29 2011 +0100 - Shortlog Debian release 1.8.1-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJO2lhBAAoJEHhT2k1JiBrTpGIP/32NGSZ5Eh5xaUopy90/Tc+I kwSPJyIcksB2CHCMLPVbRj8ymA6mUSvVh60T+Df+onoC+gfYtWuVx71Sk42kQ5pf G7AAStKHgrCCMuJkRERE0Q34MQ3blyBAwHo/A2nU+2EzxM448EfUHSzqZ8TLuPli MW4f7CQWuC/hm1ErEKX3YaffQmNVlnAqhTx1gWNE7a4ctuxXdKtPatk0Cf0s/8nz H2TcaswffR/Wm0bZuSWR9rLOUbNfSuiei6m3oq8HhGd40vJiFNmbLnN3Ft11corS 0qdouBjTgpDF6Jt4+CsVYH5psabiPFy15+SirIDyoK6O/4mfv4MNTcneJXQH69Rv EZX7KZQ7+Q6HYnR41qhNxqKlvaneanPHGB33T9Mj/jDvFSuVEIkWKoRGDww+Apd2 vR9KR7S2A5tgQottkJ8JqGkV92HFmr20z65TNOg+KDK5isPyHpkBnhQkkz1SInxp 11VwLJuBTNouCrKTTAvD9E0TEow0uZ/EVbMoBTGSbHOCZw9wOQBkdXBjBGtKeYyU Spi07+ZHeUCxy5UIuHrnfZbe/oHpg6KV2Qkjmtku+589ZXfPGZ4FOyL6qKgSVeQv pvdAjYNrmuXJlfERh282J8clSz2iCe6wQ4Gzfyv3ygIJDwnD+LvQnan236Vc7WmW B2US2OhLxT7EKYasa7FW =DXcr -END PGP SIGNATURE- Stefano Zacchiroli (1): remove myself from uploaders Stephane Glondu (12): Imported Upstream version 1.8 Imported Upstream version 1.8.1 Merge commit 'upstream/1.8.1' New upstream release Switch source package format to 3.0 (quilt) 1.81 is not (really) a new version Update debian/copyright Typo in Description (Lintian) Bump Standards-Version to 3.9.2 Fix permissions on *.mli files (Lintian) Recommend ocaml-findlib Update changelog and prepare upload to unstable --- -- 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
