[Pkg-ocaml-maint-commits] [SCM] type-conv packaging branch, master, updated. debian/1.7.1-1-11-gcc3bf20

2011-04-19 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit f5dc4e3f6c76f3cc27ac2ae9147ee878abcc04ba
Merge: 10e406ffaafbb56fa500507714b2a57b3d3f3d5f 
b51d583f5d37b104d257d4fbae1d7c733d9022fc
Author: Stephane Glondu st...@glondu.net
Date:   Tue Apr 19 14:26:13 2011 +0200

Merge commit 'upstream/2.0.2'


-- 
type-conv packaging

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


[Pkg-ocaml-maint-commits] [SCM] type-conv packaging branch, master, updated. debian/1.7.1-1-11-gcc3bf20

2011-04-19 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 3d0e437231c0d16d73edb155c133534bd238e2d8
Author: Stephane Glondu st...@glondu.net
Date:   Tue Apr 19 14:27:30 2011 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 40749d5..8e04808 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-type-conv (2.0.1-1) UNRELEASED; urgency=low
+type-conv (2.0.2-1) UNRELEASED; urgency=low
 
-  * New upstream release 
+  * New upstream release
 
- -- Sylvain Le Gall gil...@debian.org  Wed, 27 Oct 2010 10:19:25 +0200
+ -- Stéphane Glondu glo...@debian.org  Tue, 19 Apr 2011 14:27:21 +0200
 
 type-conv (1.7.1-1) unstable; urgency=low
 

-- 
type-conv packaging

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

[Pkg-ocaml-maint-commits] [SCM] type-conv packaging branch, master, updated. debian/1.7.1-1-11-gcc3bf20

2011-04-19 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 65db8b0f853dab961ba7c9dbbb57fa5e7be5e052
Author: Stephane Glondu st...@glondu.net
Date:   Tue Apr 19 14:28:16 2011 +0200

Bump Standards-Version to 3.9.2 (no changes)

diff --git a/debian/control b/debian/control
index 9ac6c33..bb5a8ec 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  camlp4,
  camlp4-extra,
  dh-ocaml (= 0.9)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/type-conv.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/type-conv.git
 Homepage: http://www.ocaml.info/home/ocaml_sources.html#type-conv

-- 
type-conv packaging

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


[Pkg-ocaml-maint-commits] [SCM] type-conv packaging branch, master, updated. debian/1.7.1-1-11-gcc3bf20

2011-04-19 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 245592ccd1d6ee6e7270f7ef90dd03371468
Author: Stephane Glondu st...@glondu.net
Date:   Tue Apr 19 14:34:18 2011 +0200

Remove reference to deprecated BSD common-license

diff --git a/debian/copyright b/debian/copyright
index e7e04a4..8f45d06 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,18 +21,40 @@ License: BSD-3 | LGPL-2.1 | other
  however invalidate any other reasons why the executable file might be
  covered by the GNU Lesser General Public License.
 
-The Library is distributed under the terms of the GNU Lesser General Public
-License version 2.1, with the special exception to it reported above.
+ The Library is distributed under the terms of the GNU Lesser General
+ Public License version 2.1, with the special exception to it reported
+ above.
 
-The full text of the GNU Lessere General Public License version 2.1 can be
-found in `/usr/share/common-licenses/LGPL-2.1'.
+ The full text of the GNU Lessere General Public License version 2.1
+ can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-Previous versions of this Library, formerly known as Tywith, were released by
-Martin Sandin terms of the 3-clauses BSD.  The Library is also released under
-such a license.
+ Previous versions of this Library, formerly known as Tywith, were
+ released by Martin Sandin terms of the 3-clauses BSD.  The Library is
+ also released under such a license:
 
-The full text of the 3-clauses BSD license can be found in
-`/usr/share/common-licenses/BSD'.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following
+  disclaimer in the documentation and/or other materials provided
+  with the distribution.
+   3. The name of the author may not be used to endorse or promote
+  products derived from this software without specific prior
+  written permission.
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
 Copyright: © 2008 Stefano Zacchiroli z...@debian.org

-- 
type-conv packaging

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

[Pkg-ocaml-maint-commits] [SCM] type-conv packaging branch, master, updated. debian/1.7.1-1-11-gcc3bf20

2011-04-19 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit cc3bf20ff901fb9574b45d2942b8f3dbed1f1903
Author: Stephane Glondu st...@glondu.net
Date:   Tue Apr 19 14:29:01 2011 +0200

Update changelog and prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8e04808..f00285b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-type-conv (2.0.2-1) UNRELEASED; urgency=low
+type-conv (2.0.2-1) unstable; urgency=low
 
   * New upstream release
+- compatible with OCaml 3.12.0 (Closes: #586390)
+  * Bump Standards-Version to 3.9.2 (no changes)
 
- -- Stéphane Glondu glo...@debian.org  Tue, 19 Apr 2011 14:27:21 +0200
+ -- Stéphane Glondu glo...@debian.org  Tue, 19 Apr 2011 14:30:49 +0200
 
 type-conv (1.7.1-1) unstable; urgency=low
 

-- 
type-conv packaging

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