[Pkg-ocaml-maint-commits] [SCM] zed packaging branch, master, updated. upstream/1.1-18-gffdd812
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
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
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
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
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
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
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
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
