[mpj] 06/22: DEP5; Normalised naming of repackaged tarballs

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository mpj.

commit ae05c2854322661c8297e730cfd61b948d44c850
Author: Andreas Tille <tille at debian.org>
Date:   Fri Aug 24 21:11:18 2012 +0000

    DEP5; Normalised naming of repackaged tarballs
---
 debian/changelog |  7 +++++++
 debian/copyright | 11 ++++++-----
 debian/watch     |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5d9bb1..4e67cbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mpj (0.38+dfsg-1) UNRELEASED; urgency=low
+
+  * debian/copyright:
+     - DEP5
+
+ -- Andreas Tille <tille at debian.org>  Fri, 24 Aug 2012 23:08:14 +0200
+
 mpj (0.38~dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #656790)
diff --git a/debian/copyright b/debian/copyright
index 2e8a3fa..8608d7a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: MPJ Express
 Upstream-Contact: mpj-user at lists.reading.ac.uk
-Original-Source: http://sourceforge.net/projects/mpjexpress/files/
+Source: http://sourceforge.net/projects/mpjexpress/files/
 
 Files: *
 Copyright: 2004 - 2007 Distributed Systems Group, University of Portsmouth,
@@ -9,7 +9,9 @@ Copyright: 2004 - 2007 Distributed Systems Group, University of Portsmouth,
                        Bryan Carpenter <bryan.carpenter at port.ac.uk>
                        Mark Baker <mark.baker at computer.org>
                        Guillermo Lopez Taboada <taboada at udc.es>
-License: The MIT License
+License: MIT
+
+License: MIT
  The bulk of code in this distribution was developed by the Distributed Systems
  Group at the University of Portsmouth. Some sections of the code like
  the buffering API and derived datatypes include contributions developed at
@@ -36,5 +38,4 @@ License: The MIT License
 
 Files: debian/*
 Copyright: © 2012 Andreas Tille <tille at debian.org>
-License: The MIT License
- Same license as mpj itself
+License: MIT
diff --git a/debian/watch b/debian/watch
index 35447b6..4d338ae 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts="uversionmangle=s/_/./g,dversionmangle=s/~dfsg//" \
+opts="uversionmangle=s/_/./g,dversionmangle=s/\+dfsg//" \
    http://sf.net/mpjexpress/mpj-v(.+)\.zip \
    debian debian/get-orig-source

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mpj.git