[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr427-52-g499909b

2013-07-06 Thread Nicolas Dandrimont
The following commit has been merged in the master branch:
commit 499909be19293e5ded3f3802db94c6b339518d31
Author: Nicolas Dandrimont nicolas.dandrim...@crans.org
Date:   Sat Jul 6 11:30:39 2013 +0200

Add multiarch instructions to run marionnet on amd64

diff --git a/debian/README.Debian b/debian/README.Debian
index 937bbf2..6dba9a6 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,3 +11,12 @@ You can:
 
 (2) Build your own kernel and filesystem. See
 
http://bazaar.launchpad.net/~marionnet-drivers/marionnet/trunk/files/head:/uml/
+
+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.
+
+To install the i386 libc on an amd64 system, as root, run:
+  dpkg --add-architecture i386
+  apt-get update
+  apt-get install libc6:i386

-- 
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] ocaml-csv packaging annotated tag, debian/1.3.0-1, created. debian/1.3.0-1

2013-07-06 Thread Lifeng Sun
The annotated tag, debian/1.3.0-1 has been created
at  0b33d2017c26ab1f7578984c19b3d0b49763d78a (tag)
   tagging  1a024916ee5a9fbf375e39671a3e9bb86d304384 (commit)
  replaces  debian/1.2.2-1
 tagged by  Stephane Glondu
on  Sat Jul 6 13:18:49 2013 +0200

- Shortlog 
ocaml-csv Debian release 1.3.0-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABCgAGBQJR1/0ZAAoJEHhT2k1JiBrTM1IP/12WwSGidc2Hc6Z+a2T4xPIo
qePQWomIOvXq3Ht6geyF7YVrdYkfSQojlb6I/YhTZKCaaBUfy73ty6/CVoECTwJi
qAJ5VH3v9Qy0xsiLXBUP7koczpSok/AzqoX3aEgP191lpVQG9f6eH+O+te8d+H5k
tFyz6upujyhApfdKgnXQ7ezjnVKryldNKjUMVrDLurB1ZSBgTl24NObsSlJM6Q2Y
ZDlK1QpHG32bj1/FhWG9vXZDRI44V8L3nZs5nfwwhYGh3kxeP5fHgyJb8Z/OWYQY
NGnrx9FUPBLzHO75l//EBmLhdSBUv0TxF8Q3obi81Me8+wHV4A5dj+jAvelPOEpZ
eBtFT07k1XL5QQqTHbwbop4nK0f2WsGXWrOW35rS+2LfW0DH/FBPlbBUMEaFndMH
9fEWXAkX+JUhhva2whhvA6tE4P89czKhL9Ofks6HRVb0fwqS/fmNqcZehZfr7ZR1
3Z7VAIh2cN5lUboO/E6UIBxXAAq2c2+Pg8ZK/RFMXk5LQNIg+hIPJrzBD5jOBJlL
yBYwAbw0EBoJbWu1qqX2gmizPZPEV+Udle/EkE661dSMXbyQ72tkJ9mIdH3GdiQO
tSAInDQKUs+nP8+zP2RAlhKg5J2sDNmfayehhWGGCnFvcCBaFeiyZoaNSyPim34M
2Lzo6BCcUC+gcYWxp2By
=8a1f
-END PGP SIGNATURE-

Lifeng Sun (12):
  Imported Upstream version 1.2.6
  Merge tag 'upstream/1.2.6'
  Add Lifeng Sun lifong...@gmail.com to uploaders.
  Fix csvtool installation.
  Imported Upstream version 1.3.0
  Merge tag 'upstream/1.3.0'
  Update debian/changelog.
  Canonical VCS-* fields.
  Update debian/changelog.
  Merge the last two changelog entries.
  Fix csvtool installation.
  debian/copyright: switch to dep5 format.

Sylvain Le Gall (1):
  Remove Sylvain Le Gall from uploaders

---

-- 
ocaml-csv 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] zed packaging branch, pristine-tar, updated. ddccb32e8a6a73370200a0740420161b6f7f356a

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the pristine-tar branch:
commit ddccb32e8a6a73370200a0740420161b6f7f356a
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 11:16:35 2013 +0800

