The following commit has been merged in the master branch:
commit 63534700a9e6a7a1f56c8e439dd694660a3fae72
Author: Hendrik Tews <hend...@askra.de>
Date:   Mon May 27 16:20:30 2013 +0200

    update watch and copyright

diff --git a/debian/changelog b/debian/changelog
index 44b1b95..6588a16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 camlmix (1.3.0-4) UNRELEASED; urgency=low
 
+  [ Sylvain La Gall ]
   * Remove Sylvain Le Gall from uploaders
 
- -- Sylvain Le Gall <gil...@debian.org>  Fri, 21 Sep 2012 01:11:30 +0000
+  [ Hendrik Tews ]
+  * fix watch file
+  * fix copyright file
+  * added myself as uploader
+
+ -- Hendrik Tews <hend...@askra.de>  Mon, 27 May 2013 15:39:38 +0200
 
 camlmix (1.3.0-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5466067..c122733 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,15 @@ Source: camlmix
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
+Uploaders:
+ Hendrik Tews <hend...@askra.de>
 Build-Depends-Indep:
   ocaml-nox (>= 3.11.1-3~),
   ocaml-findlib,
   dh-ocaml (>= 0.9~),
   debhelper (>= 7.0.50~)
 Standards-Version: 3.9.1
-Homepage: http://martin.jambon.free.fr/camlmix/
+Homepage: http://mjambon.com/camlmix/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlmix.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlmix.git
 
diff --git a/debian/copyright b/debian/copyright
index 0ebaef2..97b0095 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,25 @@
-Format-Specification: 
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: mikmatch
-Maintainer: Sylvain Le Gall <gil...@debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Camlmix
+Upstream-Contact: Martin Jambon <mar...@mjambon.com> 
+Source: http://mjambon.com/camlmix/
 
 Files: *
-Copyright: Copyright (c) 2004, 2005 Martin Jambon
-License: BSD3
-
+Copyright: 2004, 2005 Martin Jambon
+License: BSD-3-clause
  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.
@@ -28,8 +31,24 @@ License: BSD3
  (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: (C) 2010 Sylvain Le Gall <gil...@debian.org>
+Copyright: 2010 Sylvain Le Gall <gil...@debian.org>
+           2013 Hendrik Tews <hend...@askra.de>
 License: GPL-3+
-
- See '/usr/share/common-licenses/GPL-3' for the full text.
+ 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 3 of the License, or (at
+ your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/watch b/debian/watch
index fdfb7ba..96bf7b0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://martin.jambon.free.fr/camlmix/ camlmix-(.*)\.tar\.gz
+http://mjambon.com/releases/camlmix \
+.*/camlmix/camlmix[\-\._](\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

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

Reply via email to