[Pkg-ocaml-maint-commits] [SCM] ocamldsort packaging branch, master, updated. debian/0.15.0-1-7-g1e0e315

2012-06-13 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit 1e0e3154ee1de4ba2d152ff4957ca2d8b8d7cab4
Author: Ralf Treinen 
Date:   Wed Jun 13 21:28:51 2012 +0200

debian/watch : add option pasv

diff --git a/debian/watch b/debian/watch
index 41baca4..c6d373d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=pasv \
 ftp://quatramaran.ens.fr/pub/ara/ocamldsort/ocamldsort-(.*)\.tar\.gz

-- 
ocamldsort 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] ocamldsort packaging branch, master, updated. debian/0.15.0-1-7-g1e0e315

2012-06-13 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit 10bfb96e5c218e71d766d7db5db15dd9a2aa5674
Author: Ralf Treinen 
Date:   Wed Jun 13 21:03:01 2012 +0200

debian/copyright in machine-readable format 1.0

diff --git a/debian/changelog b/debian/changelog
index 0d8e9c1..b0a6382 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
 ocamldsort (0.15.0-2) UNRELEASED; urgency=low
 
+  [ Stéphane Glondu ]
+  * Switch packaging to git
+
   [ Ralf Treinen ]
   * added debian/watch
   * debian/rules: added targets build-{arch,indep}
+  * debian/copyright: machine-readable format 1.0
 
-  [ Stéphane Glondu ]
-  * Switch packaging to git
-
- -- Ralf Treinen   Fri, 21 Oct 2011 15:29:09 +0200
+ -- Ralf Treinen   Wed, 13 Jun 2012 21:02:30 +0200
 
 ocamldsort (0.15.0-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 9cdd94c..fd0962e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,14 @@
-This package was debianized by Dimitri Ara  on
-Tue, 27 Aug 2002 07:27:13 +0200.
-
-It was downloaded from http://dimitri.mutu.net/files
-
-Upstream Author: Dimitri Ara 
-
-Copyright:
-
-This software is copyright (c) 2002 by Dimitri Ara
-
-You are free to distribute this software under the terms of
-the GNU General Public License.
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL'.
+Format:  http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ocamldsort
+Upstream-Contact: Dimitri Ara 
+Source: http://www.math.jussieu.fr/~ara/informatique.html
+
+Files: *
+Copyright: © 2002  Dimitri Ara 
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or (at
+ your option) any later version.  On Debian systems, the complete text
+ of the GNU General Public License can be found in the file
+ `/usr/share/common-licenses/GPL'.

-- 
ocamldsort 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] ocamldsort packaging branch, master, updated. debian/0.15.0-1-7-g1e0e315

2012-06-13 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit cae8691c3cc047933fea50ffa3403d28280a34ed
Author: Ralf Treinen 
Date:   Wed Jun 13 21:13:21 2012 +0200

standards-version 3.9.3

diff --git a/debian/changelog b/debian/changelog
index b0a6382..6d4b69f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,10 @@ ocamldsort (0.15.0-2) UNRELEASED; urgency=low
   [ Ralf Treinen ]
   * added debian/watch
   * debian/rules: added targets build-{arch,indep}
-  * debian/copyright: machine-readable format 1.0
+  * Standards-Version 3.9.3: 
+- debian/copyright: convert to machine-readable format 1.0
 
- -- Ralf Treinen   Wed, 13 Jun 2012 21:02:30 +0200
+ -- Ralf Treinen   Wed, 13 Jun 2012 21:12:25 +0200
 
 ocamldsort (0.15.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 335f8f7..4f90879 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers 
 Uploaders: Ralf Treinen 
 Build-Depends: ocaml-nox (>= 3.09.0), camlp4, debhelper (>= 8)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://dimitri.mutu.net/informatique.html
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamldsort.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamldsort.git

-- 
ocamldsort 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