pristine-tar data for zed_1.2.orig.tar.gz

diff --git a/zed_1.2.orig.tar.gz.delta b/zed_1.2.orig.tar.gz.delta
new file mode 100644
index 000..f805d59
Binary files /dev/null and b/zed_1.2.orig.tar.gz.delta differ
diff --git a/zed_1.2.orig.tar.gz.id b/zed_1.2.orig.tar.gz.id
new file mode 100644
index 000..50e76ab
--- /dev/null
+++ b/zed_1.2.orig.tar.gz.id
@@ -0,0 +1 @@
+9f1e82b270104fcb0f27e6a695cf00058b36dc78

-- 
zed 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] zed packaging branch, master, updated. upstream/1.1-18-gffdd812

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 2ab0841f27bcd177e83f81fa4841f2306046d3c7
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 19:55:59 2013 +0800

Bump debhelper compat to 9.

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 8342668..6be09b4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders:
  Nicolas Dandrimont nicolas.dandrim...@crans.org,
  Lifeng Sun lifong...@gmail.com
 Build-Depends:
- debhelper (= 8),
+ debhelper (= 9),
  dh-ocaml (= 0.9),
  libreact-ocaml-dev,
  libcamomile-ocaml-dev (= 0.8.0~),

-- 
zed 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] zed packaging branch, master, updated. upstream/1.1-18-gffdd812

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 2f17a76b6258709369a0c0bd827c64b7dd22dffe
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 11:22:21 2013 +0800

Remove 0001-make-ocamldoc-happy.patch: applied by upstream.

diff --git a/debian/patches/0001-make-ocamldoc-happy.patch 
b/debian/patches/0001-make-ocamldoc-happy.patch
deleted file mode 100644
index e0a4d09..000
--- a/debian/patches/0001-make-ocamldoc-happy.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Jeremie Dimino jere...@dimino.org
-Subject: make ocamldoc happy
-Origin: 
https://forge.ocamlcore.org/plugins/scmdarcs/cgi-bin/darcsweb.cgi?r=zed/zed;a=commitdiff;h=20110903094217-c41ad-e62a4940d43055ecdd65dab367035163654c4d54.gz
-

-diff -rN -u old-zed-darcs/src/zed_edit.mli new-zed-darcs/src/zed_edit.mli
 old-zed-darcs/src/zed_edit.mli 2011-09-03 13:30:50.0 +0200
-+++ new-zed-darcs/src/zed_edit.mli 2011-09-03 13:30:50.0 +0200
-@@ -401,8 +401,8 @@
- 
-   [Insert ch] is represented by insert(char) where [char] is:
- 
--  * a literal ascii character, such as a, b, ...
--  * a unicode character, written U+code, such as U+0041
-+  - a literal ascii character, such as a, b, ...
-+  - a unicode character, written U+ code , such as U+0041
-   *)
- 
- val name_of_action : action - string
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 65a9d2b..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-make-ocamldoc-happy.patch

-- 
zed 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] zed packaging branch, master, updated. upstream/1.1-18-gffdd812

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit a0fdb3ea887e2e5e8c4b4ff1d1c29a191d8d8ee5
Merge: 1e193a0bfbefbc4f4b004db614e4f0c7f4bdc88f 
4cecea9ebf6bb8eb8511b65650c22ddc2fa19e87
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 11:16:35 2013 +0800

Merge tag 'upstream/1.2'

Upstream version 1.2


-- 
zed 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] zed packaging branch, master, updated. upstream/1.1-18-gffdd812

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit ffdd812af61e69748126a7f2d4f9d5d77fa22a61
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 20:23:37 2013 +0800

Prepare upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 310c033..4497951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
-zed (1.2-1) UNRELEASED; urgency=low
+zed (1.2-1) unstable; urgency=low
 
