[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
