[Pkg-ocaml-maint-commits] [ocamlbricks] 17/19: Merge tag 'upstream/0.90+bzr456'
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit e57b05581486251f12a8d98d19bf7add216e9bcf Merge: 6c138bf 29a0b69 Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 23:05:27 2017 +0100 Merge tag 'upstream/0.90+bzr456' Upstream version 0.90+bzr456 Makefile | 2 +- meta.ml | 18 ++ meta.ml.released | 18 ++ 3 files changed, 37 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 14/19: Add ocamlbuild to build-depends
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit caaf38d81bdd0fa6ba36653b835a2f705d296019 Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 13:53:18 2017 +0100 Add ocamlbuild to build-depends --- debian/control | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index 2798f4d..c26b6a1 100644 --- a/debian/control +++ b/debian/control @@ -3,14 +3,15 @@ Section: ocaml Priority: optional Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org> Uploaders: Lucas Nussbaum <lu...@debian.org> -Build-Depends: debhelper (>= 9), - ocaml-nox (>= 3.12.1), - liblablgtk2-ocaml-dev (>= 2.12.0-2), - bash (>= 3.1), - dh-ocaml (>= 0.9.1), - ocaml-findlib, - bzr, - camlp4-extra +Build-Depends: bash (>= 3.1), + bzr, + camlp4-extra, + debhelper (>= 9), + dh-ocaml (>= 0.9.1), + liblablgtk2-ocaml-dev (>= 2.12.0-2), + ocaml-findlib, + ocaml-nox (>= 3.12.1), + ocamlbuild Standards-Version: 4.1.1 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/ocamlbricks.git Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocamlbricks.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] annotated tag upstream/0.90+bzr454 created (now 8a976fc)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to annotated tag upstream/0.90+bzr454 in repository ocamlbricks. at 8a976fc (tag) tagging 8aaddeb6222e68f2ff01acc5a2a51bd969c1274d (commit) replaces upstream/0.90+bzr400 tagged by Lucas Nussbaum on Mon Oct 9 07:57:43 2017 +0200 - Log - Upstream version 0.90+bzr454 Lucas Nussbaum (1): New upstream version 0.90+bzr454 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] branch upstream updated (ddf9ed1 -> 29a0b69)
This is an automated email from the git hooks/post-receive script.
lucas pushed a change to branch upstream
in repository ocamlbricks.
from ddf9ed1 Imported Upstream version 0.90+bzr400
new 8aaddeb New upstream version 0.90+bzr454
new 260c49c New upstream version 0.90+bzr455
new 29a0b69 New upstream version 0.90+bzr456
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
BASE/argv.ml | 10 +-
BASE/log_builder.ml| 12 +
BASE/log_builder.mli | 2 +
CAMLP4/include_as_string_p4.ml | 11 +-
CAMLP4/include_as_string_p4.mli| 2 +-
CAMLP4/include_type_definitions_p4.ml | 87 +++-
CAMLP4/include_type_definitions_p4.mli | 2 +-
CONFIGME | 18 +-
CONFIGURATION/configuration_files.ml | 189 +---
CONFIGURATION/configuration_files.mli | 12 +
CORTEX/lock.ml | 596 +
CORTEX/lock.mli| 105 +
CORTEX/locked.ml | 445 ++
CORTEX/locked.mli | 81
CORTEX/spinning.ml | 233 ++
CORTEX/spinning.mli| 137 ++
DOT/dot.ml | 5 +-
DOT/dot.mli| 1 -
DOT/dot_widget.ml | 16 +-
EXTRA/arrayExtra.ml| 417 +
EXTRA/arrayExtra.mli | 62 ++-
EXTRA/filenameExtra.ml | 4 +-
EXTRA/hashtblExtra.ml | 104 +
{STRUCTURES => EXTRA}/hashtblExtra.mli | 16 +
EXTRA/listExtra.ml | 60 ++-
EXTRA/listExtra.mli| 16 +-
EXTRA/pervasivesExtra.ml | 75
EXTRA/pervasivesExtra.mli | 24 +-
EXTRA/stringExtra.ml | 26 +-
EXTRA/sysExtra.ml | 8 +-
EXTRA/threadExtra.ml | 24 +-
EXTRA/unixExtra.ml | 118 -
EXTRA/unixExtra.mli| 24 +-
EXTRA/waitpid-c-wrapper.c | 1 +
GETTEXT/gettext_builder.ml | 5 +-
MARSHAL/marshallable_classes.ml| 31 +-
Makefile | 115 +++--
Makefile.d/test_with.sh| 27 +-
Makefile.local | 30 +-
Makefile.local => Makefile.local.for_copies| 37 +-
SHELL/linux.ml | 35 +-
SHELL/linux.mli| 3 +
SHELL/shell.ml | 66 +--
SHELL/shell.mli| 14 +-
STRUCTURES/cortex.ml | 100 ++---
STRUCTURES/cortex.mli | 3 +
STRUCTURES/cortex_lib.ml | 4 +-
STRUCTURES/cortex_lib.mli | 2 +-
STRUCTURES/egg.ml | 4 +-
STRUCTURES/egg.mli | 2 +-
STRUCTURES/endpoint.ml | 82 ++--
STRUCTURES/hashmmap.ml | 9 +-
STRUCTURES/hashset.ml | 60 ++-
STRUCTURES/hashset.mli | 24 +-
STRUCTURES/hashtblExtra.ml | 42 --
STRUCTURES/ipv6.ml | 4 +-
STRUCTURES/lazy_perishable.ml | 48 ++
BASE/fix.mli => STRUCTURES/lazy_perishable.mli | 23 +-
STRUCTURES/memo.ml | 57 ++-
STRUCTURES/memo.mli| 4 +-
STRUCTURES/network.ml | 7 +-
STRUCTURES/option.ml | 69 ++-
STRUCTURES/option.mli | 26 +-
STRUCTURES/string_queue.ml | 8 +-
STRUCTURES/thunk.ml| 22 +-
STRUCTURES/thunk.mli | 7 +
WIDGETS/{environment.ml => environments.ml}| 0
WIDGETS/{environment.mli => environments.mli} | 0
WIDGETS/widget.ml | 34 +-
WIDGETS/widget.mli | 16 +-
meta.ml.released => meta.ml| 12 +-
meta.ml.released | 12 +-
ocamlbricks.mllib | 7 +-
ocamlbricks.odocl | 9 +-
74 files changed, 3362 insertions(+), 641 deletions(-)
create mode 100644
[Pkg-ocaml-maint-commits] [ocamlbricks] 18/19: Drop patch: fix-Makefile-meta.ml.released.patch
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit 46b7e8dc2f33409a037a8f4f8459f44028422ace Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 23:07:18 2017 +0100 Drop patch: fix-Makefile-meta.ml.released.patch --- debian/patches/fix-Makefile-meta.ml.released.patch | 13 - debian/patches/series | 1 - 2 files changed, 14 deletions(-) diff --git a/debian/patches/fix-Makefile-meta.ml.released.patch b/debian/patches/fix-Makefile-meta.ml.released.patch deleted file mode 100644 index c8d62c9..000 --- a/debian/patches/fix-Makefile-meta.ml.released.patch +++ /dev/null @@ -1,13 +0,0 @@ a/Makefile -+++ b/Makefile -@@ -934,8 +934,8 @@ meta.ml: META CONFIGME - - meta.ml.released: meta.ml - if [ -d .bzr ]; then \ -- cp $< $@ -- fi; \ -+ cp $< $@ ; \ -+ fi - - ### - # Include the project-dependant file (if any) which implements the '-local' diff --git a/debian/patches/series b/debian/patches/series index 37944d4..ef23491 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0002-Use-the-Debian-prefix-for-building.patch 0003-Fix-the-build-on-non-native-architectures.patch 0004-install-stublibs.patch -fix-Makefile-meta.ml.released.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 02/03: pristine-tar data for ocamlbricks_0.90+bzr455.orig.tar.gz
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch pristine-tar in repository ocamlbricks. commit 5315430827b64ec267b5956917fc75112a75acf1 Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 13:25:58 2017 +0100 pristine-tar data for ocamlbricks_0.90+bzr455.orig.tar.gz --- ocamlbricks_0.90+bzr455.orig.tar.gz.delta | Bin 0 -> 6718 bytes ocamlbricks_0.90+bzr455.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/ocamlbricks_0.90+bzr455.orig.tar.gz.delta b/ocamlbricks_0.90+bzr455.orig.tar.gz.delta new file mode 100644 index 000..44efcc5 Binary files /dev/null and b/ocamlbricks_0.90+bzr455.orig.tar.gz.delta differ diff --git a/ocamlbricks_0.90+bzr455.orig.tar.gz.id b/ocamlbricks_0.90+bzr455.orig.tar.gz.id new file mode 100644 index 000..5ca5cea --- /dev/null +++ b/ocamlbricks_0.90+bzr455.orig.tar.gz.id @@ -0,0 +1 @@ +13c79ce7c3468543e8350e6aa3d5af30cc29c41c -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] branch pristine-tar updated (8b5a158 -> 6215847)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch pristine-tar in repository ocamlbricks. from 8b5a158 pristine-tar data for ocamlbricks_0.90+bzr400.orig.tar.gz new ba890f4 pristine-tar data for ocamlbricks_0.90+bzr454.orig.tar.gz new 5315430 pristine-tar data for ocamlbricks_0.90+bzr455.orig.tar.gz new 6215847 pristine-tar data for ocamlbricks_0.90+bzr456.orig.tar.gz The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: ocamlbricks_0.90+bzr454.orig.tar.gz.delta | Bin 0 -> 6784 bytes ocamlbricks_0.90+bzr454.orig.tar.gz.id| 1 + ocamlbricks_0.90+bzr455.orig.tar.gz.delta | Bin 0 -> 6718 bytes ocamlbricks_0.90+bzr455.orig.tar.gz.id| 1 + ocamlbricks_0.90+bzr456.orig.tar.gz.delta | Bin 0 -> 6751 bytes ocamlbricks_0.90+bzr456.orig.tar.gz.id| 1 + 6 files changed, 3 insertions(+) create mode 100644 ocamlbricks_0.90+bzr454.orig.tar.gz.delta create mode 100644 ocamlbricks_0.90+bzr454.orig.tar.gz.id create mode 100644 ocamlbricks_0.90+bzr455.orig.tar.gz.delta create mode 100644 ocamlbricks_0.90+bzr455.orig.tar.gz.id create mode 100644 ocamlbricks_0.90+bzr456.orig.tar.gz.delta create mode 100644 ocamlbricks_0.90+bzr456.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 03/03: pristine-tar data for ocamlbricks_0.90+bzr456.orig.tar.gz
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch pristine-tar in repository ocamlbricks. commit 6215847504ce167542cb0596066d4fbb8381190d Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 23:05:27 2017 +0100 pristine-tar data for ocamlbricks_0.90+bzr456.orig.tar.gz --- ocamlbricks_0.90+bzr456.orig.tar.gz.delta | Bin 0 -> 6751 bytes ocamlbricks_0.90+bzr456.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/ocamlbricks_0.90+bzr456.orig.tar.gz.delta b/ocamlbricks_0.90+bzr456.orig.tar.gz.delta new file mode 100644 index 000..5363498 Binary files /dev/null and b/ocamlbricks_0.90+bzr456.orig.tar.gz.delta differ diff --git a/ocamlbricks_0.90+bzr456.orig.tar.gz.id b/ocamlbricks_0.90+bzr456.orig.tar.gz.id new file mode 100644 index 000..960fb52 --- /dev/null +++ b/ocamlbricks_0.90+bzr456.orig.tar.gz.id @@ -0,0 +1 @@ +1a62560fe7d4ddb3dc8c4a81cc85060eb32d6d07 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 19/19: Prepare changelog
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit 49932e37d1ccb7827f815e688ae531be4740e85a Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 23:07:22 2017 +0100 Prepare changelog --- debian/changelog | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 715832a..3c0b1a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ -ocamlbricks (0.90+bzr455-1) unstable; urgency=medium +ocamlbricks (0.90+bzr456-1) unstable; urgency=medium - * New upstream version 0.90+bzr455 + * Refresh patches. + * Add ocamlbuild to build-depends + * Run wrap-and-sort -a + * New upstream version 0.90+bzr456 * Add breaks on older marionnet * Bump debian/compat to 9 * Bump Standards-version to 4.1.1. No changes needed. * Fix FTBFS. Closes: #876734 - -- Lucas Nussbaum <lu...@debian.org> Mon, 30 Oct 2017 13:26:43 +0100 + -- Lucas Nussbaum <lu...@debian.org> Mon, 30 Oct 2017 23:05:33 +0100 ocamlbricks (0.90+bzr400-2) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 08/19: Prepare changelog for upload.
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit 0571e5700d3a0bdb82228bb613d7e7427d871962 Author: Lucas Nussbaum <lu...@debian.org> Date: Sun Oct 22 00:18:01 2017 +0200 Prepare changelog for upload. --- debian/changelog | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0e2adc9..ed5c346 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -ocamlbricks (0.90+bzr454-1) UNRELEASED; urgency=medium +ocamlbricks (0.90+bzr454-1) unstable; urgency=medium * New upstream snapshot. + * Add breaks on older marionnet + * Bump debian/compat to 9 + * Bump Standards-version to 4.1.1. No changes needed. + * Fix FTBFS. Closes: #876734 - -- Lucas Nussbaum <lu...@debian.org> Mon, 09 Oct 2017 07:58:26 +0200 + -- Lucas Nussbaum <lu...@debian.org> Sun, 22 Oct 2017 00:17:13 +0200 ocamlbricks (0.90+bzr400-2) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 11/19: Prepare changelog for upload.
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit a4c9c6a64ef14e2c3cc3ba7015be9cf3ac2a2f0a Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 13:26:51 2017 +0100 Prepare changelog for upload. --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed5c346..715832a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,12 @@ -ocamlbricks (0.90+bzr454-1) unstable; urgency=medium +ocamlbricks (0.90+bzr455-1) unstable; urgency=medium - * New upstream snapshot. + * New upstream version 0.90+bzr455 * Add breaks on older marionnet * Bump debian/compat to 9 * Bump Standards-version to 4.1.1. No changes needed. * Fix FTBFS. Closes: #876734 - -- Lucas Nussbaum <lu...@debian.org> Sun, 22 Oct 2017 00:17:13 +0200 + -- Lucas Nussbaum <lu...@debian.org> Mon, 30 Oct 2017 13:26:43 +0100 ocamlbricks (0.90+bzr400-2) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 07/19: Bump Standards-version to 4.1.1. No changes needed.
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit 3dcf952cf275864ea7bd836c269fc7dadae2c367 Author: Lucas Nussbaum <lu...@debian.org> Date: Sun Oct 22 00:16:56 2017 +0200 Bump Standards-version to 4.1.1. No changes needed. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 098ad31..2798f4d 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9), ocaml-findlib, bzr, camlp4-extra -Standards-Version: 3.9.4 +Standards-Version: 4.1.1 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/ocamlbricks.git Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocamlbricks.git Homepage: https://launchpad.net/ocamlbricks -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 13/19: Add patch: fix-Makefile-meta.ml.released.patch
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit 7fdef8debecde06a6a3a1fd52e33f3257ec0 Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 13:46:29 2017 +0100 Add patch: fix-Makefile-meta.ml.released.patch --- debian/patches/fix-Makefile-meta.ml.released.patch | 13 + debian/patches/series | 1 + 2 files changed, 14 insertions(+) diff --git a/debian/patches/fix-Makefile-meta.ml.released.patch b/debian/patches/fix-Makefile-meta.ml.released.patch new file mode 100644 index 000..c8d62c9 --- /dev/null +++ b/debian/patches/fix-Makefile-meta.ml.released.patch @@ -0,0 +1,13 @@ +--- a/Makefile b/Makefile +@@ -934,8 +934,8 @@ meta.ml: META CONFIGME + + meta.ml.released: meta.ml + if [ -d .bzr ]; then \ +- cp $< $@ +- fi; \ ++ cp $< $@ ; \ ++ fi + + ### + # Include the project-dependant file (if any) which implements the '-local' diff --git a/debian/patches/series b/debian/patches/series index ef23491..37944d4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0002-Use-the-Debian-prefix-for-building.patch 0003-Fix-the-build-on-non-native-architectures.patch 0004-install-stublibs.patch +fix-Makefile-meta.ml.released.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 16/19: New upstream version 0.90+bzr456
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit 29a0b695f54ec1450f79c098e7d3d1b1053e3cb5 Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 23:05:26 2017 +0100 New upstream version 0.90+bzr456 --- Makefile | 2 +- meta.ml | 18 ++ meta.ml.released | 18 ++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3e6c4f7..df38c1e 100644 --- a/Makefile +++ b/Makefile @@ -935,7 +935,7 @@ meta.ml: META CONFIGME meta.ml.released: meta.ml if [ -d .bzr ]; then \ - cp $< $@ + cp $< $@; \ fi; \ ### diff --git a/meta.ml b/meta.ml new file mode 100644 index 000..2d093e9 --- /dev/null +++ b/meta.ml @@ -0,0 +1,18 @@ +(** Automatically generated meta-informations about the project and its building. *) +(* This file is automatically generated; please don't edit it. *) + +let name = "ocamlbricks";; +let version = "trunk";; +let prefix = "/usr/local";; +let prefix_install = "/usr/local";; +let ocaml_version = "4.02.3";; +let ocaml_libraryprefix = "/usr/lib/ocaml";; +let libraryprefix = "/usr/lib/ocaml";; +let configurationprefix = "/etc";; +let localeprefix = "/usr/local/share/locale";; +let documentationprefix = "/usr/local/share/doc";; +let uname = "Linux 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u5 (2017-09-19) x86_64 GNU/Linux";; +let build_date = "2017-10-30 23:04:53 +0100";; +let revision = "456";; +let source_date = "2017-10-30 20:38:00 +0100";; +let source_date_utc_yy_mm_dd = "2017-10-30";; diff --git a/meta.ml.released b/meta.ml.released new file mode 100644 index 000..2d093e9 --- /dev/null +++ b/meta.ml.released @@ -0,0 +1,18 @@ +(** Automatically generated meta-informations about the project and its building. *) +(* This file is automatically generated; please don't edit it. *) + +let name = "ocamlbricks";; +let version = "trunk";; +let prefix = "/usr/local";; +let prefix_install = "/usr/local";; +let ocaml_version = "4.02.3";; +let ocaml_libraryprefix = "/usr/lib/ocaml";; +let libraryprefix = "/usr/lib/ocaml";; +let configurationprefix = "/etc";; +let localeprefix = "/usr/local/share/locale";; +let documentationprefix = "/usr/local/share/doc";; +let uname = "Linux 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u5 (2017-09-19) x86_64 GNU/Linux";; +let build_date = "2017-10-30 23:04:53 +0100";; +let revision = "456";; +let source_date = "2017-10-30 20:38:00 +0100";; +let source_date_utc_yy_mm_dd = "2017-10-30";; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 01/19: Merge tag 'upstream/0.90+bzr454'
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository ocamlbricks.
commit a8df3a8f9a7c150cb133300e2f70dadf74662194
Merge: 2c87f07 8aaddeb
Author: Lucas Nussbaum <lu...@debian.org>
Date: Mon Oct 9 07:57:43 2017 +0200
Merge tag 'upstream/0.90+bzr454'
Upstream version 0.90+bzr454
BASE/log_builder.ml| 12 +
BASE/log_builder.mli | 2 +
CAMLP4/include_as_string_p4.ml | 11 +-
CAMLP4/include_as_string_p4.mli| 2 +-
CAMLP4/include_type_definitions_p4.mli | 2 +-
CONFIGME | 18 +-
CONFIGURATION/configuration_files.ml | 189 ---
CONFIGURATION/configuration_files.mli | 12 +
CORTEX/lock.ml | 596 +
CORTEX/lock.mli| 105
CORTEX/locked.ml | 445 +++
CORTEX/locked.mli | 81 +++
CORTEX/spinning.ml | 233
CORTEX/spinning.mli| 137 +
DOT/dot.ml | 5 +-
DOT/dot.mli| 1 -
EXTRA/arrayExtra.ml| 415 ++
EXTRA/arrayExtra.mli | 62 ++-
EXTRA/filenameExtra.ml | 4 +-
EXTRA/hashtblExtra.ml | 104
{STRUCTURES => EXTRA}/hashtblExtra.mli | 16 +
EXTRA/listExtra.ml | 58 +-
EXTRA/listExtra.mli| 16 +-
EXTRA/pervasivesExtra.ml | 75 +++
EXTRA/pervasivesExtra.mli | 24 +-
EXTRA/stringExtra.ml | 26 +-
EXTRA/threadExtra.ml | 14 +-
EXTRA/unixExtra.ml | 118 +++-
EXTRA/unixExtra.mli| 24 +-
EXTRA/waitpid-c-wrapper.c | 1 +
GETTEXT/gettext_builder.ml | 5 +-
MARSHAL/marshallable_classes.ml| 31 +-
Makefile | 113 ++--
Makefile.d/test_with.sh| 27 +-
Makefile.local | 18 +-
Makefile.local => Makefile.local.for_copies| 37 +-
SHELL/linux.ml | 35 +-
SHELL/linux.mli| 3 +
SHELL/shell.ml | 66 +--
SHELL/shell.mli| 14 +-
STRUCTURES/cortex.ml | 100 ++--
STRUCTURES/cortex.mli | 3 +
STRUCTURES/cortex_lib.ml | 4 +-
STRUCTURES/cortex_lib.mli | 2 +-
STRUCTURES/egg.ml | 4 +-
STRUCTURES/egg.mli | 2 +-
STRUCTURES/endpoint.ml | 80 +--
STRUCTURES/hashmmap.ml | 9 +-
STRUCTURES/hashset.ml | 60 ++-
STRUCTURES/hashset.mli | 24 +-
STRUCTURES/ipv6.ml | 4 +-
STRUCTURES/lazy_perishable.ml | 48 ++
.../{hashtblExtra.ml => lazy_perishable.mli} | 32 +-
STRUCTURES/memo.ml | 57 +-
STRUCTURES/memo.mli| 4 +-
STRUCTURES/network.ml | 7 +-
STRUCTURES/option.ml | 69 ++-
STRUCTURES/option.mli | 26 +-
STRUCTURES/string_queue.ml | 8 +-
STRUCTURES/thunk.ml| 22 +-
STRUCTURES/thunk.mli | 7 +
WIDGETS/{environment.ml => environments.ml}| 0
WIDGETS/{environment.mli => environments.mli} | 0
WIDGETS/widget.ml | 34 +-
WIDGETS/widget.mli | 16 +-
meta.ml.released | 12 +-
ocamlbricks.mllib | 7 +-
ocamlbricks.odocl | 9 +-
68 files changed, 3217 insertions(+), 590 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git
___
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] [ocamlbricks] 09/19: Merge tag 'upstream/0.90+bzr455'
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit 857c27cf99ecb1c29e6336fd9194b8aa3febf7c6 Merge: 0571e57 260c49c Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 13:25:58 2017 +0100 Merge tag 'upstream/0.90+bzr455' Upstream version 0.90+bzr455 BASE/argv.ml | 10 +++- CAMLP4/include_type_definitions_p4.ml | 87 ++- DOT/dot_widget.ml | 16 +-- EXTRA/arrayExtra.ml | 2 +- EXTRA/listExtra.ml| 2 +- EXTRA/sysExtra.ml | 8 +++- EXTRA/threadExtra.ml | 10 +++- Makefile | 6 +-- Makefile.local| 14 -- STRUCTURES/endpoint.ml| 2 +- meta.ml.released | 18 11 files changed, 136 insertions(+), 39 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 05/19: Add breaks on older marionnet
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository ocamlbricks.
commit 33c8f27224571e98d5e87f8e7a6880bcc90e97de
Author: Lucas Nussbaum <lu...@debian.org>
Date: Mon Oct 9 08:42:46 2017 +0200
Add breaks on older marionnet
---
debian/control | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control
index 3f987d1..20c0003 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Architecture: any
Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends},
liblablgtk2-ocaml-dev (>= 2.12.0-2)
Provides: ${ocaml:Provides}
Replaces: ocamlbricks (<< 0.50.1)
+Breaks: marionnet (<< 0.90.6+bzr506)
Suggests: ocaml-findlib
Description: Miscellaneous utility functions in OCaml for Marionnet
This OCaml library provides a set of needed and useful macros for developing.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git
___
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] [marionnet] 15/19: New upstream version 0.90.6+bzr508
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit 154c694f87471033312d5a628a004e25139954bd Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 23:21:08 2017 +0100 New upstream version 0.90.6+bzr508 --- Makefile| 4 +-- Makefile.local | 5 +++- meta.ml.released| 10 po/messages.pot | 74 ++--- router.ml | 16 +--- simulation_level.ml | 4 +-- 6 files changed, 62 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index 6e301ed..e19ca85 100644 --- a/Makefile +++ b/Makefile @@ -935,8 +935,8 @@ meta.ml: META CONFIGME meta.ml.released: meta.ml if [ -d .bzr ]; then \ - cp $< $@ ; \ - fi + cp $< $@; \ + fi; \ ### # Include the project-dependant file (if any) which implements the '-local' diff --git a/Makefile.local b/Makefile.local index af2035a..17712db 100644 --- a/Makefile.local +++ b/Makefile.local @@ -30,7 +30,10 @@ OCAMLBRICKS=$(LIBRARYPREFIX)/ocamlbricks # Empty for OCaml 3.x.y series, set to "-DOCAML4_02_OR_LATER" for 4.02.y or later: OCAML4_02_OR_LATER=$(shell if grep -q "^\([5-9]\)\|\(4[.]\([1-9]\|0[2-9]\)\)" <<<"$(OCAML_VERSION)"; then echo "-DOCAML4_02_OR_LATER"; fi) -PP_OPTION = camlp4of $(OCAML4_02_OR_LATER) -I $(OCAMLBRICKS) gettext_extract_pot_p4.cmo option_extract_p4.cmo raise_p4.cmo log_module_loading_p4.cmo +# Empty for OCaml 3.x.y series, set to "-DOCAML4_04_OR_LATER" for 4.04.y or later: +OCAML4_04_OR_LATER=$(shell if grep -q "^\([5-9]\)\|\(4[.]\([1-9]\|0[4-9]\)\)" <<<"$(OCAML_VERSION)"; then echo "-DOCAML4_04_OR_LATER"; fi) + +PP_OPTION = camlp4of $(OCAML4_02_OR_LATER) $(OCAML4_04_OR_LATER) -I $(OCAMLBRICKS) gettext_extract_pot_p4.cmo option_extract_p4.cmo raise_p4.cmo log_module_loading_p4.cmo OBJECTS_TO_LINK = gtkThread BYTE_PROGRAMS = marionnet.byte diff --git a/meta.ml.released b/meta.ml.released index 2adcb56..7cf8a8d 100644 --- a/meta.ml.released +++ b/meta.ml.released @@ -11,8 +11,8 @@ let libraryprefix = "/usr/lib/ocaml";; let configurationprefix = "/etc";; let localeprefix = "/usr/local/share/locale";; let documentationprefix = "/usr/local/share/doc";; -let uname = "Linux 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u3 (2017-08-06) x86_64 GNU/Linux";; -let build_date = "2017-10-09 8:02:20 +0200";; -let revision = "506";; -let source_date = "2017-09-22 13:06:28 +0200";; -let source_date_utc_yy_mm_dd = "2017-09-22";; +let uname = "Linux 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u5 (2017-09-19) x86_64 GNU/Linux";; +let build_date = "2017-10-30 23:20:42 +0100";; +let revision = "508";; +let source_date = "2017-10-30 20:41:49 +0100";; +let source_date_utc_yy_mm_dd = "2017-10-30";; diff --git a/po/messages.pot b/po/messages.pot index 28328df..4b6084d 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -20,7 +20,7 @@ msgid "%s configuration file" msgstr "" #. generated by gettext_extract_pot_p4 -#: router.ml:759 +#: router.ml:767 msgid "%s startup config." msgstr "" @@ -96,7 +96,7 @@ msgid "ADD OR MODIFY A HUB" msgstr "" #. generated by gettext_extract_pot_p4 -#: router.ml:929 +#: router.ml:937 msgid "ADD OR MODIFY A ROUTER" msgstr "" @@ -166,7 +166,7 @@ msgid "Add machine" msgstr "" #. generated by gettext_extract_pot_p4 -#: router.ml:425 +#: router.ml:433 msgid "Add router" msgstr "" @@ -204,7 +204,7 @@ msgid "" msgstr "" #. generated by gettext_extract_pot_p4 -#: world_gateway.ml:155 +#: machine.ml:211 msgid "" "Are you sure that you want to remove %s\n" "and all the cables connected to this %s?" @@ -303,7 +303,7 @@ msgid "Check to activate" msgstr "" #. generated by gettext_extract_pot_p4 -#: router.ml:716 +#: machine.ml:364 msgid "Check to activate a startup configuration" msgstr "" @@ -345,12 +345,12 @@ msgid "Collapse all" msgstr "" #. generated by gettext_extract_pot_p4 -#: treeview_documents.ml:268 +#: treeview_history.ml:441 msgid "Comment" msgstr "" #. generated by gettext_extract_pot_p4 -#: router.ml:750 +#: router.ml:758 msgid "Configure Quagga's services" msgstr "" @@ -460,19 +460,19 @@ msgid "Distance between labels and icons" msgstr "" #. generated by gettext_extract_pot_p4 -#: router.ml:653 +#: machine.ml:315 msgid "Distributi
[Pkg-ocaml-maint-commits] [marionnet] 07/19: Add xterm to Depends (Closes: #866606)
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository marionnet.
commit 7aeebcb50ecda4eeb607fec811eb173f8c4d5003
Author: Lucas Nussbaum <lu...@debian.org>
Date: Sun Oct 22 00:04:13 2017 +0200
Add xterm to Depends (Closes: #866606)
---
debian/control | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 55ffc81..b756d00 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends},
liblablgtksourceview2-ocaml-dev (>= 2.14.2),
vde2,
lsb-base (>= 3.2-14),
- uml-utilities
+ uml-utilities,
+ xterm
Description: Virtual network laboratory
Marionnet is a virtual network laboratory: it allows users to define,
configure and run complex computer networks without any need for physical
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git
___
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] [marionnet] 19/19: Prepare changelog
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit d0a54a9a05a7355fba6f48796ec7ee52589583c3 Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 23:23:42 2017 +0100 Prepare changelog --- debian/changelog | 14 ++ debian/control | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 539588a..8fea9ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ -marionnet (0.90.6+bzr506-1) UNRELEASED; urgency=medium +marionnet (0.90.6+bzr508-1) unstable; urgency=medium - * New upstream snapshot. + * New upstream version 0.90.6+bzr508 * Add stricter dep on ocamlbricks. * Add symlink to port-helper in $PATH. * Add xterm to Depends. Closes: #866606 * Mention Multiarch in README.Debian. Closes: #866607 - - -- Lucas Nussbaum <lu...@debian.org> Sun, 22 Oct 2017 00:06:46 +0200 + * Add patch from ceridwen.debian.b...@gmail.com to support building reproducibly. Closes: #818952 + * Remove obsolete b-dep on dh-systemd + * Bump debian/compat to 9 + * Bump Standards-version to 4.1.1. No changes needed. + * Remove duplicate license in debian/copyright + * Run wrap-and-sort -a + + -- Lucas Nussbaum <lu...@debian.org> Mon, 30 Oct 2017 23:22:35 +0100 marionnet (0.90.6+bzr457-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index d4344dd..8fd6208 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,8 @@ Build-Depends: camlp4-extra, liblablgtksourceview2-ocaml-dev (>= 2.14.2), libocamlbricks-ocaml-dev (>= 0.90+bzr454~), ocaml-findlib, - ocaml-nox (>= 3.12.1) + ocaml-nox (>= 3.12.1), + ocamlbuild Standards-Version: 4.1.1 Homepage: http://www.marionnet.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/marionnet.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] branch master updated (c9ea72a -> d0a54a9)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch master in repository marionnet. from c9ea72a d/control: remove myself from Uploaders new 2416155 New upstream version 0.90+bzr506 new 48b9e2a Merge tag 'upstream/0.90+bzr506' new 2fac9dc Refresh patches new ee72574 Initialize changelog new 2fd2a70 Add stricter dep on ocamlbricks new 08334c3 Add symlink to port-helper in $PATH new 7aeebcb Add xterm to Depends (Closes: #866606) new 91d3674 Mention Multiarch in README.Debian. Closes: #866607 new f74be64 Update changelog new 15bf7b1 Add patch from ceridwen.debian.b...@gmail.com to support building reproducibly. Closes: #818952 new e788444 Remove obsolete b-dep on dh-systemd new 3b8aa60 Bump debian/compat to 9 new 64e3f05 Bump Standards-version to 4.1.1. No changes needed. new eba6026 Remove duplicate license in debian/copyright new 154c694 New upstream version 0.90.6+bzr508 new a6af986 Merge tag 'upstream/0.90.6+bzr508' new 587e6fc Run wrap-and-sort -a new f540b79 Stricter dep on camlbricks new d0a54a9 Prepare changelog The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: CONFIGME | 18 +- Makefile | 115 +- Makefile.local | 33 +- cable.ml | 50 +- chip/chip.ml | 820 chip/chip.mli | 515 --- chip/chip_example.ml | 126 - chip/chip_parser_p4.ml | 421 -- chip/chip_parser_p4.old_version.ml | 529 --- chip/wGButton.ml | 91 - cloud.ml |5 +- compatibility/forest_backward_compatibility.ml | 16 + configuration.ml |7 + configuration.mli |8 + cow_files.ml |2 +- daemon_client.ml | 50 +- daemon_language.ml | 147 +- debian/README.Debian |2 +- debian/changelog | 16 + debian/compat |2 +- debian/control | 41 +- debian/copyright |4 +- debian/marionnet.install |4 +- ...e-installation-paths-for-Debian-packaging.patch | 14 +- .../patches/0003-Tweak-ocamldep-search-path.patch |8 +- debian/patches/reproducible-build.patch| 23 + debian/patches/series |1 + debian/rules | 10 + descendants_monitor.ml |2 +- disk.ml| 63 +- disk.mli | 17 +- gettext.ml |9 +- global_options.ml | 38 +- gui/gui_bricks.ml | 487 ++- gui/gui_bricks.mli | 122 +- gui/gui_dialog_A_PROPOS.ml |2 +- gui/gui_dialog_toolkit.ml |2 +- gui/gui_menubar_MARIONNET.ml | 55 +- gui/gui_source_editing.ml | 21 +- gui/gui_toolbar_COMPONENTS_layouts.ml |2 +- gui/gui_toolbar_DOT_TUNING.ml | 23 +- gui/ledgrid.ml |4 +- gui/ledgrid_manager.ml |5 +- gui/menu_factory.ml|2 +- gui/menu_factory.mli |4 +- gui/simple_dialogs.ml | 25 +- gui/talking.ml | 211 +- gui/talking.mli| 100 +- hub.ml |3 + initialization.ml | 16 +- machine.ml | 228 +- marionnet-daemon.ml| 371 +- marionnet.ml | 47 +- meta.ml.released | 12 +- motherboard.ml | 11 - motherboard_builder.ml |
[Pkg-ocaml-maint-commits] [marionnet] annotated tag upstream/0.90+bzr506 created (now b92b24b)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to annotated tag upstream/0.90+bzr506 in repository marionnet. at b92b24b (tag) tagging 241615516d67bdcd8316007df53fa2271f54706c (commit) replaces upstream/0.90.6+bzr457 tagged by Lucas Nussbaum on Mon Oct 9 08:06:21 2017 +0200 - Log - Upstream version 0.90+bzr506 Lucas Nussbaum (1): New upstream version 0.90+bzr506 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [ocamlbricks] branch master updated (2c87f07 -> 49932e3)
This is an automated email from the git hooks/post-receive script.
lucas pushed a change to branch master
in repository ocamlbricks.
from 2c87f07 d/control: remove myself from Uploaders
new 8aaddeb New upstream version 0.90+bzr454
new a8df3a8 Merge tag 'upstream/0.90+bzr454'
new 202ef66 Refresh patches
new 1b5dd1c Initialize changelog
new 33c8f27 Add breaks on older marionnet
new e39fa48 Bump debian/compat to 9
new 3dcf952 Bump Standards-version to 4.1.1. No changes needed.
new 0571e57 Prepare changelog for upload.
new 260c49c New upstream version 0.90+bzr455
new 857c27c Merge tag 'upstream/0.90+bzr455'
new a4c9c6a Prepare changelog for upload.
new e00b39f Refresh patch.
new 7fdef8d Add patch: fix-Makefile-meta.ml.released.patch
new caaf38d Add ocamlbuild to build-depends
new 6c138bf Run wrap-and-sort -a
new 29a0b69 New upstream version 0.90+bzr456
new e57b055 Merge tag 'upstream/0.90+bzr456'
new 46b7e8d Drop patch: fix-Makefile-meta.ml.released.patch
new 49932e3 Prepare changelog
The 19 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
BASE/argv.ml | 10 +-
BASE/log_builder.ml| 12 +
BASE/log_builder.mli | 2 +
CAMLP4/include_as_string_p4.ml | 11 +-
CAMLP4/include_as_string_p4.mli| 2 +-
CAMLP4/include_type_definitions_p4.ml | 87 ++-
CAMLP4/include_type_definitions_p4.mli | 2 +-
CONFIGME | 18 +-
CONFIGURATION/configuration_files.ml | 189 ---
CONFIGURATION/configuration_files.mli | 12 +
CORTEX/lock.ml | 596 +
CORTEX/lock.mli| 105
CORTEX/locked.ml | 445 +++
CORTEX/locked.mli | 81 +++
CORTEX/spinning.ml | 233
CORTEX/spinning.mli| 137 +
DOT/dot.ml | 5 +-
DOT/dot.mli| 1 -
DOT/dot_widget.ml | 16 +-
EXTRA/arrayExtra.ml| 417 ++
EXTRA/arrayExtra.mli | 62 ++-
EXTRA/filenameExtra.ml | 4 +-
EXTRA/hashtblExtra.ml | 104
{STRUCTURES => EXTRA}/hashtblExtra.mli | 16 +
EXTRA/listExtra.ml | 60 ++-
EXTRA/listExtra.mli| 16 +-
EXTRA/pervasivesExtra.ml | 75 +++
EXTRA/pervasivesExtra.mli | 24 +-
EXTRA/stringExtra.ml | 26 +-
EXTRA/sysExtra.ml | 8 +-
EXTRA/threadExtra.ml | 24 +-
EXTRA/unixExtra.ml | 118 +++-
EXTRA/unixExtra.mli| 24 +-
EXTRA/waitpid-c-wrapper.c | 1 +
GETTEXT/gettext_builder.ml | 5 +-
MARSHAL/marshallable_classes.ml| 31 +-
Makefile | 115 ++--
Makefile.d/test_with.sh| 27 +-
Makefile.local | 30 +-
Makefile.local => Makefile.local.for_copies| 37 +-
SHELL/linux.ml | 35 +-
SHELL/linux.mli| 3 +
SHELL/shell.ml | 66 +--
SHELL/shell.mli| 14 +-
STRUCTURES/cortex.ml | 100 ++--
STRUCTURES/cortex.mli | 3 +
STRUCTURES/cortex_lib.ml | 4 +-
STRUCTURES/cortex_lib.mli | 2 +-
STRUCTURES/egg.ml | 4 +-
STRUCTURES/egg.mli | 2 +-
STRUCTURES/endpoint.ml | 82 +--
STRUCTURES/hashmmap.ml | 9 +-
STRUCTURES/hashset.ml | 60 ++-
STRUCTURES/hashset.mli | 24 +-
STRUCTURES/hashtblExtra.ml | 42 --
STRUCTURES/ipv6.ml | 4 +-
STRUCTURES/lazy_perishable.ml | 48 ++
[Pkg-ocaml-maint-commits] [marionnet] 12/19: Bump debian/compat to 9
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit 3b8aa604d031008749b6271dd6cb94c8a9f0c8bb Author: Lucas Nussbaum <lu...@debian.org> Date: Sun Oct 22 00:12:42 2017 +0200 Bump debian/compat to 9 --- debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 01/03: pristine-tar data for marionnet_0.90+bzr506.orig.tar.gz
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch pristine-tar in repository marionnet. commit 44c20fc860d1be9dafcb159f3f960232aa4cde2b Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 9 08:06:21 2017 +0200 pristine-tar data for marionnet_0.90+bzr506.orig.tar.gz --- marionnet_0.90+bzr506.orig.tar.gz.delta | Bin 0 -> 17525 bytes marionnet_0.90+bzr506.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/marionnet_0.90+bzr506.orig.tar.gz.delta b/marionnet_0.90+bzr506.orig.tar.gz.delta new file mode 100644 index 000..bae9fb0 Binary files /dev/null and b/marionnet_0.90+bzr506.orig.tar.gz.delta differ diff --git a/marionnet_0.90+bzr506.orig.tar.gz.id b/marionnet_0.90+bzr506.orig.tar.gz.id new file mode 100644 index 000..43c6d39 --- /dev/null +++ b/marionnet_0.90+bzr506.orig.tar.gz.id @@ -0,0 +1 @@ +928d391872e63008e2f88bdc797af016eb934c46 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 02/03: Update filenames in pristine-tar branch
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch pristine-tar in repository marionnet. commit 4cef325bc664b1595ea3abb686588848d440c1da Author: Lucas Nussbaum <lu...@debian.org> Date: Sat Oct 21 20:06:18 2017 +0200 Update filenames in pristine-tar branch --- ...ar.gz.delta => marionnet_0.90.6+bzr506.orig.tar.gz.delta | Bin ...orig.tar.gz.id => marionnet_0.90.6+bzr506.orig.tar.gz.id | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/marionnet_0.90+bzr506.orig.tar.gz.delta b/marionnet_0.90.6+bzr506.orig.tar.gz.delta similarity index 100% rename from marionnet_0.90+bzr506.orig.tar.gz.delta rename to marionnet_0.90.6+bzr506.orig.tar.gz.delta diff --git a/marionnet_0.90+bzr506.orig.tar.gz.id b/marionnet_0.90.6+bzr506.orig.tar.gz.id similarity index 100% rename from marionnet_0.90+bzr506.orig.tar.gz.id rename to marionnet_0.90.6+bzr506.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 18/19: Stricter dep on camlbricks
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit f540b795ac6a59337059f29731bff51907f588df Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 23:23:33 2017 +0100 Stricter dep on camlbricks --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 7e5d3db..d4344dd 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: camlp4-extra, dh-ocaml (>= 0.9.1), liblablgtk2-ocaml-dev (>= 2.12.0-2), liblablgtksourceview2-ocaml-dev (>= 2.14.2), - libocamlbricks-ocaml-dev (>= 0.90+bzr393~), + libocamlbricks-ocaml-dev (>= 0.90+bzr454~), ocaml-findlib, ocaml-nox (>= 3.12.1) Standards-Version: 4.1.1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 09/19: Update changelog
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit f74be64ce71cca37d57fc60f7cb575c135bff84c Author: Lucas Nussbaum <lu...@debian.org> Date: Sun Oct 22 00:06:58 2017 +0200 Update changelog --- debian/changelog | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cd0488c..539588a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ marionnet (0.90.6+bzr506-1) UNRELEASED; urgency=medium * New upstream snapshot. + * Add stricter dep on ocamlbricks. + * Add symlink to port-helper in $PATH. + * Add xterm to Depends. Closes: #866606 + * Mention Multiarch in README.Debian. Closes: #866607 - -- Lucas Nussbaum <lu...@debian.org> Mon, 09 Oct 2017 08:08:42 +0200 + -- Lucas Nussbaum <lu...@debian.org> Sun, 22 Oct 2017 00:06:46 +0200 marionnet (0.90.6+bzr457-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 06/19: Add symlink to port-helper in $PATH
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit 08334c30c96f6f7211db8ecc82c63743f407bd2c Author: Lucas Nussbaum <lu...@debian.org> Date: Sat Oct 21 19:58:05 2017 +0200 Add symlink to port-helper in $PATH --- debian/rules | 10 ++ 1 file changed, 10 insertions(+) diff --git a/debian/rules b/debian/rules index 1b5be69..316e791 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + %: dh $@ --with ocaml --with systemd @@ -23,6 +25,14 @@ override_dh_auto_install: mv debian/marionnet/usr/sbin/marionnet-daemon.byte debian/marionnet/usr/sbin/marionnet-daemon ;\ mv debian/marionnet/usr/bin/marionnet.byte debian/marionnet/usr/bin/marionnet ; \ fi + # Add symlink in $PATH for port-helper. That's needed because the marionnet kernel + # call it directly + if [ "$(DEB_HOST_ARCH)" = "amd64" ]; then \ + dh_link usr/lib64/uml/port-helper usr/bin/port-helper ; \ + else \ + dh_link usr/lib/uml/port-helper usr/bin/port-helper ; \ + fi + override_dh_auto_clean: dh_auto_clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 03/19: Refresh patches
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository marionnet.
commit 2fac9dcf2ce52cfeb46e851dbca4ccb25a1e7f54
Author: Lucas Nussbaum <lu...@debian.org>
Date: Mon Oct 9 08:08:38 2017 +0200
Refresh patches
---
...Customize-installation-paths-for-Debian-packaging.patch | 14 +-
debian/patches/0003-Tweak-ocamldep-search-path.patch | 8
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git
a/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
b/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
index 012420e..ac7640d 100644
---
a/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
+++
b/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
@@ -9,21 +9,25 @@ Forwarded: not-needed
--- a/CONFIGME
+++ b/CONFIGME
-@@ -34,11 +34,11 @@
-
- # Installation prefix, for example /usr or /usr/local
+@@ -35,7 +35,7 @@
+ # Run-time prefix, where resources will be really installed and available
+ # when the software will be launched. Examples are /usr or /usr/local.
# *No* trailing slash should be included.
-prefix=/usr/local
+prefix=${DESTDIR:-debian/tmp}/usr
+ # Prefix for temporary or final installation; you should probably keep the
+ # default setting, which is ${prefix}. This variable has been introduced to
+@@ -45,7 +45,7 @@ prefix_install=${prefix}
+
# Prefix for host-wide configuration files; you should probably keep the
# default setting:
-configurationprefix=/etc
+configurationprefix=${DESTDIR:-debian/tmp}/etc
- # Prefix for the locale files
+ # Prefix for the locale files (at run-time)
localeprefix=${prefix}/share/locale
-@@ -59,12 +59,12 @@ ocaml_libraryprefix=$(ocamlc -where || e
+@@ -69,12 +69,12 @@ ocaml_libraryprefix=$(ocamlc -where || e
# library or into ${ocaml_libraryprefix}, but you can change it if you
really
# want to install into a different, custom prefix.
# *No* trailing slash should be included.
diff --git a/debian/patches/0003-Tweak-ocamldep-search-path.patch
b/debian/patches/0003-Tweak-ocamldep-search-path.patch
index 24c98a0..ad55c84 100644
--- a/debian/patches/0003-Tweak-ocamldep-search-path.patch
+++ b/debian/patches/0003-Tweak-ocamldep-search-path.patch
@@ -1,11 +1,11 @@
--- a/Makefile.local
+++ b/Makefile.local
-@@ -22,7 +22,7 @@ DIRECTORIES_TO_INCLUDE = camlp4 threads
- LIBRARIES_TO_LINK = unix threads str lablgtk lablglade lablgtksourceview2
ocamlbricks
+@@ -24,7 +24,7 @@ LIBRARIES_TO_LINK = unix threads str lab
C_OBJECTS_TO_LINK +=
+ EXCLUDE_FROM_SOURCE_FINDING=uml
-OCAMLBRICKS=$(LIBRARYPREFIX)/ocamlbricks
+OCAMLBRICKS=$(OCAML_LIBRARYPREFIX)/ocamlbricks
- PP_OPTION = camlp4of -I $(OCAMLBRICKS) gettext_extract_pot_p4.cmo
option_extract_p4.cmo raise_p4.cmo log_module_loading_p4.cmo -I chip
- OBJECTS_TO_LINK = gtkThread
+ # Transmit the information about the compiler version in order to activate
conditional compilation:
+ # Empty for OCaml 3.x.y series, set to "-DOCAML4_02_OR_LATER" for 4.02.y or
later:
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git
___
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] [marionnet] 14/19: Remove duplicate license in debian/copyright
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit eba60268635d874617530925934dea9fe58ced2e Author: Lucas Nussbaum <lu...@debian.org> Date: Sun Oct 22 00:14:31 2017 +0200 Remove duplicate license in debian/copyright --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 21c6aed..3c4516e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -72,7 +72,7 @@ License: public-domain Files: share/images/treeview-icons/* Copyright: made by Luca Saiu, but public domain -License: public-domain +License: public-domain2 Images in this directory were made by Luca Saiu with the GIMP. The author releases them into the public domain. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] annotated tag upstream/0.90.6+bzr508 created (now 8acb802)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to annotated tag upstream/0.90.6+bzr508 in repository marionnet. at 8acb802 (tag) tagging 154c694f87471033312d5a628a004e25139954bd (commit) replaces upstream/0.90+bzr506 tagged by Lucas Nussbaum on Mon Oct 30 23:21:10 2017 +0100 - Log - Upstream version 0.90.6+bzr508 Lucas Nussbaum (1): New upstream version 0.90.6+bzr508 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 02/19: Merge tag 'upstream/0.90+bzr506'
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit 48b9e2ae6d801cdeaacd022c4c6deb51c551a190 Merge: c9ea72a 2416155 Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 9 08:06:21 2017 +0200 Merge tag 'upstream/0.90+bzr506' Upstream version 0.90+bzr506 CONFIGME | 18 +- Makefile | 115 +- Makefile.local | 30 +- cable.ml | 50 +- chip/chip.ml | 820 chip/chip.mli | 515 --- chip/chip_example.ml | 126 - chip/chip_parser_p4.ml | 421 -- chip/chip_parser_p4.old_version.ml | 529 --- chip/wGButton.ml | 91 - cloud.ml |5 +- compatibility/forest_backward_compatibility.ml | 16 + configuration.ml |7 + configuration.mli |8 + cow_files.ml |2 +- daemon_client.ml | 50 +- daemon_language.ml | 147 +- descendants_monitor.ml |2 +- disk.ml| 63 +- disk.mli | 17 +- gettext.ml |9 +- global_options.ml | 38 +- gui/gui_bricks.ml | 487 ++- gui/gui_bricks.mli | 122 +- gui/gui_dialog_A_PROPOS.ml |2 +- gui/gui_dialog_toolkit.ml |2 +- gui/gui_menubar_MARIONNET.ml | 55 +- gui/gui_source_editing.ml | 21 +- gui/gui_toolbar_COMPONENTS_layouts.ml |2 +- gui/gui_toolbar_DOT_TUNING.ml | 23 +- gui/ledgrid.ml |4 +- gui/ledgrid_manager.ml |5 +- gui/menu_factory.ml|2 +- gui/menu_factory.mli |4 +- gui/simple_dialogs.ml | 25 +- gui/talking.ml | 211 +- gui/talking.mli| 100 +- hub.ml |3 + initialization.ml | 16 +- machine.ml | 228 +- marionnet-daemon.ml| 371 +- marionnet.ml | 47 +- meta.ml.released | 12 +- motherboard.ml | 11 - motherboard_builder.ml | 300 +- motherboard_builder.mli|3 +- po/messages.pot| 532 ++- router.ml | 791 +++- scripts/marionnet_telnet.sh| 129 + serial.ml |8 +- share/images/README|9 + share/images/ico.cable-serial-left-right.large.png | Bin 2680 -> 2680 bytes share/images/ico.cable-serial-left-right.small.png | Bin 979 -> 979 bytes share/images/ico.cable-serial.small.png| Bin 4903 -> 4903 bytes share/images/ico.cable-serial.xxl.png | Bin 19983 -> 19983 bytes share/images/ico.dado-no.24.png| Bin 1744 -> 1744 bytes share/images/ico.dado.24.png | Bin 1567 -> 1567 bytes share/images/ico.diffuser.orig.png | Bin 2744 -> 2744 bytes share/images/ico.hardware-gray.small.png | Bin 3186 -> 3186 bytes share/images/ico.resource-2.med.png| Bin 8111 -> 8111 bytes share/images/ico.script-analyse-3.med.png | Bin 5093 -> 5093 bytes share/images/ico.script-finish.med.png | Bin 5625 -> 5625 bytes share/images/ico.script-start-2.med.png| Bin 6798 -> 6798 bytes share/images/ico.snapshot.42x42.png| Bin 0 -> 2828 bytes share/images/ico.snapshot.svg | 4531 share/images/ico.software-gray.small.png | Bin 3126 -> 3126 bytes share/images/ico.uml-gray.small.png| Bin 2192 -> 2192 bytes share/images/ico.xml-16.inv.png| Bin 702 -> 702 bytes share/images/launcher-icons/marionnet-launcher.png | Bin 5414 -> 5414 bytes share/images/
[Pkg-ocaml-maint-commits] [marionnet] 04/19: Initialize changelog
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit ee72574890ab0d58c65552c5098065256d85ff77 Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 9 08:08:59 2017 +0200 Initialize changelog --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4516bdb..cd0488c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +marionnet (0.90.6+bzr506-1) UNRELEASED; urgency=medium + + * New upstream snapshot. + + -- Lucas Nussbaum <lu...@debian.org> Mon, 09 Oct 2017 08:08:42 +0200 + marionnet (0.90.6+bzr457-1) unstable; urgency=medium * New upstream snapshot. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 03/03: pristine-tar data for marionnet_0.90.6+bzr508.orig.tar.gz
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch pristine-tar in repository marionnet. commit 9feb47a1c55cb76268a7f5db3c221907454d7630 Author: Lucas Nussbaum <lu...@debian.org> Date: Mon Oct 30 23:21:10 2017 +0100 pristine-tar data for marionnet_0.90.6+bzr508.orig.tar.gz --- marionnet_0.90.6+bzr508.orig.tar.gz.delta | Bin 0 -> 17391 bytes marionnet_0.90.6+bzr508.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/marionnet_0.90.6+bzr508.orig.tar.gz.delta b/marionnet_0.90.6+bzr508.orig.tar.gz.delta new file mode 100644 index 000..644e024 Binary files /dev/null and b/marionnet_0.90.6+bzr508.orig.tar.gz.delta differ diff --git a/marionnet_0.90.6+bzr508.orig.tar.gz.id b/marionnet_0.90.6+bzr508.orig.tar.gz.id new file mode 100644 index 000..f96d010 --- /dev/null +++ b/marionnet_0.90.6+bzr508.orig.tar.gz.id @@ -0,0 +1 @@ +7d69f615cd2e548f629c78da617f41163686c2b9 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 13/19: Bump Standards-version to 4.1.1. No changes needed.
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit 64e3f05e1d9e95305e9a51ab4d767d66856c66a5 Author: Lucas Nussbaum <lu...@debian.org> Date: Sun Oct 22 00:13:25 2017 +0200 Bump Standards-version to 4.1.1. No changes needed. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 7b10f95..ef274c3 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9.20160709), liblablgtk2-ocaml-dev (>= 2.12.0-2), libocamlbricks-ocaml-dev (>= 0.90+bzr393~), liblablgtksourceview2-ocaml-dev (>= 2.14.2) -Standards-Version: 3.9.4 +Standards-Version: 4.1.1 Homepage: http://www.marionnet.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/marionnet.git Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/marionnet.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 08/19: Mention Multiarch in README.Debian. Closes: #866607
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit 91d3674f31659325c4f8027df5e25ebd7b82eace Author: Lucas Nussbaum <lu...@debian.org> Date: Sun Oct 22 00:05:53 2017 +0200 Mention Multiarch in README.Debian. Closes: #866607 --- debian/README.Debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/README.Debian b/debian/README.Debian index b5e0238..0f9661d 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -17,7 +17,7 @@ You can: The kernel images provided via marionnet_from_scratch are built for an i386 system. You can run them on an amd64 system, provided that -you have an i386 libc installed. +you have an i386 libc installed via Multiarch. To install the i386 libc on an amd64 system, as root, run: dpkg --add-architecture i386 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [ocamlbricks] 01/03: Imported Upstream version 0.90+bzr400
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository ocamlbricks.
commit ddf9ed1c93759a6785bc7839d6d1f88e91511244
Author: Lucas Nussbaum lu...@debian.org
Date: Tue Jul 8 11:09:31 2014 +0200
Imported Upstream version 0.90+bzr400
---
EXTRA/arrayExtra.ml | 12
EXTRA/arrayExtra.mli | 2 ++
EXTRA/listExtra.ml| 17 +++
EXTRA/listExtra.mli | 2 ++
EXTRA/stringExtra.ml | 19 +---
EXTRA/stringExtra.mli | 4 +++
EXTRA/unixExtra.ml| 13
EXTRA/unixExtra.mli | 9 ++
SHELL/linux.ml| 48 +++--
SHELL/linux.mli | 8 ++---
STRUCTURES/cortex.ml | 36 +-
STRUCTURES/cortex.mli | 8 +
STRUCTURES/cortex_lib.ml | 77 +++
STRUCTURES/cortex_lib.mli | 24 +++
STRUCTURES/endpoint.mli | 12
meta.ml.released | 10 +++---
16 files changed, 258 insertions(+), 43 deletions(-)
diff --git a/EXTRA/arrayExtra.ml b/EXTRA/arrayExtra.ml
index 05b48cb..16c42b7 100644
--- a/EXTRA/arrayExtra.ml
+++ b/EXTRA/arrayExtra.ml
@@ -368,6 +368,10 @@ let partitioni =
let result = Array.map (fun l - Array.of_list (List.rev l)) ls in
result
+let amass ~size =
+ if size = 0 then invalid_arg ArrayExtra.amass: size must be greater than
zero else
+ partitioni (fun i x - i/size)
+
(** {b Example}:
{[
# cut [1;2;3;0;2] [|0;1;2;3;4;5;6;7;8;9|];;
@@ -383,6 +387,14 @@ let cut ~lengths xs =
List.map (fun (start, len) - Array.sub xs start len) start_len_list
with Invalid_argument Array.sub - invalid_arg ArrayExtra.cut
+(** As standard [Array.sub] but with optional length (if not provided, the
length is defined
+in order to take the rest of the list after the given position) *)
+let sub ?len xs pos =
+ let len = match len with
+ | None - (Array.length xs) - pos
+ | Some n - n
+ in
+ Array.sub xs pos len
(** Tools for matrices (arrays of arrays). *)
module Matrix = struct
diff --git a/EXTRA/arrayExtra.mli b/EXTRA/arrayExtra.mli
index 9c05f33..579125c 100644
--- a/EXTRA/arrayExtra.mli
+++ b/EXTRA/arrayExtra.mli
@@ -19,6 +19,8 @@
val of_known_length_list : ?reversing:bool - int - 'a list - 'a array
val partition : ?min_size:int - ('a - int) - 'a array - 'a array array
val partitioni : ?min_size:int - (int - 'a - int) - 'a array - 'a array
array
+val amass : size:int - 'a array - 'a array array
+val sub: ?len:int - 'a array - int - 'a array
val int_seq : min:int - max:int - incr:int - int array
val float_seq : min:float - max:float - incr:float - float array
diff --git a/EXTRA/listExtra.ml b/EXTRA/listExtra.ml
index 415cb31..2650fed 100644
--- a/EXTRA/listExtra.ml
+++ b/EXTRA/listExtra.ml
@@ -221,6 +221,23 @@ let remove_duplicates ?(take_first=true) =
;;
(** {b Example}:
+{[# let xs = ['a';'b';'c';'d';'e';'f';'g';'h';'i';'j'] ;;
+#ListExtra.amass 3 xs ;;
+ : char list list = [['a'; 'b'; 'c']; ['d'; 'e'; 'f']; ['g'; 'h'; 'i']; ['j']]
+# xs = List.concat (ListExtra.amass 3 xs) ;;
+ : bool = true ]}*)
+let amass ~size xs =
+ if size = 0 then invalid_arg ListExtra.amass: size must be greater than
zero else
+ let rec loop i acc1 acc2 xs =
+if isize then loop 1 [] ((List.rev acc1)::acc2) xs else
+match xs with
+| []- if acc1=[] then acc2 else (List.rev acc1)::acc2
+| x::xs - loop (i+1) (x::acc1) acc2 xs
+ in
+ List.rev (loop 1 [] [] xs)
+
+
+(** {b Example}:
{[# int_seq 3 10 2 ;;
: int list = [3; 5; 7; 9]
]}*)
diff --git a/EXTRA/listExtra.mli b/EXTRA/listExtra.mli
index ca3b384..1c3bf25 100644
--- a/EXTRA/listExtra.mli
+++ b/EXTRA/listExtra.mli
@@ -119,6 +119,8 @@ val intersection : 'a list - 'a list - 'a list
val uniq : 'a list - 'a list
val remove_duplicates : ?take_first:bool - 'a list - 'a list
+val amass: size:int - 'a list - 'a list list
+
(** {2 Indexes} *)
val int_seq : min:int - max:int - incr:int - int list
diff --git a/EXTRA/stringExtra.ml b/EXTRA/stringExtra.ml
index eb925ef..efd2823 100644
--- a/EXTRA/stringExtra.ml
+++ b/EXTRA/stringExtra.ml
@@ -516,6 +516,9 @@ let concat ?(blit:blit_function=String.blit) xs =
(fun k src - let l=(String.length src) in (blit src 0 dst k l); (k+l)) 0
xs in
dst
+(** Remove all occurrences of a character from a string. *)
+let rm d s = concat (split ~d s) ;;
+
(** Quote a string using a prefix [l] (by default [l=']) and a suffix [r]
(by default [r=']). *)
let quote ?(l=') ?(r=') (x:string) = String.concat [l;x;r]
@@ -524,7 +527,7 @@ let quote ?(l=') ?(r=') (x:string) = String.concat
[l;x;r]
let assemble_if_not_empty ~prefix ~suffix x =
if (x=) then else (String.concat [prefix;x;suffix])
-(** [merge_map f l] maps the function [f] on the list [l]
+(** [map_concat f l] maps the function [f] on the list [l]
then merge the result with the separator
[Pkg-ocaml-maint-commits] [ocamlbricks] annotated tag upstream/0.90+bzr400 created (now 7179504)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to annotated tag upstream/0.90+bzr400 in repository ocamlbricks. at 7179504 (tag) tagging ddf9ed1c93759a6785bc7839d6d1f88e91511244 (commit) replaces upstream/0.90+bzr393 tagged by Lucas Nussbaum on Tue Jul 8 11:09:32 2014 +0200 - Log - Upstream version 0.90+bzr400 Lucas Nussbaum (1): Imported Upstream version 0.90+bzr400 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 01/01: pristine-tar data for ocamlbricks_0.90+bzr400.orig.tar.gz
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch pristine-tar in repository ocamlbricks. commit 8b5a1582c863bf0cd6e1c7257b1b608dad70f1d7 Author: Lucas Nussbaum lu...@debian.org Date: Tue Jul 8 11:09:32 2014 +0200 pristine-tar data for ocamlbricks_0.90+bzr400.orig.tar.gz --- ocamlbricks_0.90+bzr400.orig.tar.gz.delta | Bin 0 - 6218 bytes ocamlbricks_0.90+bzr400.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/ocamlbricks_0.90+bzr400.orig.tar.gz.delta b/ocamlbricks_0.90+bzr400.orig.tar.gz.delta new file mode 100644 index 000..22009d1 Binary files /dev/null and b/ocamlbricks_0.90+bzr400.orig.tar.gz.delta differ diff --git a/ocamlbricks_0.90+bzr400.orig.tar.gz.id b/ocamlbricks_0.90+bzr400.orig.tar.gz.id new file mode 100644 index 000..90d138b --- /dev/null +++ b/ocamlbricks_0.90+bzr400.orig.tar.gz.id @@ -0,0 +1 @@ +ffc0160842bd4477ed190723dd85996bd14ed9b4 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] branch pristine-tar updated (239c3f9 - 8b5a158)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch pristine-tar in repository ocamlbricks. from 239c3f9 pristine-tar data for ocamlbricks_0.90+bzr393.orig.tar.gz new 8b5a158 pristine-tar data for ocamlbricks_0.90+bzr400.orig.tar.gz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: ocamlbricks_0.90+bzr400.orig.tar.gz.delta | Bin 0 - 6218 bytes ocamlbricks_0.90+bzr400.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 ocamlbricks_0.90+bzr400.orig.tar.gz.delta create mode 100644 ocamlbricks_0.90+bzr400.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] branch upstream updated (ab0af1d - ddf9ed1)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch upstream in repository ocamlbricks. from ab0af1d Imported Upstream version 0.90+bzr393 new ddf9ed1 Imported Upstream version 0.90+bzr400 The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: EXTRA/arrayExtra.ml | 12 EXTRA/arrayExtra.mli | 2 ++ EXTRA/listExtra.ml| 17 +++ EXTRA/listExtra.mli | 2 ++ EXTRA/stringExtra.ml | 19 +--- EXTRA/stringExtra.mli | 4 +++ EXTRA/unixExtra.ml| 13 EXTRA/unixExtra.mli | 9 ++ SHELL/linux.ml| 48 +++-- SHELL/linux.mli | 8 ++--- STRUCTURES/cortex.ml | 36 +- STRUCTURES/cortex.mli | 8 + STRUCTURES/cortex_lib.ml | 77 +++ STRUCTURES/cortex_lib.mli | 24 +++ STRUCTURES/endpoint.mli | 12 meta.ml.released | 10 +++--- 16 files changed, 258 insertions(+), 43 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 02/03: Merge tag 'upstream/0.90+bzr400'
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit c6a7e2ea622139a1a4fbc594068fdf53eeda04b6 Merge: e94d1e2 ddf9ed1 Author: Lucas Nussbaum lu...@debian.org Date: Tue Jul 8 11:09:32 2014 +0200 Merge tag 'upstream/0.90+bzr400' Upstream version 0.90+bzr400 EXTRA/arrayExtra.ml | 12 EXTRA/arrayExtra.mli | 2 ++ EXTRA/listExtra.ml| 17 +++ EXTRA/listExtra.mli | 2 ++ EXTRA/stringExtra.ml | 19 +--- EXTRA/stringExtra.mli | 4 +++ EXTRA/unixExtra.ml| 13 EXTRA/unixExtra.mli | 9 ++ SHELL/linux.ml| 48 +++-- SHELL/linux.mli | 8 ++--- STRUCTURES/cortex.ml | 36 +- STRUCTURES/cortex.mli | 8 + STRUCTURES/cortex_lib.ml | 77 +++ STRUCTURES/cortex_lib.mli | 24 +++ STRUCTURES/endpoint.mli | 12 meta.ml.released | 10 +++--- 16 files changed, 258 insertions(+), 43 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] branch master updated (e94d1e2 - 555d2b3)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch master in repository ocamlbricks. from e94d1e2 Update changelog for upload new ddf9ed1 Imported Upstream version 0.90+bzr400 new c6a7e2e Merge tag 'upstream/0.90+bzr400' new 555d2b3 New upstream snapshot The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: EXTRA/arrayExtra.ml | 12 EXTRA/arrayExtra.mli | 2 ++ EXTRA/listExtra.ml| 17 +++ EXTRA/listExtra.mli | 2 ++ EXTRA/stringExtra.ml | 19 +--- EXTRA/stringExtra.mli | 4 +++ EXTRA/unixExtra.ml| 13 EXTRA/unixExtra.mli | 9 ++ SHELL/linux.ml| 48 +++-- SHELL/linux.mli | 8 ++--- STRUCTURES/cortex.ml | 36 +- STRUCTURES/cortex.mli | 8 + STRUCTURES/cortex_lib.ml | 77 +++ STRUCTURES/cortex_lib.mli | 24 +++ STRUCTURES/endpoint.mli | 12 debian/changelog | 6 meta.ml.released | 10 +++--- 17 files changed, 264 insertions(+), 43 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] annotated tag debian/0.90+bzr400-1 created (now 1cdb355)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to annotated tag debian/0.90+bzr400-1 in repository ocamlbricks. at 1cdb355 (tag) tagging 555d2b3d305760a1e96953f97d1302959351ad58 (commit) replaces debian/0.90+bzr393-1 tagged by Lucas Nussbaum on Tue Jul 8 11:50:25 2014 +0200 - Log - ocamlbricks Debian release 0.90+bzr400-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIVAwUAU7u+4TkUtTL0376ZAQpX0Q//apaMIqPuIEOz8bUCzZTcSV3CXJ5YA+lE Cutglj1YGvVUuDI8QV0NPX2xiYSVAeJPCz+eBoLZcL7Q5pXHXFG0OaGMifzLYLIA Jtg702FEWTIQVjQNhR8HzOpmKG5D4L1ZsUppdGfMa9eqnjysL2W+h7wLBr2ZzqIj UoHqowiUxxR2pyM9tlSZkmRbE/AtQOHNWG9kHk8ywSnLO5eJs+l9tjXJ10HZBRR5 KZ6aRHN1EkiHbj4VOlj/pDmjZQH9fSUIwporgAUE/cruv/+ye0FNIRhSxJEvSSP3 R6FT/2mS+u/VHvkAIBZqDwyru9kx1iAa3KWUSB5n1j0h3sSkJ8kCIYhlNejP/YeU yBTbTOFiY7BXQaBrJAxOW646UO6amwSSxPoFZ8JnkNyooVDlnFatcgcHnCdRvJMB b0fedgyMRd9uuAJ1qOmMNbxdkUmfWkNaq7+wrNrG/mBYMz5ow+y0LQQojF5uSxj8 wd6za9UK3/JPgvM2xyphjX5oPgU69mL/uXLdszlISBSYs2iEAM9+w3tbUk5JU/49 pZaytjZAox3Jy9TekTDmYBHhY93paWlNAxsKUdMOrDbiDE9AEy03y/RpV1a2r0BP LLOjM6fVqOJggWd1X5ncSxRNy6jcd0hLow0YqSGt83N971gVD9whZHLLpyeGa2ab oNOfMHsacKg= =dyPS -END PGP SIGNATURE- Lucas Nussbaum (3): Imported Upstream version 0.90+bzr400 Merge tag 'upstream/0.90+bzr400' New upstream snapshot --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 03/03: New upstream snapshot
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit 555d2b3d305760a1e96953f97d1302959351ad58 Author: Lucas Nussbaum lu...@debian.org Date: Tue Jul 8 11:11:28 2014 +0200 New upstream snapshot --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 454c1d6..760b35f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocamlbricks (0.90+bzr400-1) unstable; urgency=medium + + * New upstream snapshot. + + -- Lucas Nussbaum lu...@debian.org Tue, 08 Jul 2014 11:09:39 +0200 + ocamlbricks (0.90+bzr393-1) unstable; urgency=medium * New upstream snapshot. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [marionnet] 01/04: Merge branch 'upstream'
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit df19d3ba9a68a1e42f0f59579d4296e516343bdd Merge: 7cfc044 a90acff Author: Lucas Nussbaum lu...@debian.org Date: Tue Jul 8 11:31:55 2014 +0200 Merge branch 'upstream' -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] branch upstream updated (a90acff - f92c89b)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch upstream in repository marionnet. from a90acff Imported Upstream version 0.90.6+bzr448 new f92c89b Imported Upstream version 0.90.6+bzr457 The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: configuration.ml |1 + descendants_monitor.ml |2 +- gui/gui_bricks.ml | 35 + gui/gui_bricks.mli |8 + initialization.ml | 16 +- meta.ml.released | 10 +- po/messages.pot| 80 +- router.ml | 100 +- share/marionnet.conf |1 + simulation_level.ml| 10 +- uml/guest/bashrc | 16 +- uml/guest/marionnet-relay | 34 +- uml/pupisto.buildroot/Makefile |6 +- uml/pupisto.buildroot/README.buildroot | 23 +- uml/pupisto.buildroot/pupisto.buildroot.sh | 40 +- .../pupisto.buildroot.sh.files/nanorc | 2534 uml/pupisto.common/toolkit_chroot.sh | 76 +- uml/pupisto.common/toolkit_config_files.sh |6 +- uml/pupisto.debian/Makefile|8 +- uml/pupisto.debian/pupisto.debian.sh | 129 +- uml/pupisto.kernel/pupisto.kernel.sh |2 +- useful-scripts/marionnet_from_scratch | 14 +- x.ml | 38 +- x.mli |7 +- 24 files changed, 3009 insertions(+), 187 deletions(-) create mode 100644 uml/pupisto.buildroot/pupisto.buildroot.sh.files/nanorc -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] annotated tag upstream/0.90.6+bzr457 created (now cd767cd)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to annotated tag upstream/0.90.6+bzr457 in repository marionnet. at cd767cd (tag) tagging f92c89b708d81f772cb8581b21ab8d8478f464c3 (commit) replaces upstream/0.90.6+bzr448 tagged by Lucas Nussbaum on Tue Jul 8 11:32:20 2014 +0200 - Log - Upstream version 0.90.6+bzr457 Lucas Nussbaum (1): Imported Upstream version 0.90.6+bzr457 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 03/04: Merge tag 'upstream/0.90.6+bzr457'
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit d017dea0c4f2d96244baa58551b0731da35f42da Merge: df19d3b f92c89b Author: Lucas Nussbaum lu...@debian.org Date: Tue Jul 8 11:32:20 2014 +0200 Merge tag 'upstream/0.90.6+bzr457' Upstream version 0.90.6+bzr457 configuration.ml |1 + descendants_monitor.ml |2 +- gui/gui_bricks.ml | 35 + gui/gui_bricks.mli |8 + initialization.ml | 16 +- meta.ml.released | 10 +- po/messages.pot| 80 +- router.ml | 100 +- share/marionnet.conf |1 + simulation_level.ml| 10 +- uml/guest/bashrc | 16 +- uml/guest/marionnet-relay | 34 +- uml/pupisto.buildroot/Makefile |6 +- uml/pupisto.buildroot/README.buildroot | 23 +- uml/pupisto.buildroot/pupisto.buildroot.sh | 40 +- .../pupisto.buildroot.sh.files/nanorc | 2534 uml/pupisto.common/toolkit_chroot.sh | 76 +- uml/pupisto.common/toolkit_config_files.sh |6 +- uml/pupisto.debian/Makefile|8 +- uml/pupisto.debian/pupisto.debian.sh | 129 +- uml/pupisto.kernel/pupisto.kernel.sh |2 +- useful-scripts/marionnet_from_scratch | 14 +- x.ml | 38 +- x.mli |7 +- 24 files changed, 3009 insertions(+), 187 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 04/04: Update changelog post-merge.
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit 4852d2525bcb1da9e585146facc043d64f541169 Author: Lucas Nussbaum lu...@debian.org Date: Tue Jul 8 11:35:41 2014 +0200 Update changelog post-merge. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 72d988c..4516bdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +marionnet (0.90.6+bzr457-1) unstable; urgency=medium + + * New upstream snapshot. + + -- Lucas Nussbaum lu...@debian.org Tue, 08 Jul 2014 11:32:38 +0200 + marionnet (0.90.6+bzr448-1) unstable; urgency=medium * New upstream snapshot. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 01/01: pristine-tar data for marionnet_0.90.6+bzr457.orig.tar.gz
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch pristine-tar in repository marionnet. commit cbf37bed31e837d89acc68a26f2305e1d7af2dac Author: Lucas Nussbaum lu...@debian.org Date: Tue Jul 8 11:32:20 2014 +0200 pristine-tar data for marionnet_0.90.6+bzr457.orig.tar.gz --- marionnet_0.90.6+bzr457.orig.tar.gz.delta | Bin 0 - 18310 bytes marionnet_0.90.6+bzr457.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/marionnet_0.90.6+bzr457.orig.tar.gz.delta b/marionnet_0.90.6+bzr457.orig.tar.gz.delta new file mode 100644 index 000..dccbf39 Binary files /dev/null and b/marionnet_0.90.6+bzr457.orig.tar.gz.delta differ diff --git a/marionnet_0.90.6+bzr457.orig.tar.gz.id b/marionnet_0.90.6+bzr457.orig.tar.gz.id new file mode 100644 index 000..1f3361d --- /dev/null +++ b/marionnet_0.90.6+bzr457.orig.tar.gz.id @@ -0,0 +1 @@ +e0bf2eb98c6c75e579c1218010580d2c5a77112b -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] branch master updated (7cfc044 - 4852d25)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch master in repository marionnet. from 7cfc044 Add simple script to install testing images adds a90acff Imported Upstream version 0.90.6+bzr448 new df19d3b Merge branch 'upstream' new f92c89b Imported Upstream version 0.90.6+bzr457 new d017dea Merge tag 'upstream/0.90.6+bzr457' new 4852d25 Update changelog post-merge. The 4 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: configuration.ml |1 + debian/changelog |6 + descendants_monitor.ml |2 +- gui/gui_bricks.ml | 35 + gui/gui_bricks.mli |8 + initialization.ml | 16 +- meta.ml.released | 10 +- po/messages.pot| 80 +- router.ml | 100 +- share/marionnet.conf |1 + simulation_level.ml| 10 +- uml/guest/bashrc | 16 +- uml/guest/marionnet-relay | 34 +- uml/pupisto.buildroot/Makefile |6 +- uml/pupisto.buildroot/README.buildroot | 23 +- uml/pupisto.buildroot/pupisto.buildroot.sh | 40 +- .../pupisto.buildroot.sh.files/nanorc | 2534 uml/pupisto.common/toolkit_chroot.sh | 76 +- uml/pupisto.common/toolkit_config_files.sh |6 +- uml/pupisto.debian/Makefile|8 +- uml/pupisto.debian/pupisto.debian.sh | 129 +- uml/pupisto.kernel/pupisto.kernel.sh |2 +- useful-scripts/marionnet_from_scratch | 14 +- x.ml | 38 +- x.mli |7 +- 25 files changed, 3015 insertions(+), 187 deletions(-) create mode 100644 uml/pupisto.buildroot/pupisto.buildroot.sh.files/nanorc -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] branch pristine-tar updated (9fbed95 - cbf37be)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch pristine-tar in repository marionnet. from 9fbed95 pristine-tar data for marionnet_0.90.6+bzr448.orig.tar.gz new cbf37be pristine-tar data for marionnet_0.90.6+bzr457.orig.tar.gz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: marionnet_0.90.6+bzr457.orig.tar.gz.delta | Bin 0 - 18310 bytes marionnet_0.90.6+bzr457.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 marionnet_0.90.6+bzr457.orig.tar.gz.delta create mode 100644 marionnet_0.90.6+bzr457.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] branch upstream updated (45ce798 - a90acff)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch upstream in repository marionnet. from 45ce798 Imported Upstream version 0.90.6+bzr434 new a90acff Imported Upstream version 0.90.6+bzr448 The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: CONFIGME | 13 +- Makefile | 110 ++--- Makefile.local | 27 +- cable.ml | 26 +- cloud.ml | 12 +- cow_files.ml | 2 +- daemon_client.ml | 45 +- daemon_language.ml | 13 +- death_monitor.ml | 44 +- descendants_monitor.ml | 54 +++ descendants_monitor.mli| 25 + disk.ml| 59 ++- disk.mli | 5 +- gettext.ml | 8 +- gui/gui_menubar_MARIONNET.ml | 7 +- gui/ledgrid_manager.ml | 59 ++- gui/menu_factory.ml| 4 +- hub.ml | 16 +- initialization.ml | 16 +- log.ml | 63 +-- machine.ml | 48 +- marionnet-daemon.ml| 122 ++--- marionnet.ml | 114 - meta.ml.released | 10 +- motherboard_builder.ml | 4 +- po/messages.pot| 153 --- progress_bar.ml| 1 - router.ml | 66 +-- .../filesystems/machine-debian-lenny-sid-2008.conf | 2 +- share/filesystems/machine-mandriva20100215.conf| 2 +- share/filesystems/machine-pinocchio-14787.conf | 2 +- share/filesystems/machine-template.conf| 2 +- share/filesystems/router-pinocchio-09157.conf | 2 +- signals.ml | 177 simulation_level.ml| 501 +++-- simulation_level.mli | 22 +- state.ml | 58 ++- switch.ml | 38 +- task_runner.ml | 18 +- treeview.ml| 37 +- treeview_defects.ml| 2 +- treeview_documents.ml | 4 +- treeview_history.ml| 4 +- treeview_ifconfig.ml | 157 --- uml/guest/marionnet-relay | 48 +- uml/pupisto.buildroot/Makefile | 2 +- uml/pupisto.buildroot/pupisto.buildroot.sh | 46 +- uml/pupisto.debian/pupisto.debian.sh | 13 +- uml/pupisto.kernel/pupisto.kernel.sh | 3 + useful-scripts/marionnet_from_scratch | 83 +++- user_level.ml | 189 version.mli| 2 + world_bridge.ml| 14 +- world_gateway.ml | 12 +- x.ml | 18 +- xforest.ml | 4 +- 56 files changed, 1296 insertions(+), 1292 deletions(-) create mode 100644 descendants_monitor.ml create mode 100644 descendants_monitor.mli delete mode 100644 signals.ml create mode 100644 version.mli -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] annotated tag upstream/0.90.6+bzr448 created (now 4e45061)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to annotated tag upstream/0.90.6+bzr448 in repository marionnet. at 4e45061 (tag) tagging a90acff0f3cb4855fa1c94c07fe4880ec9d10e6a (commit) replaces upstream/0.90.6+bzr434 tagged by Lucas Nussbaum on Wed Apr 2 16:59:04 2014 +0200 - Log - Upstream version 0.90.6+bzr448 Lucas Nussbaum (1): Imported Upstream version 0.90.6+bzr448 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 01/01: pristine-tar data for marionnet_0.90.6+bzr448.orig.tar.gz
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch pristine-tar in repository marionnet. commit 9fbed95036cf778a39942a081e256ab08ec95318 Author: Lucas Nussbaum lu...@debian.org Date: Wed Apr 2 16:59:04 2014 +0200 pristine-tar data for marionnet_0.90.6+bzr448.orig.tar.gz --- marionnet_0.90.6+bzr448.orig.tar.gz.delta | Bin 0 - 18107 bytes marionnet_0.90.6+bzr448.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/marionnet_0.90.6+bzr448.orig.tar.gz.delta b/marionnet_0.90.6+bzr448.orig.tar.gz.delta new file mode 100644 index 000..0f67c56 Binary files /dev/null and b/marionnet_0.90.6+bzr448.orig.tar.gz.delta differ diff --git a/marionnet_0.90.6+bzr448.orig.tar.gz.id b/marionnet_0.90.6+bzr448.orig.tar.gz.id new file mode 100644 index 000..3ad31f1 --- /dev/null +++ b/marionnet_0.90.6+bzr448.orig.tar.gz.id @@ -0,0 +1 @@ +7459d3d316b9462cc208e99f09a31f571b006422 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 03/07: Refresh patches
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository marionnet.
commit 50670d025ee6eea00afaeb49fc5cc15c1ef57406
Author: Lucas Nussbaum lu...@debian.org
Date: Wed Apr 2 17:03:19 2014 +0200
Refresh patches
---
...e-installation-paths-for-Debian-packaging.patch | 22 ++
...file-installation-paths-in-marionnet.conf.patch | 2 --
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git
a/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
b/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
index d835508..012420e 100644
---
a/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
+++
b/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
@@ -7,8 +7,6 @@ Forwarded: not-needed
CONFIGME | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/CONFIGME b/CONFIGME
-index 4513612..4d9c92c 100644
--- a/CONFIGME
+++ b/CONFIGME
@@ -34,11 +34,11 @@
@@ -25,12 +23,20 @@ index 4513612..4d9c92c 100644
# Prefix for the locale files
localeprefix=${prefix}/share/locale
-@@ -58,7 +58,7 @@ ocaml_libraryprefix=$(ocamlc -where || exit -1)
- # By default they will be installed into ${ocaml_libraryprefix}, but you
- # can change it if you really want to install into a different, custom prefix.
+@@ -59,12 +59,12 @@ ocaml_libraryprefix=$(ocamlc -where || e
+ # library or into ${ocaml_libraryprefix}, but you can change it if you
really
+ # want to install into a different, custom prefix.
# *No* trailing slash should be included.
--libraryprefix=${ocaml_libraryprefix}
-+libraryprefix=${prefix}/${ocaml_libraryprefix}
+-libraryprefix=$(which 1/dev/null ocamlfind ocamlfind query lablgtk2)
+-libraryprefix=${libraryprefix%/lablgtk2}
+-libraryprefix=${libraryprefix:-$ocaml_libraryprefix}
++#libraryprefix=/$(which 1/dev/null ocamlfind ocamlfind query lablgtk2)
++#libraryprefix=/${libraryprefix%/lablgtk2}
++#libraryprefix=/${libraryprefix:-$ocaml_libraryprefix}
#
# This definition may be appropriate for debian packaging:
- #libraryprefix=debian/tmp/${ocaml_libraryprefix}
+-#libraryprefix=debian/tmp/${ocaml_libraryprefix}
++libraryprefix=${prefix}/${ocaml_libraryprefix}
+
+ # This should be defined as the absolute path to a directory containing
+ # the already configured OCaml source; in alternative, is your GNU/Linux
diff --git
a/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
b/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
index 5e6138a..a4ebcf1 100644
--- a/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
+++ b/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
@@ -7,8 +7,6 @@ Forwarded: not-needed
etc/marionnet.conf | 8
1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/etc/marionnet.conf b/etc/marionnet.conf
-index 8eda75e..b7c0197 100644
--- a/etc/marionnet.conf
+++ b/etc/marionnet.conf
@@ -64,10 +64,10 @@ MARIONNET_VDE_PREFIX=
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git
___
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] [marionnet] 04/07: Bump ocamlbricks version to r393
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository marionnet.
commit bd63db464fbe61bed65f25be4043a58f48659b9f
Author: Lucas Nussbaum lu...@debian.org
Date: Wed Apr 2 17:10:00 2014 +0200
Bump ocamlbricks version to r393
---
debian/control | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index d1abfed..7c424f6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (= 8.0.0),
camlp4-extra,
ocaml-findlib,
liblablgtk2-ocaml-dev (= 2.12.0-2),
- libocamlbricks-ocaml-dev (= 0.90+bzr367~),
+ libocamlbricks-ocaml-dev (= 0.90+bzr393~),
liblablgtksourceview2-ocaml-dev (= 2.14.2),
dh-systemd (= 1.5)
Standards-Version: 3.9.4
@@ -22,7 +22,7 @@ Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends},
graphviz,
liblablgtk2-ocaml-dev (= 2.12.0-2),
- libocamlbricks-ocaml-dev (= 0.90+bzr367~),
+ libocamlbricks-ocaml-dev (= 0.90+bzr393~),
liblablgtksourceview2-ocaml-dev (= 2.14.2),
vde2,
lsb-base (= 3.2-14),
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git
___
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] [marionnet] 06/07: Add note about use of slirpvde
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit 5fa60ae1592c48019683e641623c72c1fb3a1674 Author: Lucas Nussbaum lu...@debian.org Date: Wed Apr 2 19:18:32 2014 +0200 Add note about use of slirpvde --- debian/README.Debian | 7 +++ 1 file changed, 7 insertions(+) diff --git a/debian/README.Debian b/debian/README.Debian index 1919a91..2dcafc7 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -38,3 +38,10 @@ lightdm (on Ubuntu) Edit /etc/lightdm/lightdm.conf and add xserver-allow-tcp=true in the [SeatDefaults] section. + +Allowing the virtual network to access the real-world network += +When using gateways to connect the virtual network to the real-world +network, one must remember that marionnet uses slirpvde, which has +some limitations (including no ICMP support). + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] branch master updated (628a414 - 7cfc044)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch master in repository marionnet. from 628a414 prepare changelog for upload new 2a73147 Imported Upstream version 0.90.6+bzr448 new e461f3f Update changelog new 50670d0 Refresh patches new bd63db4 Bump ocamlbricks version to r393 new 9f72c45 Add patch: 0003-Tweak-ocamldep-search-path.patch new 5fa60ae Add note about use of slirpvde new 7cfc044 Add simple script to install testing images The 7 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: CONFIGME | 13 +- Makefile | 110 ++--- Makefile.local | 27 +- cable.ml | 26 +- cloud.ml | 12 +- cow_files.ml | 2 +- daemon_client.ml | 45 +- daemon_language.ml | 13 +- death_monitor.ml | 44 +- debian/README.Debian | 10 + debian/changelog | 6 + debian/control | 4 +- debian/marionnet-download-testing-images | 26 ++ debian/marionnet.install | 1 + ...e-installation-paths-for-Debian-packaging.patch | 22 +- ...file-installation-paths-in-marionnet.conf.patch | 2 - .../patches/0003-Tweak-ocamldep-search-path.patch | 11 + debian/patches/series | 1 + descendants_monitor.ml | 54 +++ descendants_monitor.mli| 25 + disk.ml| 59 ++- disk.mli | 5 +- gettext.ml | 8 +- gui/gui_menubar_MARIONNET.ml | 7 +- gui/ledgrid_manager.ml | 59 ++- gui/menu_factory.ml| 4 +- hub.ml | 16 +- initialization.ml | 16 +- log.ml | 63 +-- machine.ml | 48 +- marionnet-daemon.ml| 122 ++--- marionnet.ml | 114 - meta.ml.released | 10 +- motherboard_builder.ml | 4 +- po/messages.pot| 153 --- progress_bar.ml| 1 - router.ml | 66 +-- .../filesystems/machine-debian-lenny-sid-2008.conf | 2 +- share/filesystems/machine-mandriva20100215.conf| 2 +- share/filesystems/machine-pinocchio-14787.conf | 2 +- share/filesystems/machine-template.conf| 2 +- share/filesystems/router-pinocchio-09157.conf | 2 +- signals.ml | 177 simulation_level.ml| 501 +++-- simulation_level.mli | 22 +- state.ml | 58 ++- switch.ml | 38 +- task_runner.ml | 18 +- treeview.ml| 37 +- treeview_defects.ml| 2 +- treeview_documents.ml | 4 +- treeview_history.ml| 4 +- treeview_ifconfig.ml | 157 --- uml/guest/marionnet-relay | 48 +- uml/pupisto.buildroot/Makefile | 2 +- uml/pupisto.buildroot/pupisto.buildroot.sh | 46 +- uml/pupisto.debian/pupisto.debian.sh | 13 +- uml/pupisto.kernel/pupisto.kernel.sh | 3 + useful-scripts/marionnet_from_scratch | 83 +++- user_level.ml | 189 version.mli| 2 + world_bridge.ml| 14 +- world_gateway.ml | 12 +- x.ml | 18 +- xforest.ml | 4 +- 65 files changed, 1367 insertions(+), 1304 deletions(-) create mode 100755 debian/marionnet-download-testing-images create mode 100644
[Pkg-ocaml-maint-commits] [marionnet] annotated tag debian/0.90.6+bzr448-1 created (now 53ccbe7)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to annotated tag debian/0.90.6+bzr448-1 in repository marionnet. at 53ccbe7 (tag) tagging 7cfc044c53fd01ff8c26dd83242a4eb222e4bc73 (commit) replaces debian/0.90.6+bzr434-2 tagged by Lucas Nussbaum on Thu Apr 3 16:35:50 2014 +0200 - Log - marionnet Debian release 0.90.6+bzr448-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIVAwUAUz1xxjkUtTL0376ZAQr0/xAAm9TC7gN6WSOrrQ926sL8N3qOhtB/hNaz TPhVaL8EtROWWJpBZcg2R1yzioKJmgq8IuLbw9W2DdS3wC+i1yEeWWcKznD3NoN2 IxcQgzUXD6PNvGrPFriy4Ml6Ns8aRlU2FJ6cnKoyOjc7H91430T8JRL8LA9WvCJp OiI8gSzIHyQ0PFwN7SKNKpMDrn1oP3UHiSEJ9UThv4RTxLBoXhkLy0cVqK6UjcUi 2szRzuT7XbAV8C1cWoAT5ejXdyQo4Qzr27owKQZGyOXFgcCDGLS6aTDXBAqHtYc4 5Oa2NnuIyVjpdXB5p3rZUb8gC+XKARDrsO15JE+EeRhn82ybURnGxENya8EEnzvM s/kYb3Gd95yzgeMsZL/q2GCuX8bXZaIoDn89nP44nJdYWNtDPA9qTh8HAxRnc7uj QngfEyTiXdwdyh8Dp416qk9lXHqbaZfU+zihtzNFYwcf5Pb6X6I0DfL15Yepr+SZ KNVo8Pap1hQ5vGRh/Nr2ENr0sSvkVS/XMtB5fsJapE2CHiXguydtn6aUjUr6suD9 qre1y88M9Vio2/9IP7e+Spiw39eEX8iqYL1o82vL2BPpaXpz2NKYXbr2Bo2+V3/m RYFcwJRw/NED8/SJ2c3qiEsZOYL9olZ8JwtnQtsEWlvzujBp391TbTUhYbfhUi9K vPN7s2GnghQ= =kcxZ -END PGP SIGNATURE- Lucas Nussbaum (7): Imported Upstream version 0.90.6+bzr448 Update changelog Refresh patches Bump ocamlbricks version to r393 Add patch: 0003-Tweak-ocamldep-search-path.patch Add note about use of slirpvde Add simple script to install testing images --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [ocamlbricks] 03/03: Update changelog
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit 27804b3600388cca17123d2ee0ef77ee77c2cae9 Author: Lucas Nussbaum lu...@debian.org Date: Wed Apr 2 16:29:41 2014 +0200 Update changelog --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e701e2c..a126b70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocamlbricks (0.90+bzr393-1) unstable; urgency=medium + + * New upstream snapshot. + + -- Lucas Nussbaum lu...@debian.org Wed, 02 Apr 2014 16:27:57 +0200 + ocamlbricks (0.90+bzr367-1) unstable; urgency=low * New upstream snapshot. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 02/03: Merge tag 'upstream/0.90+bzr393'
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit 68c50d4c7cd0cf56e0b8b178c3ff1a0f0701389f Merge: 95ac43b ab0af1d Author: Lucas Nussbaum lu...@debian.org Date: Wed Apr 2 16:27:54 2014 +0200 Merge tag 'upstream/0.90+bzr393' Upstream version 0.90+bzr393 BASE/argv.mli | 35 +-- BASE/fix.ml | 8 + BASE/fix.mli| 2 + BASE/log_builder.ml | 139 +++- BASE/log_builder.mli| 28 ++- BASE/ocamlbricks_log.ml | 3 + BASE/ocamlbricks_log.mli| 15 +- CAMLP4/log_module_loading_p4.ml | 2 +- CAMLP4/log_module_loading_p4.mli| 2 +- CAMLP4/raise_p4.ml | 2 +- CONFIGME| 9 +- CONFIGURATION/configuration_files.ml| 20 +- EXTRA/arrayExtra.ml | 127 +-- EXTRA/arrayExtra.mli| 18 +- EXTRA/does-process-exist-c-wrapper.c| 6 +- EXTRA/endpoint.ml | 121 -- EXTRA/endpoint.mli | 43 EXTRA/limbo.ml | 275 --- EXTRA/listExtra.ml | 53 - EXTRA/listExtra.mli | 22 +- EXTRA/queueExtra.mli| 2 + EXTRA/stringExtra.ml| 7 +- EXTRA/stringExtra.mli | 2 +- EXTRA/threadExtra.ml| 61 ++--- EXTRA/unixExtra.ml | 167 +++--- EXTRA/unixExtra.mli | 35 ++- EXTRA/waitpid-c-wrapper.c | 12 +- GETTEXT/gettext-c-wrapper.c | 6 +- MARSHAL/marshallable_classes.mli| 3 + META| 1 - Makefile| 112 -- Makefile.d/doc.sh | 8 +- Makefile.d/ocamlmklib_wrapper.sh| 7 +- Makefile.d/test.sh | 40 Makefile.d/test_scripts_starting_section.sh | 91 Makefile.d/test_with.sh | 65 ++ Makefile.d/test_with_utop.sh| 48 Makefile.local | 44 ++-- SHELL/linux.ml | 331 SHELL/linux.mli | 299 + SHELL/shell.ml | 47 SHELL/shell.mli | 10 + STRUCTURES/endpoint.ml | 321 +++ STRUCTURES/endpoint.mli | 157 + STRUCTURES/forest.ml| 270 --- STRUCTURES/forest.mli | 28 ++- STRUCTURES/ipv4.ml | 52 - STRUCTURES/ipv4.mli | 12 + STRUCTURES/ipv6.ml | 2 +- STRUCTURES/memo.ml | 2 +- STRUCTURES/network.ml | 93 STRUCTURES/option.ml| 4 + STRUCTURES/option.mli | 1 + WIDGETS/widget.ml | 50 + WIDGETS/widget.mli | 14 ++ meta.ml.released| 10 +- ocamlbricks.mllib | 1 + ocamlbricks.odocl | 1 + 58 files changed, 2269 insertions(+), 1077 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] branch master updated (95ac43b - 27804b3)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch master in repository ocamlbricks. from 95ac43b New upstream snapshot. new ab0af1d Imported Upstream version 0.90+bzr393 new 68c50d4 Merge tag 'upstream/0.90+bzr393' new 27804b3 Update changelog The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: BASE/argv.mli | 35 +-- BASE/fix.ml | 8 + BASE/fix.mli| 2 + BASE/log_builder.ml | 139 +++- BASE/log_builder.mli| 28 ++- BASE/ocamlbricks_log.ml | 3 + BASE/ocamlbricks_log.mli| 15 +- CAMLP4/log_module_loading_p4.ml | 2 +- CAMLP4/log_module_loading_p4.mli| 2 +- CAMLP4/raise_p4.ml | 2 +- CONFIGME| 9 +- CONFIGURATION/configuration_files.ml| 20 +- EXTRA/arrayExtra.ml | 127 +-- EXTRA/arrayExtra.mli| 18 +- EXTRA/does-process-exist-c-wrapper.c| 6 +- EXTRA/endpoint.ml | 121 -- EXTRA/endpoint.mli | 43 EXTRA/limbo.ml | 275 --- EXTRA/listExtra.ml | 53 - EXTRA/listExtra.mli | 22 +- EXTRA/queueExtra.mli| 2 + EXTRA/stringExtra.ml| 7 +- EXTRA/stringExtra.mli | 2 +- EXTRA/threadExtra.ml| 61 ++--- EXTRA/unixExtra.ml | 167 +++--- EXTRA/unixExtra.mli | 35 ++- EXTRA/waitpid-c-wrapper.c | 12 +- GETTEXT/gettext-c-wrapper.c | 6 +- MARSHAL/marshallable_classes.mli| 3 + META| 1 - Makefile| 112 -- Makefile.d/doc.sh | 8 +- Makefile.d/ocamlmklib_wrapper.sh| 7 +- Makefile.d/test.sh | 40 Makefile.d/test_scripts_starting_section.sh | 91 Makefile.d/test_with.sh | 65 ++ Makefile.d/test_with_utop.sh| 48 Makefile.local | 44 ++-- SHELL/linux.ml | 331 SHELL/linux.mli | 299 + SHELL/shell.ml | 47 SHELL/shell.mli | 10 + STRUCTURES/endpoint.ml | 321 +++ STRUCTURES/endpoint.mli | 157 + STRUCTURES/forest.ml| 270 --- STRUCTURES/forest.mli | 28 ++- STRUCTURES/ipv4.ml | 52 - STRUCTURES/ipv4.mli | 12 + STRUCTURES/ipv6.ml | 2 +- STRUCTURES/memo.ml | 2 +- STRUCTURES/network.ml | 93 STRUCTURES/option.ml| 4 + STRUCTURES/option.mli | 1 + WIDGETS/widget.ml | 50 + WIDGETS/widget.mli | 14 ++ debian/changelog| 6 + meta.ml.released| 10 +- ocamlbricks.mllib | 1 + ocamlbricks.odocl | 1 + 59 files changed, 2275 insertions(+), 1077 deletions(-) delete mode 100644 EXTRA/endpoint.ml delete mode 100644 EXTRA/endpoint.mli delete mode 100644 EXTRA/limbo.ml delete mode 100755 Makefile.d/test.sh delete mode 100644 Makefile.d/test_scripts_starting_section.sh create mode 100755 Makefile.d/test_with.sh delete mode 100755 Makefile.d/test_with_utop.sh create mode 100644 SHELL/linux.ml create mode 100644 SHELL/linux.mli create mode 100644 STRUCTURES/endpoint.ml create mode 100644 STRUCTURES/endpoint.mli -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] annotated tag upstream/0.90+bzr393 created (now a4f5261)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to annotated tag upstream/0.90+bzr393 in repository ocamlbricks. at a4f5261 (tag) tagging ab0af1d1f902cb761d563e3c72bc7bf6e8563f99 (commit) replaces upstream/0.90+bzr367 tagged by Lucas Nussbaum on Wed Apr 2 16:27:54 2014 +0200 - Log - Upstream version 0.90+bzr393 Lucas Nussbaum (1): Imported Upstream version 0.90+bzr393 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 05/05: Update changelog for upload
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit e94d1e2d674428b2f67992a90e6fde166a340eff Author: Lucas Nussbaum lu...@debian.org Date: Wed Apr 2 19:20:40 2014 +0200 Update changelog for upload --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a126b70..454c1d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ ocamlbricks (0.90+bzr393-1) unstable; urgency=medium * New upstream snapshot. + * Refreshed patches, due to buildsystem changes. ++ Add patch 0004-install-stublibs.patch - -- Lucas Nussbaum lu...@debian.org Wed, 02 Apr 2014 16:27:57 +0200 + -- Lucas Nussbaum lu...@debian.org Wed, 02 Apr 2014 19:19:00 +0200 ocamlbricks (0.90+bzr367-1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 01/01: pristine-tar data for ocamlbricks_0.90+bzr393.orig.tar.gz
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch pristine-tar in repository ocamlbricks. commit 239c3f9a9256c9ab1102ccff399a7906b6e5e2a2 Author: Lucas Nussbaum lu...@debian.org Date: Wed Apr 2 16:27:54 2014 +0200 pristine-tar data for ocamlbricks_0.90+bzr393.orig.tar.gz --- ocamlbricks_0.90+bzr393.orig.tar.gz.delta | Bin 0 - 6214 bytes ocamlbricks_0.90+bzr393.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/ocamlbricks_0.90+bzr393.orig.tar.gz.delta b/ocamlbricks_0.90+bzr393.orig.tar.gz.delta new file mode 100644 index 000..4134fd6 Binary files /dev/null and b/ocamlbricks_0.90+bzr393.orig.tar.gz.delta differ diff --git a/ocamlbricks_0.90+bzr393.orig.tar.gz.id b/ocamlbricks_0.90+bzr393.orig.tar.gz.id new file mode 100644 index 000..2fc1231 --- /dev/null +++ b/ocamlbricks_0.90+bzr393.orig.tar.gz.id @@ -0,0 +1 @@ +d40326d056f9912a194ba8cd9fc8e4c0ef8287b3 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 02/05: Install the library's files
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit e44f1ec8afccedfb5201e53024237876db3ad0a6 Author: Lucas Nussbaum lu...@debian.org Date: Wed Apr 2 17:23:31 2014 +0200 Install the library's files --- debian/libocamlbricks-ocaml-dev.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/libocamlbricks-ocaml-dev.install b/debian/libocamlbricks-ocaml-dev.install new file mode 100644 index 000..ce0d74c --- /dev/null +++ b/debian/libocamlbricks-ocaml-dev.install @@ -0,0 +1 @@ +usr/lib/ocaml/ocamlbricks -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 01/05: Refreshed patches
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository ocamlbricks.
commit c39d72301d283129424744f2bd3fae055449dfc5
Author: Lucas Nussbaum lu...@debian.org
Date: Wed Apr 2 16:37:02 2014 +0200
Refreshed patches
---
.../0001-Fix-the-OCaml-C-header-paths.patch| 72 --
.../0002-Use-the-Debian-prefix-for-building.patch | 22 ---
...Fix-the-build-on-non-native-architectures.patch | 19 +++---
debian/patches/series | 1 -
4 files changed, 21 insertions(+), 93 deletions(-)
diff --git a/debian/patches/0001-Fix-the-OCaml-C-header-paths.patch
b/debian/patches/0001-Fix-the-OCaml-C-header-paths.patch
deleted file mode 100644
index 3af4cda..000
--- a/debian/patches/0001-Fix-the-OCaml-C-header-paths.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Lucas Nussbaum lu...@debian.org
-Date: Sat, 1 Dec 2012 18:41:14 +0100
-Subject: Fix the OCaml C header paths
-
-This uses the Debian-specific paths for the caml C includes
-
-Forwarded: not-needed
- EXTRA/does-process-exist-c-wrapper.c | 4 ++--
- EXTRA/waitpid-c-wrapper.c| 12 ++--
- GETTEXT/gettext-c-wrapper.c | 6 +++---
- 3 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/EXTRA/does-process-exist-c-wrapper.c
b/EXTRA/does-process-exist-c-wrapper.c
-index e512376..8351c78 100644
a/EXTRA/does-process-exist-c-wrapper.c
-+++ b/EXTRA/does-process-exist-c-wrapper.c
-@@ -24,10 +24,10 @@
- #include assert.h
-
- #include memory.h
--#include mlvalues.h
-+#include caml/mlvalues.h
- /* If I don't #include caml/alloc.h then this module compiles fine, but then
crashes
-at runtime. Funny, isn't it? */
--#include alloc.h
-+#include caml/alloc.h
-
- /* Return true iff the process identified by the given pid exists. The idea
is just to
-call kill with 0 as a signal, which is easy in C but impossible in OCaml:
*/
-diff --git a/EXTRA/waitpid-c-wrapper.c b/EXTRA/waitpid-c-wrapper.c
-index 7d08874..ee7a407 100644
a/EXTRA/waitpid-c-wrapper.c
-+++ b/EXTRA/waitpid-c-wrapper.c
-@@ -22,12 +22,12 @@
- #include errno.h
- #include assert.h
-
--#include mlvalues.h
--#include alloc.h
--#include memory.h
--#include fail.h
--#include callback.h
--#include unixsupport.h
-+#include caml/mlvalues.h
-+#include caml/alloc.h
-+#include caml/memory.h
-+#include caml/fail.h
-+#include caml/callback.h
-+#include caml/unixsupport.h
-
- #define WAITPID_NAME waitpid
-
-diff --git a/GETTEXT/gettext-c-wrapper.c b/GETTEXT/gettext-c-wrapper.c
-index 0c3ea78..42d5bed 100644
a/GETTEXT/gettext-c-wrapper.c
-+++ b/GETTEXT/gettext-c-wrapper.c
-@@ -22,11 +22,11 @@
- #include stdbool.h
- #include libintl.h
-
--#include mlvalues.h
-+#include caml/mlvalues.h
- /* If I don't #include caml/alloc.h then this module compiles fine, but then
crashes
-at runtime. Funny, isn't it? */
--#include alloc.h
--#include memory.h
-+#include caml/alloc.h
-+#include caml/memory.h
-
- /* Some part of the gettext initialization should only be performed once: */
- static bool was_gettext_initialized = false;
diff --git a/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
b/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
index 64c13eb..4ca1ae0 100644
--- a/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
+++ b/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
@@ -9,8 +9,6 @@ Forwarded: not-needed
CONFIGME | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/CONFIGME b/CONFIGME
-index 24941d6..cadaf22 100644
--- a/CONFIGME
+++ b/CONFIGME
@@ -34,11 +34,11 @@
@@ -27,12 +25,20 @@ index 24941d6..cadaf22 100644
# Prefix for the locale files
localeprefix=${prefix}/share/locale
-@@ -58,7 +58,7 @@ ocaml_libraryprefix=$(ocamlc -where || exit -1)
- # By default they will be installed into ${ocaml_libraryprefix}, but you
- # can change it if you really want to install into a different, custom prefix.
+@@ -59,12 +59,12 @@ ocaml_libraryprefix=$(ocamlc -where || e
+ # library or into ${ocaml_libraryprefix}, but you can change it if you
really
+ # want to install into a different, custom prefix.
# *No* trailing slash should be included.
--libraryprefix=${ocaml_libraryprefix}
-+libraryprefix=${prefix}/${ocaml_libraryprefix}
+-libraryprefix=$(which 1/dev/null ocamlfind ocamlfind query lablgtk2)
+-libraryprefix=${libraryprefix%/lablgtk2}
+-libraryprefix=${libraryprefix:-$ocaml_libraryprefix}
++#libraryprefix=$(which 1/dev/null ocamlfind ocamlfind query lablgtk2)
++#libraryprefix=${libraryprefix%/lablgtk2}
++#libraryprefix=${libraryprefix:-$ocaml_libraryprefix}
#
# This definition may be appropriate for debian packaging:
- #libraryprefix=debian/tmp/${ocaml_libraryprefix}
+-#libraryprefix=debian/tmp/${ocaml_libraryprefix}
++libraryprefix=${prefix}/${ocaml_libraryprefix}
+
+ # This should be defined as the absolute path to a directory containing
[Pkg-ocaml-maint-commits] [ocamlbricks] annotated tag debian/0.90+bzr393-1 created (now 398a09e)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to annotated tag debian/0.90+bzr393-1 in repository ocamlbricks. at 398a09e (tag) tagging e94d1e2d674428b2f67992a90e6fde166a340eff (commit) replaces debian/0.90+bzr367-1 tagged by Lucas Nussbaum on Wed Apr 2 19:22:58 2014 +0200 - Log - ocamlbricks Debian release 0.90+bzr393-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIVAwUAUzxHcjkUtTL0376ZAQpivA//WWZZGvw/tfz4OFp/DBPyOnSaIUsCWaav unAG8/DEvPSeet9Nr7IWq8OIbFiLuIH0WQ8k12yL7Azaz/4sMTUN/WoV9V3kCeVH OiUmsYL61OP8QUNcHWHOtm2RpxnDmjepcgr8kI4rI/h+wnDqBQYdFvYI2yj1mzHz jD7HpuimYbwUkJrYqa3IXgXmPcE6/L/vMrg3nowXDjls9DWfhJaJBCJVlYjrML8M dByAT/O2WEnlcyj54MXNpX6Hjv9qSX4iTGe24WR5zk8QEJlCNGG7OCA9weHMrlKm fbDrV5oddNpNAfLLvEWQXTEIubm6BbgCQOTzJf2m5lgzyR3lOO38AsGufATWhomd kJcIbaH0u/cq6bQJRexYbeXfup4eWA9cYU9Wgl4WBYp6YQDme4bdAimUK4qyFJ/M h0SoWa/cQ30WSdyd6DJXCgUM7uxmgI5zqGAACsSLoIxjFTKdnrQ1eO1FnqHuVSl0 6HjbXgOi5/vO0lO4KRHfU8+5nw0CfLxBWjTWc82Ddvy1oOwH85N1JJSFnyg9mYrh G0PJC27RpHRsheMB9glpvcNzVIPB8OSxaivuYeV34IgJLbPSDYySwNW9Qm/Gn4To fdeYlw4ONoR9oH+Kjilj+Nzl/jRfhOetWugMIek6suwVQEG9rpkjU4uAEmvUgKDF 7CQETpDrtis= =BDW2 -END PGP SIGNATURE- Lucas Nussbaum (8): Imported Upstream version 0.90+bzr393 Merge tag 'upstream/0.90+bzr393' Update changelog Refreshed patches Install the library's files Add patch 0004-install-stublibs.patch Install whole of /usr/lib/ocaml Update changelog for upload --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] branch master updated (27804b3 - e94d1e2)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch master in repository ocamlbricks. from 27804b3 Update changelog new c39d723 Refreshed patches new e44f1ec Install the library's files new 6bae32a Add patch 0004-install-stublibs.patch new ba3d73a Install whole of /usr/lib/ocaml new e94d1e2 Update changelog for upload The 5 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 +- debian/libocamlbricks-ocaml-dev.install| 1 + .../0001-Fix-the-OCaml-C-header-paths.patch| 72 -- .../0002-Use-the-Debian-prefix-for-building.patch | 22 --- ...Fix-the-build-on-non-native-architectures.patch | 19 +++--- debian/patches/0004-install-stublibs.patch | 25 debian/patches/series | 2 +- 7 files changed, 51 insertions(+), 94 deletions(-) create mode 100644 debian/libocamlbricks-ocaml-dev.install delete mode 100644 debian/patches/0001-Fix-the-OCaml-C-header-paths.patch create mode 100644 debian/patches/0004-install-stublibs.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] branch pristine-tar updated (3f5633d - 239c3f9)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch pristine-tar in repository ocamlbricks. from 3f5633d pristine-tar data for ocamlbricks_0.90+bzr367.orig.tar.gz new 239c3f9 pristine-tar data for ocamlbricks_0.90+bzr393.orig.tar.gz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: ocamlbricks_0.90+bzr393.orig.tar.gz.delta | Bin 0 - 6214 bytes ocamlbricks_0.90+bzr393.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 ocamlbricks_0.90+bzr393.orig.tar.gz.delta create mode 100644 ocamlbricks_0.90+bzr393.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 04/05: Install whole of /usr/lib/ocaml
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository ocamlbricks. commit ba3d73a89f634d1b333914d366b782064b1ca51e Author: Lucas Nussbaum lu...@debian.org Date: Wed Apr 2 18:38:05 2014 +0200 Install whole of /usr/lib/ocaml --- debian/libocamlbricks-ocaml-dev.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libocamlbricks-ocaml-dev.install b/debian/libocamlbricks-ocaml-dev.install index ce0d74c..00a96ae 100644 --- a/debian/libocamlbricks-ocaml-dev.install +++ b/debian/libocamlbricks-ocaml-dev.install @@ -1 +1 @@ -usr/lib/ocaml/ocamlbricks +usr/lib/ocaml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] branch upstream updated (8085e70 - ab0af1d)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch upstream in repository ocamlbricks. from 8085e70 Imported Upstream version 0.90+bzr367 adds ab0af1d Imported Upstream version 0.90+bzr393 No new revisions were added by this update. Summary of changes: BASE/argv.mli | 35 +-- BASE/fix.ml | 8 + BASE/fix.mli| 2 + BASE/log_builder.ml | 139 +++- BASE/log_builder.mli| 28 ++- BASE/ocamlbricks_log.ml | 3 + BASE/ocamlbricks_log.mli| 15 +- CAMLP4/log_module_loading_p4.ml | 2 +- CAMLP4/log_module_loading_p4.mli| 2 +- CAMLP4/raise_p4.ml | 2 +- CONFIGME| 9 +- CONFIGURATION/configuration_files.ml| 20 +- EXTRA/arrayExtra.ml | 127 +-- EXTRA/arrayExtra.mli| 18 +- EXTRA/does-process-exist-c-wrapper.c| 6 +- EXTRA/endpoint.ml | 121 -- EXTRA/endpoint.mli | 43 EXTRA/limbo.ml | 275 --- EXTRA/listExtra.ml | 53 - EXTRA/listExtra.mli | 22 +- EXTRA/queueExtra.mli| 2 + EXTRA/stringExtra.ml| 7 +- EXTRA/stringExtra.mli | 2 +- EXTRA/threadExtra.ml| 61 ++--- EXTRA/unixExtra.ml | 167 +++--- EXTRA/unixExtra.mli | 35 ++- EXTRA/waitpid-c-wrapper.c | 12 +- GETTEXT/gettext-c-wrapper.c | 6 +- MARSHAL/marshallable_classes.mli| 3 + META| 1 - Makefile| 112 -- Makefile.d/doc.sh | 8 +- Makefile.d/ocamlmklib_wrapper.sh| 7 +- Makefile.d/test.sh | 40 Makefile.d/test_scripts_starting_section.sh | 91 Makefile.d/test_with.sh | 65 ++ Makefile.d/test_with_utop.sh| 48 Makefile.local | 44 ++-- SHELL/linux.ml | 331 SHELL/linux.mli | 299 + SHELL/shell.ml | 47 SHELL/shell.mli | 10 + STRUCTURES/endpoint.ml | 321 +++ STRUCTURES/endpoint.mli | 157 + STRUCTURES/forest.ml| 270 --- STRUCTURES/forest.mli | 28 ++- STRUCTURES/ipv4.ml | 52 - STRUCTURES/ipv4.mli | 12 + STRUCTURES/ipv6.ml | 2 +- STRUCTURES/memo.ml | 2 +- STRUCTURES/network.ml | 93 STRUCTURES/option.ml| 4 + STRUCTURES/option.mli | 1 + WIDGETS/widget.ml | 50 + WIDGETS/widget.mli | 14 ++ meta.ml.released| 10 +- ocamlbricks.mllib | 1 + ocamlbricks.odocl | 1 + 58 files changed, 2269 insertions(+), 1077 deletions(-) delete mode 100644 EXTRA/endpoint.ml delete mode 100644 EXTRA/endpoint.mli delete mode 100644 EXTRA/limbo.ml delete mode 100755 Makefile.d/test.sh delete mode 100644 Makefile.d/test_scripts_starting_section.sh create mode 100755 Makefile.d/test_with.sh delete mode 100755 Makefile.d/test_with_utop.sh create mode 100644 SHELL/linux.ml create mode 100644 SHELL/linux.mli create mode 100644 STRUCTURES/endpoint.ml create mode 100644 STRUCTURES/endpoint.mli -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git ___ 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] [ocamlbricks] 03/05: Add patch 0004-install-stublibs.patch
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository ocamlbricks.
commit 6bae32a7b1ec24e43265433f122dd8b5553192b8
Author: Lucas Nussbaum lu...@debian.org
Date: Wed Apr 2 18:25:11 2014 +0200
Add patch 0004-install-stublibs.patch
---
debian/patches/0004-install-stublibs.patch | 25 +
debian/patches/series | 1 +
2 files changed, 26 insertions(+)
diff --git a/debian/patches/0004-install-stublibs.patch
b/debian/patches/0004-install-stublibs.patch
new file mode 100644
index 000..02a826a
--- /dev/null
+++ b/debian/patches/0004-install-stublibs.patch
@@ -0,0 +1,25 @@
+--- a/Makefile
b/Makefile
+@@ -433,18 +433,17 @@ install-libraries: libraries install-lib
+ if [ $(NATIVE_LIBRARIES) $(BYTE_LIBRARIES) == ]; then \
+ echo There are no native libraries to install: ok, no problem...; \
+ else \
+-(echo Installing $$name libraries into
$(LIBRARYPREFIX)/$$name/...; \
++set -x ; (echo Installing $$name libraries into
$(LIBRARYPREFIX)/$$name/...; \
+ (mkdir -p $(LIBRARYPREFIX)/$$name /dev/null || true); \
+ shopt -s nullglob; \
+ cp -f META $(OTHER_LIBRARY_FILES_TO_INSTALL) \
+ _build/*.cma _build/*.cmxa _build/*.a \
+ `find _build/ -name \*.cmi | grep -v /myocamlbuild` \
+ `find _build/ -name \*.mli | grep -v /myocamlbuild` \
+-$(LIBRARYPREFIX)/$$name/) \
+-if test -d $(LIBRARYPREFIX)/stublibs/; then \
++$(LIBRARYPREFIX)/$$name/) ; \
++mkdir -p $(LIBRARYPREFIX)/stublibs ; \
+ find _build/ -name dll*.so -exec cp -f {}
$(LIBRARYPREFIX)/stublibs/ ; ; \
+-fi; \
+-echo 'Library installation was successful.'; \
++echo 'Library installation was successful.'; set +x ; \
+ fi)
+
+ # Uninstall programs and libraries:
diff --git a/debian/patches/series b/debian/patches/series
index ed24500..ef23491 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0002-Use-the-Debian-prefix-for-building.patch
0003-Fix-the-build-on-non-native-architectures.patch
+0004-install-stublibs.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git
___
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] [marionnet] 01/03: fix: debian-changelog-line-too-long
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit cfc3349ecfcb1129b4bb9565cf3e6385f938dfbf Author: Lucas Nussbaum lu...@debian.org Date: Sat Aug 24 17:11:51 2013 +0200 fix: debian-changelog-line-too-long --- debian/changelog |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 54639bc..037806c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ marionnet (0.90.6+bzr434-2) UNRELEASED; urgency=low [ Lucas Nussbaum ] * add warning about -nolisten tcp in init script - * Switch Architecture to i386 amd64. user-mode-linux only works on those architectures. + * Switch Architecture to i386 amd64. user-mode-linux only works on +those architectures. * Move startup checks to a separate script * Add marionnet service file -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 03/03: prepare changelog for upload
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit 628a41409d68fe2ec5edefdef07926fb60acd807 Author: Lucas Nussbaum lu...@debian.org Date: Sat Aug 24 17:17:56 2013 +0200 prepare changelog for upload --- debian/changelog |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 037806c..5c0ea3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,17 @@ -marionnet (0.90.6+bzr434-2) UNRELEASED; urgency=low +marionnet (0.90.6+bzr434-2) unstable; urgency=low [ Lucas Nussbaum ] * add warning about -nolisten tcp in init script * Switch Architecture to i386 amd64. user-mode-linux only works on those architectures. - * Move startup checks to a separate script - * Add marionnet service file + * Move startup checks to a separate script. + * Add marionnet service file. + * Fix lintian warnings: extra-license-file. [ Nicolas Dandrimont ] * Update my email address - -- Lucas Nussbaum lu...@debian.org Tue, 13 Aug 2013 16:20:42 +0200 + -- Lucas Nussbaum lu...@debian.org Sat, 24 Aug 2013 17:17:34 +0200 marionnet (0.90.6+bzr434-1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] branch master updated (11b8b0e - 628a414)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to branch master in repository marionnet. from 11b8b0e Update changelog new cfc3349 fix: debian-changelog-line-too-long new 47c54d8 Fix lintian warnings: extra-license-file new 628a414 prepare changelog for upload The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 12 +++- debian/rules |2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] 02/03: Fix lintian warnings: extra-license-file
This is an automated email from the git hooks/post-receive script. lucas pushed a commit to branch master in repository marionnet. commit 47c54d868e20b56862976888c34a3b779badc7ee Author: Lucas Nussbaum lu...@debian.org Date: Sat Aug 24 17:13:12 2013 +0200 Fix lintian warnings: extra-license-file --- debian/rules |2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 402078e..1b5be69 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,8 @@ override_dh_auto_build: override_dh_auto_install: dh_auto_install rm debian/marionnet/usr/share/marionnet/COPYING # remove duplicate copyright file + rm debian/marionnet/usr/share/marionnet/images/Artistic + rm debian/marionnet/usr/share/marionnet/images/lgpl-3.0.txt if [ -e debian/marionnet/usr/sbin/marionnet-daemon.native ]; then \ mv debian/marionnet/usr/sbin/marionnet-daemon.native debian/marionnet/usr/sbin/marionnet-daemon ; \ mv debian/marionnet/usr/bin/marionnet.native debian/marionnet/usr/bin/marionnet ; \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] [marionnet] annotated tag debian/0.90.6+bzr434-2 created (now cc41092)
This is an automated email from the git hooks/post-receive script. lucas pushed a change to annotated tag debian/0.90.6+bzr434-2 in repository marionnet. at cc41092 (tag) tagging 628a41409d68fe2ec5edefdef07926fb60acd807 (commit) replaces debian/0.90.6+bzr434-1 tagged by Lucas Nussbaum on Sat Aug 24 17:43:34 2013 +0200 - Log - marionnet Debian release 0.90.6+bzr434-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIVAwUAUhjUpjkUtTL0376ZAQpLdg//W/l7o/q6A8SOGfNsbOakJEr2w06TEine slGzGFkkV2/djNEf8m3vK0T79gBvNv0ZTSZEdFia7fjm1dIvZb65yuNkKGitSX+f 8ve9QIkpn+TiNE8bUBsViI205y4QpcewkZOPkO1N0XXfqNSJN7ssJEL/wlgpyDuF tDMo9UG0+ZiTSJZen77DIHg5L0DHC+G26GhpHLmfA9QuxUO02OW9gv8j0fJ2KjSm YE4+khswC0+rUxGZQlr0W0Koa93zBTyAl+yOBFen9qcL/DMN6kNACeWK50+Drztg 4VClwhUX54GSQkjoM+OqWn+pKKZN8Qn5LSmRGXdQgNhBV/nqrvJLbjfUE5Zi5+ld 0+KQTBVMHbJJhAEsGWUldfbTRpJQLvQOTOJ71R2hZKlKDsIz0XqeyJJQPvS6QzsJ 5Syb17IaoAmoRVctkmzAOF/HdNf72w0ykvMjIeGvXD1kE5ruK6rNIM/59AFgLFjt FMXDF2ewba0YrK7vXLwuAYbeHeMWME4+r0YduJe7K9CV/0aKMx4JVFJPPdLDWgET qmqQX4dPFNtFsj2fo8d9hg9jaYF3WfyybgJlu1n+EUCZX1zYNasM2yMWeA+Dpnco qPyqIcE7kskLNaBCYFd9Rw4zStT2SZahKXC4LhHbh6TNn80/oumaNeMwTW9V63VN wodKKknjZu8= =kD8W -END PGP SIGNATURE- Lucas Nussbaum (9): add warning about -nolisten tcp in init script Switch Architecture to linux-any as marionnet requires UML. Switch Architecture to i386 amd64. user-mode-linux only works on those architectures. Move startup checks to a separate script Add marionnet service file add description to service file fix: debian-changelog-line-too-long Fix lintian warnings: extra-license-file prepare changelog for upload Nicolas Dandrimont (2): Update my email address Update changelog --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git ___ 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] marionnet packaging branch, master, updated. debian/0.90.6+bzr434-1-2-g8efab85
The following commit has been merged in the master branch:
commit 8efab854404df485526492e38d9436ce7d8a
Author: Lucas Nussbaum lu...@debian.org
Date: Tue Jul 16 09:57:13 2013 +0200
Switch Architecture to linux-any as marionnet requires UML.
diff --git a/debian/control b/debian/control
index c874467..364ef32 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/marion
Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/marionnet.git
Package: marionnet
-Architecture: any
+Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends},
graphviz,
liblablgtk2-ocaml-dev (= 2.12.0-2),
--
marionnet 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] marionnet packaging branch, master, updated. debian/0.90.6+bzr434-1-3-ga353dfe
The following commit has been merged in the master branch:
commit a353dfe4c1d65a3dbb7d5819826953cda3deea10
Author: Lucas Nussbaum lu...@debian.org
Date: Tue Jul 16 10:16:22 2013 +0200
Switch Architecture to i386 amd64. user-mode-linux only works on those
architectures.
diff --git a/debian/control b/debian/control
index 364ef32..52b0817 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/marion
Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/marionnet.git
Package: marionnet
-Architecture: linux-any
+Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends},
graphviz,
liblablgtk2-ocaml-dev (= 2.12.0-2),
--
marionnet 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] marionnet packaging branch, master, updated. debian/0.90.6+bzr434-1-5-g9cf34d3
The following commit has been merged in the master branch:
commit 316fe2471e5340aaf7f9196f028d0e05a400e7f4
Author: Lucas Nussbaum lu...@debian.org
Date: Tue Jul 16 14:07:45 2013 +0200
Move startup checks to a separate script
diff --git a/debian/marionnet-prestart-checks b/debian/marionnet-prestart-checks
new file mode 100755
index 000..b0c8aa9
--- /dev/null
+++ b/debian/marionnet-prestart-checks
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+FS=$(ls /usr/share/marionnet/filesystems/ | grep -v '\.conf$' | wc -l)
+if [ ! \( -d /usr/share/marionnet/filesystems/ -a $FS -gt 0 -a -d
/usr/share/marionnet/kernels \) ]; then
+ cat -EOF
+ /!\\ No kernels/filesystems for marionnet found! /!\\
+ Marionnet will start with very limited functionality.
+
+ For more information about donwloading kernels and filesystems,
+ read /usr/share/doc/marionnet/README.Debian
+
+EOF
+fi
+if ps -C Xorg | grep -q -- '-nolisten tcp'; then
+ cat -EOF
+ /!\\ Xorg running with -nolisten tcp /!\\
+ It seems that Xorg is running with -nolisten tcp. You will not be able
+ to run graphical applications inside Marionnet virtual machines.
+
+ For more information about fixing your Xorg configuration,
+ read /usr/share/doc/marionnet/README.Debian
+
+EOF
+fi
diff --git a/debian/marionnet.init b/debian/marionnet.init
index d324957..f4bc128 100644
--- a/debian/marionnet.init
+++ b/debian/marionnet.init
@@ -69,28 +69,7 @@ do_stop()
# check for filesystems and kernels
startup_checks()
{
- FS=$(ls /usr/share/marionnet/filesystems/ | grep -v '\.conf$' | wc -l)
- if [ ! \( -d /usr/share/marionnet/filesystems/ -a $FS -gt 0 -a -d
/usr/share/marionnet/kernels \) ]; then
-cat -EOF
- /!\\ No kernels/filesystems for marionnet found! /!\\
- Marionnet will start with very limited functionality.
-
- For more information about donwloading kernels and filesystems,
- read /usr/share/doc/marionnet/README.Debian
-
-EOF
- fi
- if ps -C Xorg | grep -q -- '-nolisten tcp'; then
-cat -EOF
- /!\\ Xorg running with -nolisten tcp /!\\
- It seems that Xorg is running with -nolisten tcp. You will not be able
- to run graphical applications inside Marionnet virtual machines.
-
- For more information about fixing your Xorg configuration,
- read /usr/share/doc/marionnet/README.Debian
-
-EOF
- fi
+ /usr/share/marionnet/marionnet-prestart-checks
}
diff --git a/debian/marionnet.install b/debian/marionnet.install
index 5a31260..59b2f8e 100644
--- a/debian/marionnet.install
+++ b/debian/marionnet.install
@@ -1 +1,2 @@
useful-scripts/marionnet_from_scratch /usr/share/marionnet/
+debian/marionnet-prestart-checks /usr/share/marionnet/
--
marionnet 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] marionnet packaging branch, master, updated. debian/0.90.6+bzr434-1-5-g9cf34d3
The following commit has been merged in the master branch: commit 9cf34d3863432ba6155f5303dd8084c7c6cf95b1 Author: Lucas Nussbaum lu...@debian.org Date: Tue Jul 16 14:10:08 2013 +0200 Add marionnet service file diff --git a/debian/control b/debian/control index 52b0817..8eb6185 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,8 @@ Build-Depends: debhelper (= 8.0.0), ocaml-findlib, liblablgtk2-ocaml-dev (= 2.12.0-2), libocamlbricks-ocaml-dev (= 0.90+bzr367~), - liblablgtksourceview2-ocaml-dev (= 2.14.2) + liblablgtksourceview2-ocaml-dev (= 2.14.2), + dh-systemd (= 1.5) Standards-Version: 3.9.4 Homepage: http://www.marionnet.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/marionnet.git diff --git a/debian/marionnet.service b/debian/marionnet.service new file mode 100644 index 000..8d5b6a2 --- /dev/null +++ b/debian/marionnet.service @@ -0,0 +1,4 @@ +[Service] +Type=simple +ExecStart=/usr/sbin/marionnet-daemon +ExecStartPre=/usr/share/marionnet/marionnet-prestart-checks diff --git a/debian/rules b/debian/rules index 38e32b6..402078e 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ #export DH_VERBOSE=1 %: - dh $@ --with ocaml + dh $@ --with ocaml --with systemd override_dh_auto_build: cp -f po/messages.pot po/messages.pot.orig -- marionnet 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] marionnet packaging branch, master, updated. debian/0.90.6+bzr434-1-6-gbfbc3f3
The following commit has been merged in the master branch: commit bfbc3f3278deef2cc9023b29f1a6dd5cc6ea8b31 Author: Lucas Nussbaum lu...@debian.org Date: Tue Jul 16 14:40:14 2013 +0200 add description to service file diff --git a/debian/marionnet.service b/debian/marionnet.service index 8d5b6a2..c9729e5 100644 --- a/debian/marionnet.service +++ b/debian/marionnet.service @@ -1,3 +1,6 @@ +[Unit] +Description=marionnet daemon + [Service] Type=simple ExecStart=/usr/sbin/marionnet-daemon -- marionnet 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] marionnet packaging branch, master, updated. debian/0.90.6+bzr434-1-1-ga287db7
The following commit has been merged in the master branch:
commit a287db73f9b48cf3d3566f6247ebf45c7f2fed37
Author: Lucas Nussbaum lu...@debian.org
Date: Thu Jul 11 19:32:12 2013 +0200
add warning about -nolisten tcp in init script
diff --git a/debian/README.Debian b/debian/README.Debian
index 377ceaf..1919a91 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -21,10 +21,20 @@ To install the i386 libc on an amd64 system, as root, run:
apt-get update
apt-get install libc6:i386
-Running Marionnet on Ubuntu
-===
-lightdm starts X with '-nolisten tcp'. You need to allow TCP connections
-to the X server. Edit /etc/lightdm/lightdm.conf and add
+Allowing TCP connections to the X server
+
+Marionnet needs your X server to allow TCP connections, so that you
+can e.g. run wireshark inside virtual machines. If X is started with
+-nolisten tcp, then TCP connections to the X server are disabled.
+
+gdm3
+
+Edit /etc/gdm3/daemon.conf and make sure you have:
+ [security]
+ DisallowTCP = false
+
+lightdm (on Ubuntu)
+---
+Edit /etc/lightdm/lightdm.conf and add
xserver-allow-tcp=true
in the [SeatDefaults] section.
-[FIXME: the init script should check for that and issue a warning]
diff --git a/debian/marionnet.init b/debian/marionnet.init
index b2c9922..d324957 100644
--- a/debian/marionnet.init
+++ b/debian/marionnet.init
@@ -67,7 +67,7 @@ do_stop()
}
# check for filesystems and kernels
-check_for_filesystems()
+startup_checks()
{
FS=$(ls /usr/share/marionnet/filesystems/ | grep -v '\.conf$' | wc -l)
if [ ! \( -d /usr/share/marionnet/filesystems/ -a $FS -gt 0 -a -d
/usr/share/marionnet/kernels \) ]; then
@@ -77,6 +77,18 @@ check_for_filesystems()
For more information about donwloading kernels and filesystems,
read /usr/share/doc/marionnet/README.Debian
+
+EOF
+ fi
+ if ps -C Xorg | grep -q -- '-nolisten tcp'; then
+cat -EOF
+ /!\\ Xorg running with -nolisten tcp /!\\
+ It seems that Xorg is running with -nolisten tcp. You will not be able
+ to run graphical applications inside Marionnet virtual machines.
+
+ For more information about fixing your Xorg configuration,
+ read /usr/share/doc/marionnet/README.Debian
+
EOF
fi
}
@@ -84,7 +96,7 @@ EOF
case $1 in
start)
-check_for_filesystems
+startup_checks
[ $VERBOSE != no ] log_daemon_msg Starting $DESC $NAME
do_start
case $? in
--
marionnet 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] marionnet packaging branch, master, updated. upstream/0.90.6+bzr427-58-g99edf34
The following commit has been merged in the master branch: commit 98f84e165fe0f637d7ab8bc4cdb1a69d15d39f79 Merge: 305ddd994242082e14098c472367215a96663fce 45ce79833ef95afcfbd6497c0871b5c6e27f626e Author: Lucas Nussbaum lu...@debian.org Date: Wed Jul 10 08:41:14 2013 +0200 Merge tag 'upstream/0.90.6+bzr434' Upstream version 0.90.6+bzr434 -- marionnet 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] marionnet packaging branch, pristine-tar, updated. 4c348af252697ca958aead7b05a8ba5e632f97b4
The following commit has been merged in the pristine-tar branch: commit 4c348af252697ca958aead7b05a8ba5e632f97b4 Author: Lucas Nussbaum lu...@debian.org Date: Wed Jul 10 08:41:14 2013 +0200 pristine-tar data for marionnet_0.90.6+bzr434.orig.tar.gz diff --git a/marionnet_0.90.6+bzr434.orig.tar.gz.delta b/marionnet_0.90.6+bzr434.orig.tar.gz.delta new file mode 100644 index 000..1a38a47 Binary files /dev/null and b/marionnet_0.90.6+bzr434.orig.tar.gz.delta differ diff --git a/marionnet_0.90.6+bzr434.orig.tar.gz.id b/marionnet_0.90.6+bzr434.orig.tar.gz.id new file mode 100644 index 000..7740ae1 --- /dev/null +++ b/marionnet_0.90.6+bzr434.orig.tar.gz.id @@ -0,0 +1 @@ +6f55af10969ca5837645579026e2a8231b96aca2 -- marionnet 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] marionnet packaging branch, master, updated. upstream/0.90.6+bzr427-58-g99edf34
The following commit has been merged in the master branch: commit 99edf347210e0bb1a841d25af3ddc19711e7f01d Author: Lucas Nussbaum lu...@debian.org Date: Wed Jul 10 08:45:14 2013 +0200 Update changelog for r434. diff --git a/debian/changelog b/debian/changelog index 91740ae..bfe40b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -marionnet (0.90.6+bzr427-1) UNRELEASED; urgency=low +marionnet (0.90.6+bzr434-1) UNRELEASED; urgency=low [ Nicolas Dandrimont ] * New upstream snapshot @@ -8,11 +8,12 @@ marionnet (0.90.6+bzr427-1) UNRELEASED; urgency=low * Move to Standards-Version 3.9.4 (no changes) * Use canonical Vcs URIs * Add DEP-3 info to the patches + * Add multiarch instructions to run marionnet on amd64 [ Lucas Nussbaum ] * Add patch to add a --download-only option to marionnet_from_scratch. * Document how to install kernels and filesystems in README.Debian - * New upstream snapshot (r427). + * New upstream snapshot (r434). * Drop 0003-Hack-marionnet-from-scratch-to-download-only.patch: the idea was merged upstream. * Bump ocamlbricks dependency to r367. @@ -21,6 +22,7 @@ marionnet (0.90.6+bzr427-1) UNRELEASED; urgency=low - Display a warning when no kernels or filesystems are found. - Improve doc in README.Debian about kernels and filesystems. - Add depend on lsb-base. + * Add missing dependency on uml-utilities. -- Lucas Nussbaum lu...@debian.org Fri, 05 Jul 2013 16:37:05 +0200 -- marionnet 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] marionnet packaging branch, master, updated. upstream/0.90.6+bzr427-58-g99edf34
The following commit has been merged in the master branch: commit 62f28795db1d6b057ecb2ab70091d36875d66a99 Author: Lucas Nussbaum lu...@debian.org Date: Wed Jul 10 08:45:03 2013 +0200 Drop instructions about UBUNTU_MENUPROXY, a fix was included upstream. diff --git a/debian/README.Debian b/debian/README.Debian index c233630..377ceaf 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -23,12 +23,8 @@ To install the i386 libc on an amd64 system, as root, run: Running Marionnet on Ubuntu === -1) You need to: export UBUNTU_MENUPROXY=0 - before start Marionnet, or the icons on the left won't show up. -[FIXME: this should be turned into a patch] - -2) lightdm starts X with '-nolisten tcp'. You need to allow TCP connections - to the X server. Edit /etc/lightdm/lightdm.conf and add +lightdm starts X with '-nolisten tcp'. You need to allow TCP connections +to the X server. Edit /etc/lightdm/lightdm.conf and add xserver-allow-tcp=true in the [SeatDefaults] section. [FIXME: the init script should check for that and issue a warning] -- marionnet 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] marionnet packaging annotated tag, upstream/0.90.6+bzr434, created. upstream/0.90.6+bzr434
The annotated tag, upstream/0.90.6+bzr434 has been created at 93874ebf5e9167899abcbc712831ec37e97ef790 (tag) tagging 45ce79833ef95afcfbd6497c0871b5c6e27f626e (commit) replaces upstream/0.90.6+bzr427 tagged by Lucas Nussbaum on Wed Jul 10 08:41:14 2013 +0200 - Shortlog Upstream version 0.90.6+bzr434 Lucas Nussbaum (1): Imported Upstream version 0.90.6+bzr434 --- -- marionnet 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] marionnet packaging branch, master, updated. upstream/0.90.6+bzr427-59-g0cb3d2c
The following commit has been merged in the master branch: commit 0cb3d2c8d86cc4fd3d5132d39a3a834a96e7679d Author: Lucas Nussbaum lu...@debian.org Date: Wed Jul 10 10:07:52 2013 +0200 Prepare changelog for upload. diff --git a/debian/changelog b/debian/changelog index bfe40b0..4ba5a6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -marionnet (0.90.6+bzr434-1) UNRELEASED; urgency=low +marionnet (0.90.6+bzr434-1) unstable; urgency=low [ Nicolas Dandrimont ] * New upstream snapshot @@ -24,7 +24,7 @@ marionnet (0.90.6+bzr434-1) UNRELEASED; urgency=low - Add depend on lsb-base. * Add missing dependency on uml-utilities. - -- Lucas Nussbaum lu...@debian.org Fri, 05 Jul 2013 16:37:05 +0200 + -- Lucas Nussbaum lu...@debian.org Wed, 10 Jul 2013 10:07:33 +0200 marionnet (0.90.6+bzr407-1) unstable; urgency=low -- marionnet 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] marionnet packaging annotated tag, debian/0.90.6+bzr434-1, created. debian/0.90.6+bzr434-1
The annotated tag, debian/0.90.6+bzr434-1 has been created at 51f29b85d296e6ccf31ec5350dd8270ea2ad95e6 (tag) tagging 0cb3d2c8d86cc4fd3d5132d39a3a834a96e7679d (commit) replaces upstream/0.90.6+bzr434 tagged by Lucas Nussbaum on Wed Jul 10 10:08:26 2013 +0200 - Shortlog marionnet Debian release 0.90.6+bzr434-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUd0WejkUtTL0376ZAQo8sw/9GPXHXHf/CYws+9EajxZcE0pJFwyIS1ey vTxz8d4Kjcr9xQGpVMh0/gqOEn65PBaPRqZ2E2+LPiCqZELt4RMMY2ya9yBt8sv4 H7mzHcf7lUKF8QV8ICaQP6QISiR6d37+SkP131C/9+vkLcLwTtmtCQnZWTkHDTXe YiOsiy9ax2e5R71IInLFtAaFZ5c6dkG8ap6aZBhQL6WDO1ag5vAoxh7cfN7jzubP 27Tv3ruX1zbLfve7rmFS6f/V1KE/5fJn4MUwy1CZ2mrcoXd9CMUnfFaLUS+bp7Ya FpkHfopMaPrZGMkdMXcM1NXQoOQH6lVuwh2VxsPMbwNjhNfShbFSz/uDx5qWEF2/ 44j7ibyCuHK/1L9OtVYGuwWYBi9iCWzS0h8+3eX+pyZFAr1xLRuyIgpByvrtidj2 s7mCNPJ7c1r6nrppqG5XApg9S1NOvLvfsWaVoYbMSgzdlOw0sczPp7YInMZU6Thz aV+yFgX8fLmTu8VnYvuw1+lPoF5ryMWCMRGBBLiPOCApq5VF5n68hsTFiBBbMQf2 Mebwa0dDvzLnRhHCSOAWLn+skAKTLloCKPVOvsjDmjvfcaC3WGIJMAtvV0IX6ZqA vLJgiRBycA5Y4HN/fiyr6EemgkiuynE/seC/Q5tUv1FZdVW0GI+ljZ1ugr5Ar21v WtSxnUY5O4M= =lQ2t -END PGP SIGNATURE- Lucas Nussbaum (41): add basic debian/ dir generated by dh_make add patch to customize installation paths update patches one more patch... Merge tag 'upstream/0.90.6+bzr407' new upstream snapshot patch merged upstream + cleanup Fill-in copyright add ITP number, set distro to UNRELEASED Remove more templates Fix control add TODO file control fixes Add some build-depends Remove .bzr dir from future snapshots remove duplicate copyright file and rename binaries Update changelog, drop TODO file Add missing copyright info after first ftpmasters review. rework changelog Add more copyright info. Add patch to add a --download-only option to marionnet_from_scratch. Document how to install kernels and filesystems in README.Debian fix path for README.Debian Merge tag 'upstream/0.90.6+bzr427' New upstream snapshot. Drop 0003-Hack-marionnet-from-scratch-to-download-only.patch: the idea was merged upstream. Bump ocamlbricks dependency to r367. README.Debian does not need to be listed in debian/docs. Add init script. Improve init script to display a warning when no kernels or filesystems are found. Improve doc about kernels and filesystems. Update debian/changelog. Add depend on lsb-base. Fix lintian warnings about init script. Update changelog. Document issues on Ubuntu. Add missing dependency. Merge tag 'upstream/0.90.6+bzr434' Drop instructions about UBUNTU_MENUPROXY, a fix was included upstream. Update changelog for r434. Prepare changelog for upload. Nicolas Dandrimont (17): Add missing dependencies on graphviz and vde2 Update rules and d/clean to allow building twice from the same sourcedir Update changelog add meta.ml in the orig tarball Merge tag 'upstream/0.90.6+bzr421' Import new version Add myself to uploaders Bump ocamlbricks requirement update changelog Update saved files for new upstream snapshot Add bug closing info Move to Standards-Version 3.9.4 (no changes) Use canonical Vcs URIs Add DEP-3 info to the patches Don't list README.Debian in debian/docs Update changelog Add multiarch instructions to run marionnet on amd64 --- -- marionnet 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] marionnet packaging branch, master, updated. upstream/0.90.6+bzr427-54-g305ddd9
The following commit has been merged in the master branch: commit f841d5063adc6676c1452622726eae2cbb6b6096 Author: Lucas Nussbaum lu...@debian.org Date: Sun Jul 7 00:23:57 2013 +0200 Document issues on Ubuntu. diff --git a/debian/README.Debian b/debian/README.Debian index 6dba9a6..c233630 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -20,3 +20,15 @@ To install the i386 libc on an amd64 system, as root, run: dpkg --add-architecture i386 apt-get update apt-get install libc6:i386 + +Running Marionnet on Ubuntu +=== +1) You need to: export UBUNTU_MENUPROXY=0 + before start Marionnet, or the icons on the left won't show up. +[FIXME: this should be turned into a patch] + +2) lightdm starts X with '-nolisten tcp'. You need to allow TCP connections + to the X server. Edit /etc/lightdm/lightdm.conf and add + xserver-allow-tcp=true + in the [SeatDefaults] section. +[FIXME: the init script should check for that and issue a warning] -- marionnet 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] marionnet packaging branch, master, updated. upstream/0.90.6+bzr427-54-g305ddd9
The following commit has been merged in the master branch:
commit 305ddd994242082e14098c472367215a96663fce
Author: Lucas Nussbaum lu...@debian.org
Date: Sun Jul 7 00:24:07 2013 +0200
Add missing dependency.
diff --git a/debian/control b/debian/control
index d2daada..c874467 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends},
libocamlbricks-ocaml-dev (= 0.90+bzr367~),
liblablgtksourceview2-ocaml-dev (= 2.14.2),
vde2,
- lsb-base (= 3.2-14)
+ lsb-base (= 3.2-14),
+ uml-utilities
Description: Virtual network laboratory
Marionnet is a virtual network laboratory: it allows users to define,
configure and run complex computer networks without any need for physical
--
marionnet 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] ocamlbricks packaging branch, pristine-tar, updated. 3f5633d01de4ef6a4f63755fc15d5c1c8b6d33f6
The following commit has been merged in the pristine-tar branch: commit d159d1dc3c33900f2713a8831376e58faa6d26c7 Author: Lucas Nussbaum lu...@debian.org Date: Fri Jul 5 16:15:55 2013 +0200 pristine-tar data for ocamlbricks_0.90+bzr367.orig.tar.gz diff --git a/ocamlbricks_0.90+bzr367.orig.tar.gz.delta b/ocamlbricks_0.90+bzr367.orig.tar.gz.delta new file mode 100644 index 000..de8dfce Binary files /dev/null and b/ocamlbricks_0.90+bzr367.orig.tar.gz.delta differ diff --git a/ocamlbricks_0.90+bzr367.orig.tar.gz.id b/ocamlbricks_0.90+bzr367.orig.tar.gz.id new file mode 100644 index 000..a844f8c --- /dev/null +++ b/ocamlbricks_0.90+bzr367.orig.tar.gz.id @@ -0,0 +1 @@ +0ba812aa7030bca5bac0b452093c8564548e5133 -- ocamlbricks 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] ocamlbricks packaging branch, master, updated. debian/0.90+bzr367-1
The following commit has been merged in the master branch: commit c0b508792229069056eb3ac61e8c318f97b3b115 Merge: bb72de6a9488be2bd66c4334f82253728ea1e6bc 8085e709222a6dc8c36db9c903119e54874884b4 Author: Lucas Nussbaum lu...@debian.org Date: Fri Jul 5 16:16:41 2013 +0200 Merge tag 'upstream/0.90+bzr367' Upstream version 0.90+bzr367 -- ocamlbricks 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] ocamlbricks packaging branch, master, updated. debian/0.90+bzr367-1
The following commit has been merged in the master branch: commit 95ac43b237ee1b4c2700a0403674b9249ae1248a Author: Lucas Nussbaum lu...@debian.org Date: Fri Jul 5 16:30:00 2013 +0200 New upstream snapshot. diff --git a/debian/changelog b/debian/changelog index 0e5a8b1..e701e2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocamlbricks (0.90+bzr367-1) unstable; urgency=low + + * New upstream snapshot. + + -- Lucas Nussbaum lu...@debian.org Fri, 05 Jul 2013 16:29:21 +0200 + ocamlbricks (0.90+bzr365-1) unstable; urgency=low * New upstream snapshot from the trunk branch -- ocamlbricks 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] ocamlbricks packaging annotated tag, upstream/0.90+bzr367, updated. upstream/0.90+bzr367
The annotated tag, upstream/0.90+bzr367 has been updated to 3f2f6985789cfcaee0697c0d49ecdd89a6924c34 (tag) from dbf1555710227f24730b45f1a40859aeb1071113 (which is now obsolete) tagging 8085e709222a6dc8c36db9c903119e54874884b4 (commit) replaces upstream/0.90+bzr365 tagged by Lucas Nussbaum on Fri Jul 5 16:16:41 2013 +0200 - Shortlog Upstream version 0.90+bzr367 Lucas Nussbaum (1): Imported Upstream version 0.90+bzr367 --- -- ocamlbricks 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