-  [ Nicolas Dandrimont ]
   * Initial release. (Closes: #658584)
 
-  [ Lifeng Sun ]
-  * Add myself to Uploaders.
-
  -- Lifeng Sun lifong...@gmail.com  Sat, 06 Jul 2013 11:16:57 +0800
diff --git a/debian/copyright b/debian/copyright
index 5a8c279..161b5f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,8 @@ Copyright: Copyright (c) 2011 Jérémie Dimino 
jere...@dimino.org
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: Copyright (c) 2012 Nicolas Dandrimont nicolas.dandrim...@crans.org
+Copyright: 2012 Nicolas Dandrimont nicolas.dandrim...@crans.org
+   2013 Lifeng Sun lifong...@gmail.com
 License: BSD-3-clause
 
 License: BSD-3-clause

-- 
zed 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] zed packaging branch, master, updated. upstream/1.1-18-gffdd812

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 84ec51e4eef82992b0a61ad7e9277bfdb32d139b
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 19:55:05 2013 +0800

debian/control: Canonical VCS-* fields.

diff --git a/debian/control b/debian/control
index 76af639..8342668 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends:
 Standards-Version: 3.9.3
 Section: ocaml
 Homepage: http://forge.ocamlcore.org/projects/zed/
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/zed.git
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/zed.git
+Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/zed.git
+Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/zed.git
 
 Package: libzed-ocaml-dev
 Architecture: any

-- 
zed 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] zed packaging branch, master, updated. upstream/1.1-18-gffdd812

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 9cae3e6706dab06343bcd814554172765449e304
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 11:23:06 2013 +0800

libzed-ocaml-dev: install *.cmx files.

