[Pkg-ocaml-maint-commits] [SCM] hol-light packaging annotated tag, debian/20120602-1, created. debian/20120602-1
The annotated tag, debian/20120602-1 has been created at 40c4ed43ed4fbf1f9966024f0b958b26fb857200 (tag) tagging 1b178e5e97d09de4a500ccf103454e315a067ddc (commit) replaces debian/20120530-1 tagged by Stephane Glondu on Tue Jun 12 08:09:11 2012 +0200 - Shortlog Debian release 20120602-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJP1t0HAAoJEHhT2k1JiBrTwt8QAK+fQng6Hqsi9YZBVarMGuEp 6TqRzF3A+DuPjY/T69Eqp6sRw561iA0ILJ05QHzvLNZa0GCu/I8fOtJIe/PcGHA0 rP+AXEDaf+dZxQ/BFYrZzmr2GrawXQE+KPsL7j7kbA3DVnqOV9CovuvPG3ynLz/R BZvu98EBgILpNMps1/r7T/kmZLj9SN/4uevV6/uYQ+4cegFODZwjBZIqfHwUvlU6 QBbLSkr6AaOpo+hLvxr5ltyvNGrPyvi3ULdVO5YrGUAUNeDN2wQQ8KKsfFJEdIDT NagdOqaXN3+FwrNiRPfkZ+GRaJhakEV8R5CesMWljO6WaTRJWagNuU2mogAZ8yXi 6uWwMLq/zMDcds3FZF2MWfizpJZhVc7VQapTdCK/6lV8Fnn5IHeKreQkXszIDRw5 yF5oHUatrjmK6Z1zIycEF6r7S8yyhCVnIt4IGVEHqNUD7NxvNQXgP+Vp6hvHFaWg Bj6ph5aneIj+o0f1EQlWQxDAWUPE2ljm9R3kh5Y+PROAih9ZxTkXNWcNIWGTkRIN cPB7GwuAsE6/MnMa7mpJE1ChsxOFxn+eltbGYjNnpAFDviljnVPwuoehaivZ7gxM +9+YUX/gZLyhmQk82arAX9fcbtHIheroIs9Lx6XTxBaPzKwcq0vtqaA2dZoF6AwS gji3xyNs4rs41WnUV/BP =VRSP -END PGP SIGNATURE- Hendrik Tews (5): unapply debian patches, remove holtest-dependency-hint patch Imported Upstream version 20120602 Merge tag 'upstream/20120602' update changelog refresh patch holtest-no-proof-recording --- -- hol-light 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] eliom packaging annotated tag, debian/2.2.2-1, created. debian/2.2.2-1
The annotated tag, debian/2.2.2-1 has been created at 2a3c746cc252ef00b0970bc23c26b79ad732afe0 (tag) tagging 2a7a63322eff3a43d83e5843aa37f772a00e1e5f (commit) replaces debian/2.1.1b-3 tagged by Stephane Glondu on Tue Jun 12 08:17:27 2012 +0200 - Shortlog Debian release 2.2.2-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJP1t73AAoJEHhT2k1JiBrTXfAP/RSwUbmZEKnEoOmN6WdFGBKd M9YYszW59UubTie3kW7nstVFl/eCpLTbpMhUUcOy2g8bryIRN8uh1JH78OD0F/uM 3NpKSyMquA2wylO7fR93smqdLyhbHPnw9+sVP3zR7xhadU9HeTCyS/T5czjb6NPU +m+9AK+9jNzqGjnEKMVLpca04EPZUAzYO13WzeguMmAc1tUKKjdSJWp17vB2T8Zy qsE8EIdSOsjUJITBoYN8nAp5dwoIi2lR1uIaZweQfcqXRhQCLQ3VC9HM3nTlkcH+ sXrm3Kt70qt7iVuDDz7bmgPSzNpFVBIUwn/WdejK751mFMDzZ6g2Ebns6KHRsjyE z5ZK7mrMTQlBoRj1qQFZeyRrcYk0ZxO+Pe7NQEbU1iR4yU1sh81tRmcF3yO0Eu9b zxQs+P2x91/Z2TG1diyItbcaA7vicJN0Yz4joHMx5UCMhezhqiMmg6gZpE2PHr11 Y5SU3lXl1RuX5ZwPphTODwuhQ6ekka7jSau8A1+NbmzDIbA0/jRJCxtKTAkov9ij TfU9/pCmD/PMNtnHrYA1h9J2mBnwx1qfKmnRB9yj5PHRWDMB5yPB7Mii00Wpe9P1 UxlDkWPvaDsV0pGkP+R55If8bcOZqiyeOlgXwIHO85Pq+cvenF6C5B/Erlr0y7Ya TsoaYQWdWfy8v9dJ+3Oj =yuke -END PGP SIGNATURE- Stephane Glondu (10): Force leading digit in version in d/watch Imported Upstream version 2.2 Imported Upstream version 2.2.1 Imported Upstream version 2.2.2 Merge tag 'upstream/2.2.2' New upstream release All patches have been applied upstream Bump build-dependencies chmod +x configure Prepare upload to unstable --- -- eliom 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] lablgtk2 packaging annotated tag, debian/2.14.2+dfsg-3, created. debian/2.14.2+dfsg-3
The annotated tag, debian/2.14.2+dfsg-3 has been created at a51292a7dc3dd769278c44cd2306ed473bb0ca4d (tag) tagging fff3a45d9a05aa50ae542c417baef0cbbc75dc27 (commit) replaces debian/2.14.2+dfsg-2 tagged by Stephane Glondu on Tue Jun 12 08:57:34 2012 +0200 - Shortlog Debian release 2.14.2+dfsg-3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJP1uheAAoJEHhT2k1JiBrTb7QP/12FxeThEAtU+HmWdi3OB+ny CmxTg6bK+lMyDy3f4iGzx7O1hZkD5zd2fMW3nzHzABY0ZfQhe8jcRqPe9tdpLqLy 9ad2F0ObCXwrBUuuxsT1Sz0Ed6Jrek1JCy0pxQLQSTajmUgOjV+iF/9ZKZWgo/G7 sUABahWFx3uKKJjxo75WGzjLT2wtGs+HoHxksyN7xVCDP2AMvPX3KIVpo2no5OtQ J+h6tnPz69j2iBJX7PE8KNWTjKghYHdRTxESX+e7l2meHiVglmn5xW2I4dGg6WuK yadXfXZ4VWKdwkt0yRRU+8547IVM3PRYP+qDlQ9Af6PFGU2jYHuKH3IzRjgtlOW6 inQyAcWk3UMIUCT0K16GN0hI/Wn50uPeIeePTGooccSvsPlC5KyGNeZ1JnNIVXY9 ad91hUm654HAgknSmd7bUFzh1CyayiAXP2ARCTydisxHd3xeevAFXLOYmcYeaHWt LBvWHbZcpBl0OKIGTv9jEzhmvkDFIaScLX/x0QRgQVCvJz0nx5dIN+jSkCLSn2Xo /RMwRGkTthIDPsAZo72ZuFzRM3lll/NRj2W590XsqMPllbHMCE43gJ43PVXt3dxP 6iWN0wkV2g/+H5rYrBfFHT4/iFzVeFFCIKDIiRbEI7eNqAu9KfjCIJ0UnQmfsDnY CjI1q0a/DPCdmOtVD1v4 =DcS2 -END PGP SIGNATURE- Stephane Glondu (3): Update version in META files (Closes: #673835) Bump Standards-Version to 3.9.3 Update changelog and prepare upload to unstable --- -- lablgtk2 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] lablgtk2 packaging branch, master, updated. debian/2.14.2+dfsg-3
The following commit has been merged in the master branch: commit 71d05be681489bd0352b77226bdab23c8958838b Author: Stephane Glondu st...@glondu.net Date: Tue Jun 12 08:05:51 2012 +0200 Update version in META files (Closes: #673835) diff --git a/debian/META b/debian/META index 539254a..e8b46a6 100644 --- a/debian/META +++ b/debian/META @@ -1,4 +1,4 @@ -version=2.14.0 +version=2.14.2 requires(mt) = threads requires(mt,mt_vm) = threads.vm requires(mt,mt_posix) = threads.posix diff --git a/debian/META.lablgtk2-gl b/debian/META.lablgtk2-gl index 63f2186..1358ae9 100644 --- a/debian/META.lablgtk2-gl +++ b/debian/META.lablgtk2-gl @@ -1,4 +1,4 @@ -version=2.14.0 +version=2.14.2 directory=+lablgtk2 requires = lablgtk2 diff --git a/debian/META.lablgtk2-gnome b/debian/META.lablgtk2-gnome index 2b3d6f8..a5a6163 100644 --- a/debian/META.lablgtk2-gnome +++ b/debian/META.lablgtk2-gnome @@ -1,4 +1,4 @@ -version=2.14.0 +version=2.14.2 directory=+lablgtk2 requires = lablgtk2 diff --git a/debian/META.lablgtksourceview2 b/debian/META.lablgtksourceview2 index 1ea2816..f1c0c35 100644 --- a/debian/META.lablgtksourceview2 +++ b/debian/META.lablgtksourceview2 @@ -1,4 +1,4 @@ -version=2.14.0 +version=2.14.2 directory=+lablgtk2 requires = lablgtk2 -- lablgtk2 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] lablgtk2 packaging branch, master, updated. debian/2.14.2+dfsg-3
The following commit has been merged in the master branch: commit 58fb3cf329fdb1bf8f3314eee3d9578c5eaa904b Author: Stephane Glondu st...@glondu.net Date: Tue Jun 12 08:08:27 2012 +0200 Bump Standards-Version to 3.9.3 diff --git a/debian/control b/debian/control index f15660f..5802abb 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: libgtkspell-dev, libgnomeui-dev, libgtksourceview2.0-dev (= 2.10) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/lablgtk2.git -- lablgtk2 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] mlpost packaging branch, master, updated. debian/0.8.1-2-3-g915ed01
The following commit has been merged in the master branch:
commit c965a573078a885839c2d9c6ecf1350ba66dd64a
Author: Mehdi Dogguy me...@debian.org
Date: Tue Jun 12 15:19:19 2012 +0200
Fully qualify name of input'ed files
diff --git a/debian/changelog b/debian/changelog
index 29a0055..786d9dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mlpost (0.8.1-3) UNRELEASED; urgency=low
+
+ * Since context (= 2012.05.23.20120524-1), mp-tool.mp and mp-spec.mp
+are no longer provided. Instead, context provide .mpii and .mpiv files.
+- add 0005-Fully-qualify-name-of-input-ed-files.patch
+- {build-,}depend on context (= 2012.05.23.20120524-1~)
+(Closes: #676116, #676127).
+
+ -- Mehdi Dogguy me...@debian.org Tue, 12 Jun 2012 15:01:00 +0200
+
mlpost (0.8.1-2) unstable; urgency=low
* Set OCAMLFIND_DESTDIR at configure time, so that the paths compiled
diff --git a/debian/control b/debian/control
index 96fd2c3..9d0d5ac 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
ocaml-findlib,
ocaml-nox (= 3.11.1-3~)
Build-Depends-Indep:
- context,
+ context (= 2012.05.23.20120524-1~),
texlive-latex-base,
texlive-latex-recommended,
texlive-metapost,
@@ -26,7 +26,7 @@ Vcs-Git:
git://git.debian.org/git/pkg-ocaml-maint/packages/mlpost.git
Package: mlpost
Architecture: any
Depends:
- context,
+ context (= 2012.05.23.20120524-1~),
texlive-latex-base,
texlive-latex-recommended,
texlive-metapost,
@@ -64,7 +64,7 @@ Recommends:
libmlpost-ocaml-doc,
ocaml-findlib
Suggests:
- context,
+ context (= 2012.05.23.20120524-1~),
texlive-latex-base,
texlive-latex-recommended,
texlive-metapost,
diff --git a/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch
b/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch
index 2946250..8c3d8cf 100644
--- a/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch
+++ b/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch
@@ -1,6 +1,6 @@
From: Stephane Glondu st...@glondu.net
Date: Fri, 21 May 2010 15:53:08 +0200
-Subject: [PATCH] Do not remove ocamlbuild.Makefile
+Subject: Do not remove ocamlbuild.Makefile
This file is present in upstream tarball; do not remove it so that the
tree is in the same state as freshly unpacked after distclean.
@@ -8,7 +8,7 @@ tree is in the same state as freshly unpacked after distclean.
Signed-off-by: Stephane Glondu st...@glondu.net
---
ocamlbuild.Makefile |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ocamlbuild.Makefile b/ocamlbuild.Makefile
index ef32e7d..f8ee8ec 100644
diff --git a/debian/patches/0002-Create-man-dir-before-installing-into-it.patch
b/debian/patches/0002-Create-man-dir-before-installing-into-it.patch
index 0fad413..c132a04 100644
--- a/debian/patches/0002-Create-man-dir-before-installing-into-it.patch
+++ b/debian/patches/0002-Create-man-dir-before-installing-into-it.patch
@@ -1,11 +1,11 @@
From: Stephane Glondu st...@glondu.net
Date: Fri, 21 May 2010 17:16:12 +0200
-Subject: [PATCH] Create man dir before installing into it
+Subject: Create man dir before installing into it
Signed-off-by: Stephane Glondu st...@glondu.net
---
Makefile.in |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 07301a8..d4e835e 100644
diff --git a/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch
b/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch
index 56c4aec..8d70b95 100644
--- a/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch
+++ b/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch
@@ -1,11 +1,11 @@
From: Stephane Glondu st...@glondu.net
Date: Sat, 22 May 2010 21:27:27 +0200
-Subject: [PATCH] Fix hyphen escapes in manpage
+Subject: Fix hyphen escapes in manpage
Signed-off-by: Stephane Glondu st...@glondu.net
---
mlpost.1 | 12 ++--
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/mlpost.1 b/mlpost.1
index b41ec62..11afcb7 100644
diff --git
a/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
b/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
index b00352c..a711aeb 100644
--- a/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
+++ b/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
@@ -1,11 +1,11 @@
From: Stephane Glondu st...@glondu.net
Date: Sat, 22 May 2010 22:29:34 +0200
-Subject: [PATCH] myocamlmacroparser: use .byte instead of .native
+Subject: myocamlmacroparser: use .byte instead of .native
Signed-off-by: Stephane Glondu st...@glondu.net
---
myocamlbuild.ml.in |4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/myocamlbuild.ml.in
[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. debian/0.8.1-2-3-g915ed01
The following commit has been merged in the master branch:
commit 9ce9ca5ccba3b6d6b6dd0ba7d88ce813c7d138c7
Author: Mehdi Dogguy me...@debian.org
Date: Tue Jun 12 15:19:55 2012 +0200
Use Breaks instead of Conflicts with mlpost ( 0.8.1).
diff --git a/debian/changelog b/debian/changelog
index 786d9dd..9f18a39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mlpost (0.8.1-3) UNRELEASED; urgency=low
- add 0005-Fully-qualify-name-of-input-ed-files.patch
- {build-,}depend on context (= 2012.05.23.20120524-1~)
(Closes: #676116, #676127).
+ * Use Breaks instead of Conflicts with mlpost ( 0.8.1).
-- Mehdi Dogguy me...@debian.org Tue, 12 Jun 2012 15:01:00 +0200
diff --git a/debian/control b/debian/control
index 9d0d5ac..8c25d4f 100644
--- a/debian/control
+++ b/debian/control
@@ -72,7 +72,7 @@ Suggests:
ghostscript,
imagemagick
Replaces: mlpost ( 0.8.1)
-Conflicts: mlpost ( 0.8.1)
+Breaks: mlpost ( 0.8.1)
Description: Objective Caml interface to Metapost (library)
Mlpost is an OCaml library for scientific drawing. It relies on
Metapost, giving the possibility to include (La)TeX fragments.
@@ -89,7 +89,7 @@ Architecture: all
Depends: ${misc:Depends}
Enhances: libmlpost-ocaml-dev
Replaces: mlpost ( 0.8.1)
-Conflicts: mlpost ( 0.8.1)
+Breaks: mlpost ( 0.8.1)
Description: Objective Caml interface to Metapost (doc)
Mlpost is an OCaml library for scientific drawing. It relies on
Metapost, giving the possibility to include (La)TeX fragments.
--
mlpost 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] mlpost packaging branch, master, updated. debian/0.8.1-2-3-g915ed01
The following commit has been merged in the master branch:
commit 915ed013d975a1275fc99de82605b91dc77bd518
Author: Mehdi Dogguy me...@debian.org
Date: Tue Jun 12 15:22:18 2012 +0200
Bump Standards-Version to 3.9.3 (no changes)
diff --git a/debian/changelog b/debian/changelog
index 9f18a39..49fc053 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mlpost (0.8.1-3) UNRELEASED; urgency=low
- {build-,}depend on context (= 2012.05.23.20120524-1~)
(Closes: #676116, #676127).
* Use Breaks instead of Conflicts with mlpost ( 0.8.1).
+ * Bump Standards-Version to 3.9.3 (no changes)
-- Mehdi Dogguy me...@debian.org Tue, 12 Jun 2012 15:01:00 +0200
diff --git a/debian/control b/debian/control
index 8c25d4f..117a36d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends-Indep:
texlive-metapost,
ghostscript,
imagemagick
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
Section: tex
Homepage: http://mlpost.lri.fr/
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mlpost.git
--
mlpost 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] mlpost packaging branch, master, updated. debian/0.8.1-2-4-g191f9dd
The following commit has been merged in the master branch: commit 191f9dd2ccf9d8b72a5a112e899bbaaf414d Author: Mehdi Dogguy me...@debian.org Date: Tue Jun 12 18:12:17 2012 +0200 Release to unstable diff --git a/debian/changelog b/debian/changelog index 49fc053..cbe901d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -mlpost (0.8.1-3) UNRELEASED; urgency=low +mlpost (0.8.1-3) unstable; urgency=low + * Team upload. * Since context (= 2012.05.23.20120524-1), mp-tool.mp and mp-spec.mp are no longer provided. Instead, context provide .mpii and .mpiv files. - add 0005-Fully-qualify-name-of-input-ed-files.patch @@ -8,7 +9,7 @@ mlpost (0.8.1-3) UNRELEASED; urgency=low * Use Breaks instead of Conflicts with mlpost ( 0.8.1). * Bump Standards-Version to 3.9.3 (no changes) - -- Mehdi Dogguy me...@debian.org Tue, 12 Jun 2012 15:01:00 +0200 + -- Mehdi Dogguy me...@debian.org Tue, 12 Jun 2012 18:12:17 +0200 mlpost (0.8.1-2) unstable; urgency=low -- mlpost 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] mlpost packaging annotated tag, debian/0.8.1-3, created. debian/0.8.1-3
The annotated tag, debian/0.8.1-3 has been created at bb00c631519b254ff154ab5695d3583715659c6d (tag) tagging 191f9dd2ccf9d8b72a5a112e899bbaaf414d (commit) replaces debian/0.8.1-2 tagged by Mehdi Dogguy on Tue Jun 12 18:35:51 2012 +0200 - Shortlog Debian release 0.8.1-3 Mehdi Dogguy (4): Fully qualify name of input'ed files Use Breaks instead of Conflicts with mlpost ( 0.8.1). Bump Standards-Version to 3.9.3 (no changes) Release to unstable --- -- mlpost 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] ledit packaging branch, master, updated. debian/2.03-1-2-gc34532e
The following commit has been merged in the master branch: commit e19e30ba3769def7f4afa16fd22157a53929d5d4 Author: Ralf Treinen trei...@free.fr Date: Tue Jun 12 20:52:40 2012 +0200 fix some typos in manpage diff --git a/debian/changelog b/debian/changelog index 55eb907..d59c56b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ledit (2.03-2) UNRELEASED; urgency=low + + * new patch manpage-typos: fix some typos in ledit.1 manpage. Thanks a +lot to A. Costa! (closes: #672479) + + -- Ralf Treinen trei...@debian.org Tue, 12 Jun 2012 20:52:05 +0200 + ledit (2.03-1) unstable; urgency=low [ Stéphane Glondu ] diff --git a/debian/patches/manpage-typos b/debian/patches/manpage-typos new file mode 100644 index 000..f79f1a1 --- /dev/null +++ b/debian/patches/manpage-typos @@ -0,0 +1,35 @@ +Author: A. Costa agco...@gis.net +Integrated: Ralf Treinen trei...@debian.org +Debian-bug: #672479 +Description: fix some typos in ledit manpage + +Index: ledit/ledit.1.tpl +=== +--- ledit.orig/ledit.1.tpl 2012-06-12 20:24:31.0 +0200 ledit/ledit.1.tpl 2012-06-12 20:49:34.0 +0200 +@@ -79,7 +79,7 @@ + ^f : forward char + ^b : backward char + M-f : forward word +- M-b : backard word ++ M-b : backward word + TAB : complete file name + ^p : previous line in history + ^n : next line in history +@@ -132,7 +132,7 @@ + .fi + + .SH REVERSE SEARCH +-The reverse search in incremental, i.e. \fIledit\fP backward searchs in the ++The reverse search in incremental, i.e. \fIledit\fP backward searches in the + history a line holding the characters typed. If you type a, its search the + first line before the current line holding an a and displays it. If you then + type a b, its search a line holding ab, and so on. If you type ^h (or +@@ -241,6 +241,6 @@ + unicode_start(1), unicode_stop(1). + + .SH AUTHOR +-Daniel de Rauglaudre, at INRIA, france. ++Daniel de Rauglaudre, at INRIA, France. + .br + daniel.de_rauglau...@inria.fr diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..41981d0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +manpage-typos -- ledit 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] ledit packaging branch, master, updated. debian/2.03-1-2-gc34532e
The following commit has been merged in the master branch: commit c34532ea15c0e55efe97bcbd982f1d14e8a38133 Author: Ralf Treinen trei...@free.fr Date: Tue Jun 12 20:59:31 2012 +0200 debian/copyright: format 1.0 diff --git a/debian/changelog b/debian/changelog index d59c56b..49d00d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ ledit (2.03-2) UNRELEASED; urgency=low * new patch manpage-typos: fix some typos in ledit.1 manpage. Thanks a lot to A. Costa! (closes: #672479) - - -- Ralf Treinen trei...@debian.org Tue, 12 Jun 2012 20:52:05 +0200 + * debian/copyright header paragraph: add format, field names as required +by format 1.0, drop fields not allowd in format 1.0 + + -- Ralf Treinen trei...@debian.org Tue, 12 Jun 2012 20:58:45 +0200 ledit (2.03-1) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index cccba64..f4f13f3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ -Upstream-Author: Daniel de Rauglaudre daniel.de_rauglau...@inria.fr -Packaged-By: Sven LUTHER lut...@debian.org -Packaged-Date: Wed, 15 Aug 2001 12:38:35 +0200 -Original-Source-Location: http://cristal.inria.fr/~ddr/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: Daniel de Rauglaudre daniel.de_rauglau...@inria.fr +Source: http://cristal.inria.fr/~ddr/ + Files: * Copyright: 2001, Daniel de Rauglaudre, INRIA. -- ledit 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] tuareg-mode packaging branch, master, updated. debian/1%2.0.6-1-3-gfd7a2d1
The following commit has been merged in the master branch: commit fa7d7fa51791eb549e8c75abc35eb4a02a5d89a7 Author: Ralf Treinen trei...@free.fr Date: Sun Jun 10 11:17:20 2012 +0200 fix default value of tuareg-use-smie diff --git a/debian/changelog b/debian/changelog index f1acad4..453bc0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tuareg-mode (1:2.0.6-2) UNRELEASED; urgency=low + + * debian/emacsen-install: fix tuareg-use-smie (f - nil). Thanks to +Kevin Ryde (closes: #676860). + + -- Ralf Treinen trei...@debian.org Sun, 10 Jun 2012 11:16:26 +0200 + tuareg-mode (1:2.0.6-1) unstable; urgency=low * New upstream version. diff --git a/debian/emacsen-startup b/debian/emacsen-startup index a085805..ef362ce 100644 --- a/debian/emacsen-startup +++ b/debian/emacsen-startup @@ -8,7 +8,7 @@ (symbol-name debian-emacs-flavor) /site-lisp/tuareg-mode)) ;; SMIE turned off due to upstream bug #1167 -(setq tuareg-use-smie f) +(setq tuareg-use-smie nil) -- tuareg-mode 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] tuareg-mode packaging branch, master, updated. debian/1%2.0.6-1-3-gfd7a2d1
The following commit has been merged in the master branch:
commit 75a0442010cae22547daf998786a09813f01e0c8
Author: Ralf Treinen trei...@free.fr
Date: Sun Jun 10 19:01:42 2012 +0200
first choice of emacsen is emacs23
diff --git a/debian/changelog b/debian/changelog
index 453bc0b..b229837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ tuareg-mode (1:2.0.6-2) UNRELEASED; urgency=low
* debian/emacsen-install: fix tuareg-use-smie (f - nil). Thanks to
Kevin Ryde (closes: #676860).
+ * debian control: first choice of emacsen is emacs23, not xemacs21
- -- Ralf Treinen trei...@debian.org Sun, 10 Jun 2012 11:16:26 +0200
+ -- Ralf Treinen trei...@debian.org Sun, 10 Jun 2012 19:01:00 +0200
tuareg-mode (1:2.0.6-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2ea9bc8..effd4db 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Homepage: http://tuareg.forge.ocamlcore.org/
Package: tuareg-mode
Architecture: all
-Depends: xemacs21-nomule | emacsen, ${misc:Depends}
+Depends: emacs23 | emacsen, ${misc:Depends}
Recommends: ocaml-interp, ocaml-mode
Enhances: ocaml-interp
Conflicts: ocaml-tools (= 1.1-2)
--
tuareg-mode 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] tuareg-mode packaging branch, master, updated. debian/1%2.0.6-1-3-gfd7a2d1
The following commit has been merged in the master branch: commit fd7a2d13d333dbe8e953c4cd51bf6fcccd6736ae Author: Ralf Treinen trei...@free.fr Date: Tue Jun 12 21:09:47 2012 +0200 emacs21 compatibility: add (required 'derived) diff --git a/debian/changelog b/debian/changelog index b229837..a3ff783 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ tuareg-mode (1:2.0.6-2) UNRELEASED; urgency=low * debian/emacsen-install: fix tuareg-use-smie (f - nil). Thanks to Kevin Ryde (closes: #676860). * debian control: first choice of emacsen is emacs23, not xemacs21 + * new patch emacs21: add an (required 'derived) in case it is not loaded, +needed by emacs21. Thanks to Kevin Ryde for the patch (closes: #676858). - -- Ralf Treinen trei...@debian.org Sun, 10 Jun 2012 19:01:00 +0200 + -- Ralf Treinen trei...@debian.org Tue, 12 Jun 2012 21:08:56 +0200 tuareg-mode (1:2.0.6-1) unstable; urgency=low diff --git a/debian/patches/emacs21 b/debian/patches/emacs21 new file mode 100644 index 000..9614969 --- /dev/null +++ b/debian/patches/emacs21 @@ -0,0 +1,23 @@ +Author: Kevin Ryde use...@zip.com.au +Integrated: Ralf Treinen trei...@debian.org +Debian-bug: #676858 +Description: emacs21 needs an (required 'derived) +Forwarded: https://forge.ocamlcore.org/tracker/index.php?func=detailaid=1172group_id=43atid=257 + +Index: tuareg-mode/tuareg.el +=== +--- tuareg-mode.orig/tuareg.el 2012-06-12 21:05:00.0 +0200 tuareg-mode/tuareg.el 2012-06-12 21:06:12.0 +0200 +@@ -134,6 +134,12 @@ + (or history 'shell-command-history + + ;;; ++;; Compatibility with emacs21 ++ ++(unless (fboundp 'derived-mode-p) ;; in derived.el in emacs21 ++ (require 'derived)) ++ ++;;; + ;; Import types and help features + + (defvar tuareg-with-caml-mode-p diff --git a/debian/patches/series b/debian/patches/series index 93fb398..568d3a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ ocaml-path +emacs21 -- tuareg-mode 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