diff --git a/debian/libzed-ocaml-dev.install.in 
b/debian/libzed-ocaml-dev.install.in
index 6bc9dda..e46adbe 100644
--- a/debian/libzed-ocaml-dev.install.in
+++ b/debian/libzed-ocaml-dev.install.in
@@ -1,5 +1,6 @@
 usr/share/doc/libzed-ocaml-dev
 @OCamlStdlibDir@/zed/*.cmi
+@OCamlStdlibDir@/zed/*.cmx
 @OCamlStdlibDir@/zed/*.mli
 OPT: @OCamlStdlibDir@/zed/*.cmxa
 OPT: @OCamlStdlibDir@/zed/*.a

-- 
zed 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] zed packaging branch, master, updated. upstream/1.1-18-gffdd812

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 341cb10fe91a1efd21017666a355717ddda6231d
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 11:17:27 2013 +0800

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 1a3d1e3..310c033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
-zed (1.1-1) UNRELEASED; urgency=low
+zed (1.2-1) UNRELEASED; urgency=low
 
+  [ Nicolas Dandrimont ]
   * Initial release. (Closes: #658584)
 
- -- Nicolas Dandrimont nicolas.dandrim...@crans.org  Sun, 05 Feb 2012 
08:21:23 +0100
+  [ Lifeng Sun ]
+  * Add myself to Uploaders.
+
+ -- Lifeng Sun lifong...@gmail.com  Sat, 06 Jul 2013 11:16:57 +0800
diff --git a/debian/control b/debian/control
index 2b65576..76af639 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,9 @@
 Source: zed
 Priority: optional
 Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
-Uploaders: Nicolas Dandrimont nicolas.dandrim...@crans.org
+Uploaders:
+ Nicolas Dandrimont nicolas.dandrim...@crans.org,
+ Lifeng Sun lifong...@gmail.com
 Build-Depends:
  debhelper (= 8),
  dh-ocaml (= 0.9),

-- 
zed 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] zed packaging branch, master, updated. upstream/1.1-18-gffdd812

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 0952b3758c365879341ebfec27812805507eab5c
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 19:56:23 2013 +0800

Bump Standards-Version to 3.9.4.

diff --git a/debian/control b/debian/control
index 6be09b4..b46ee64 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  libcamomile-ocaml-dev (= 0.8.0~),
  ocaml-findlib,
  ocaml-nox (= 3.12.0~)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Section: ocaml
 Homepage: http://forge.ocamlcore.org/projects/zed/
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/zed.git

-- 
zed 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] zed packaging annotated tag, upstream/1.2, created. upstream/1.2

2013-07-06 Thread Lifeng Sun
The annotated tag, upstream/1.2 has been created
at  cc650c46ca7d9f4e64149f50bd5b868ae3f04cd1 (tag)
   tagging  4cecea9ebf6bb8eb8511b65650c22ddc2fa19e87 (commit)
  replaces  upstream/1.1
 tagged by  Lifeng Sun
on  Sat Jul 6 11:16:35 2013 +0800

- Shortlog 
Upstream version 1.2

Lifeng Sun (1):
  Imported Upstream version 1.2

---

-- 
zed 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] lambda-term packaging branch, master, updated. upstream/1.1-12-g36b8346

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 36b8346f14b7501ad547d6857b93c9d67c8912ff
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 20:37:27 2013 +0800

Update debian/changelog.

diff --git a/debian/changelog b/debian/changelog
index f6929a0..9f38cb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
-lambda-term (1.4-1) UNRELEASED; urgency=low
+lambda-term (1.4-1) unstable; urgency=low
 
-  [ Nicolas Dandrimont ]
   * Initial release. (Closes: #658596)
 
-  [ Lifeng Sun ]
-  * Add myself to Uploaders.
-
  -- Lifeng Sun lifong...@gmail.com  Sat, 06 Jul 2013 11:05:33 +0800

-- 
lambda-term 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] lambda-term packaging branch, master, updated. upstream/1.1-12-g36b8346

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 014a12f925dcbb35a88fe89f09f4a9a0f922b21e
Merge: 4e8169a9d5f26d4ee94e54137c85d803bedb0519 
9c0e4c5c483da27b622dabab3f62450d5488b94d
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 11:05:29 2013 +0800

Merge tag 'upstream/1.4'

Upstream version 1.4


-- 
lambda-term 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] lambda-term packaging branch, master, updated. upstream/1.1-12-g36b8346

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 88ff426d91e70656283b094039509327bc30f7d0
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 20:35:54 2013 +0800

debian/control: Canonical VCS-* fields.

diff --git a/debian/control b/debian/control
index 4c8a5a4..721734d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends:
 Standards-Version: 3.9.2
 Section: ocaml
 Homepage: http://forge.ocamlcore.org/projects/lambda-term/
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/lambda-term.git
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/lambda-term.git
+Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/lambda-term.git
+Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/lambda-term.git
 
 Package: liblambda-term-ocaml-dev
 Architecture: any

-- 
lambda-term 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] lambda-term packaging branch, master, updated. upstream/1.1-12-g36b8346

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 52a307c88f77ff97a4fd534a13c265888067190d
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 20:36:24 2013 +0800

Bump debhelper compat to 9.

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index a5f2542..f3df4c6 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders:
  Nicolas Dandrimont nicolas.dandrim...@crans.org,
  Lifeng Sun lifong...@gmail.com
 Build-Depends:
- debhelper (= 8.0.0~),
+ debhelper (= 9),
  dh-ocaml (= 0.9),
  liblwt-ocaml-dev (= 2.3.0~),
  libzed-ocaml-dev (= 1.1~),

-- 
lambda-term 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] lambda-term packaging branch, master, updated. upstream/1.1-12-g36b8346

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 8cd6e07806be2e026f622d333cc819126d7fd920
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 20:35:18 2013 +0800

Add myself to Uploaders.

diff --git a/debian/control b/debian/control
index 47c1482..4c8a5a4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,9 @@
 Source: lambda-term
 Priority: optional
 Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
-Uploaders: Nicolas Dandrimont nicolas.dandrim...@crans.org
+Uploaders:
+ Nicolas Dandrimont nicolas.dandrim...@crans.org,
+ Lifeng Sun lifong...@gmail.com
 Build-Depends:
  debhelper (= 8.0.0~),
  dh-ocaml (= 0.9),

-- 
lambda-term 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] lambda-term packaging branch, pristine-tar, updated. 35c7ad256459e5425a2cd97000d6b1c43b40734b

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the pristine-tar branch:
commit 35c7ad256459e5425a2cd97000d6b1c43b40734b
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 11:05:29 2013 +0800

pristine-tar data for lambda-term_1.4.orig.tar.gz

diff --git a/lambda-term_1.4.orig.tar.gz.delta 
b/lambda-term_1.4.orig.tar.gz.delta
new file mode 100644
index 000..2a7e22a
Binary files /dev/null and b/lambda-term_1.4.orig.tar.gz.delta differ
diff --git a/lambda-term_1.4.orig.tar.gz.id b/lambda-term_1.4.orig.tar.gz.id
new file mode 100644
index 000..e6a5288
--- /dev/null
+++ b/lambda-term_1.4.orig.tar.gz.id
@@ -0,0 +1 @@
+715cac8325229d45329ccce33f33794ef578d343

-- 
lambda-term 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] lambda-term packaging branch, master, updated. upstream/1.1-12-g36b8346

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 9826078cf59259d239000e8d690efa2997d76305
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 11:25:06 2013 +0800

liblambda-term-ocaml-dev: install *.cmx files.

diff --git a/debian/liblambda-term-ocaml-dev.install.in 
b/debian/liblambda-term-ocaml-dev.install.in
index 3be7912..b823fce 100644
--- a/debian/liblambda-term-ocaml-dev.install.in
+++ b/debian/liblambda-term-ocaml-dev.install.in
@@ -1,5 +1,6 @@
 usr/share/doc/liblambda-term-ocaml-dev
 @OCamlStdlibDir@/lambda-term/*.cmi
 @OCamlStdlibDir@/lambda-term/*.mli
+@OCamlStdlibDir@/lambda-term/*.cmx
 OPT: @OCamlStdlibDir@/lambda-term/*.cmxa
 OPT: @OCamlStdlibDir@/lambda-term/*.a

-- 
lambda-term 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] lambda-term packaging branch, master, updated. upstream/1.1-12-g36b8346

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 9677f7cd7bfa327bb79878fed3a31618422282c3
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 11:06:20 2013 +0800

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 1c521c9..f6929a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
-lambda-term (1.1-1) UNRELEASED; urgency=low
+lambda-term (1.4-1) UNRELEASED; urgency=low
 
+  [ Nicolas Dandrimont ]
   * Initial release. (Closes: #658596)
 
- -- Nicolas Dandrimont nicolas.dandrim...@crans.org  Sat, 03 Sep 2011 
15:09:58 +0200
+  [ Lifeng Sun ]
+  * Add myself to Uploaders.
+
+ -- Lifeng Sun lifong...@gmail.com  Sat, 06 Jul 2013 11:05:33 +0800

-- 
lambda-term 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] lambda-term packaging branch, master, updated. upstream/1.1-12-g36b8346

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 3d0a3488a7ca2a43e55158028292e25a48ad3067
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 20:36:04 2013 +0800

Bump Standards-Version to 3.9.4.

diff --git a/debian/control b/debian/control
index 721734d..a5f2542 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  libzed-ocaml-dev (= 1.1~),
  ocaml-findlib,
  ocaml-nox (= 3.12.0~)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Section: ocaml
 Homepage: http://forge.ocamlcore.org/projects/lambda-term/
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/lambda-term.git

-- 
lambda-term packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] ocaml-csv packaging branch, master, updated. debian/1.3.0-1-1-ga01d830

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit a01d83083bb95e52c79df381ed4c9001960f6f41
Author: Lifeng Sun lifong...@gmail.com
Date:   Sat Jul 6 20:18:43 2013 +0800

Install bytecode csvtool on non-native arches.

diff --git a/debian/changelog b/debian/changelog
index 5cedb8f..e200df1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-csv (1.3.0-2) unstable; urgency=low
+
+  * Install bytecode csvtool on non-native arches.
+
+ -- Lifeng Sun lifong...@gmail.com  Sat, 06 Jul 2013 20:18:57 +0800
+
 ocaml-csv (1.3.0-1) unstable; urgency=low
 
   [ Sylvain Le Gall ]
diff --git a/debian/rules b/debian/rules
index 753e9f8..9113007 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,9 @@ override_dh_auto_configure:
 .PHONY: override_dh_auto_build
 override_dh_auto_build: debian/csvtool.1
ocaml setup.ml -build
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
mv -f _build/examples/csvtool.native _build/examples/csvtool
+endif
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:

-- 
ocaml-csv packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] ocaml-csv packaging annotated tag, debian/1.3.0-2, created. debian/1.3.0-2

2013-07-06 Thread Lifeng Sun
The annotated tag, debian/1.3.0-2 has been created
at  c12b3cc5f3cee1d27659264e6c6d2fc23900d1ea (tag)
   tagging  a01d83083bb95e52c79df381ed4c9001960f6f41 (commit)
  replaces  debian/1.3.0-1
 tagged by  Stephane Glondu
on  Sat Jul 6 19:16:32 2013 +0200

- Shortlog 
ocaml-csv Debian release 1.3.0-2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABCgAGBQJR2FDwAAoJEHhT2k1JiBrTz+8P/2Ia/7fO2KPffqt8ECttdxoA
pIGbKy48gehet7avebqfu6nTb6B7NvV8cD3hHftzBL0CtR8jYpRpUIQHVUuQSUZg
0RUQYM5SAAcUB35veyKuaOVJ6eh6mSzvN5rgAO+1tAa7pNEgX3mbJr/YtB6f8jjD
8DMYSWaqUuNIvRXVzZgotOUvOtoC51P1QtCImiRct//p+nLgb1mtZZr+/Hfm2zVf
bJbdkfn0UkBiDAzEnw+P46776Aqzs5NrCaLF8C4wId0jNAYhC9UFNPpOJHBseonS
+ho2mCI6/eJebURutImQD4R2C5iioVjnq2+FE2e+78I47QdTh6BAuPJG1PCpl0ER
rvq+gaOm2GkKONlM9UuSP6WX1bcnuwrMwcik3x9EbJ1ZnyBAfND08iZgOEkNUo9Y
FqILQMutJUBke4Hak2TP1kLStxemn7K3/thU0YDW/o2cRdh6iI+2jQFyNeziWApd
XOlSKVEoMrjFIG/tcWUCM0JDYKvLnKqTGim8Wt8ImvpytpSSVv3e3AnikSIthqxQ
mbBqoo8kNObcOV7W6rZ0/5g0zFOFcyoE8LT5yvehuX0OkWo1oJ+h4o1O/gfSgA/K
Uec9Rvd3tlMvLWJnbYWt/ySLzN6/WUBw1WEghSGWiFBHWnHVUBzhLbwJyc5eKn3V
cXkS2BKGEb8CKCPBt/SR
=g+RB
-END PGP SIGNATURE-

Lifeng Sun (1):
  Install bytecode csvtool on non-native arches.

---

-- 
ocaml-csv 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

2013-07-06 Thread Lucas Nussbaum
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

2013-07-06 Thread Lucas Nussbaum
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] ocaml-csv packaging branch, master, updated. debian/1.3.0-2-1-g3a86091

2013-07-06 Thread Lifeng Sun
The following commit has been merged in the master branch:
commit 3a860910a2afc5d636e94d3559b53a4998af5d80
Author: Lifeng Sun lifong...@gmail.com
Date:   Sun Jul 7 12:00:54 2013 +0800

Fix csvtool installation on non-native arches.

diff --git a/debian/changelog b/debian/changelog
index e200df1..a5c79b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-csv (1.3.0-3) unstable; urgency=low
+
+  * Fix csvtool installtion on non-native arches.
+
+ -- Lifeng Sun lifong...@gmail.com  Sun, 07 Jul 2013 11:59:08 +0800
+
 ocaml-csv (1.3.0-2) unstable; urgency=low
 
   * Install bytecode csvtool on non-native arches.
diff --git a/debian/rules b/debian/rules
index 9113007..1b960a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,8 @@ override_dh_auto_build: debian/csvtool.1
ocaml setup.ml -build
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
mv -f _build/examples/csvtool.native _build/examples/csvtool
+else
+   mv -f _build/examples/csvtool.byte _build/examples/csvtool
 endif
 
 .PHONY: override_dh_auto_test

-- 
ocaml-csv 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