[SCM] UNNAMED PROJECT branch, master, updated. 0.31-68-g0c9a189

[Niels Thykier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, master has been updated
       via  0c9a1898e9d7f35a5b804b2b95cb379695a6ee98 (commit)
      from  73088bcaf0de319723236978faa3eb29bb8bc490 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0c9a1898e9d7f35a5b804b2b95cb379695a6ee98
Author: Martin Quinson <mquinson at debian.org>
Date:   Sun Apr 17 09:39:53 2011 +0200

    Make jh_makepkg use a DEP-5 copyright template
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    3 +++
 jh_makepkg       |   31 ++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 696e453..5bf70e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,9 @@ javatools (0.33) unreleased; urgency=low
     - It now creates a separate doc package for the javadoc if making
       a library package.
     - It now adds ${java:Recommends} to all binary packages added.
+  * Replaced old copyright template with a DEP-5 version.  Thanks to
+    Martin Quinson for the suggestion and the template.
+    (Closes: #623035)
 
  -- Matthew Johnson <mjj29 at debian.org>  Sat, 12 Mar 2011 12:58:50 +0000
 
diff --git a/jh_makepkg b/jh_makepkg
index 0a6c0e9..3a80721 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -278,6 +278,7 @@ case $COMP in
    ;;
 esac
 
+YEAR=$(date +%Y)
 mkdir -p debian
 cat > debian/control <<END
 Source: $SRCPACKAGE
@@ -312,19 +313,23 @@ END
 fi
 
 cat > debian/copyright <<END
-This package was Debianised by $DEBFULLNAME <$DEBEMAIL> on `date`
-
-This package was downloaded from <homepage>.
-
-Upstream Author: ... 
-
-Copyright ...
-
-<Insert Licence statement>
-
-The packaging is Copyright `date +%Y` $DEBFULLNAME <$DEBEMAIL> and is licenced
-under the terms of the BSD licence. On Debian systems the BSD licence can be
-found in /usr/share/common-licenses/BSD.
+Format: [URI OF THE FORMAT SPECIFICATION, SUCH AS http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION]
+Upstream-Name: [THE NAME UPSTREAM USES FOR THE SOFTWARE]
+Upstream-contact: [THE PREFERRED ADDRESS(ES) TO REACH THE UPSTREAM PROJECT]
+Source: [AN EXPLANATION FROM WHERE THE UPSTREAM SOURCE CAME FROM. TYPICALLY AN URL]
+[OTHER FIELDS]
+
+Files: *
+Copyright: Copyright $YEAR John Doe <jdoe at example.com>
+License: [STANDARD ABBREVIATION -- SEE "Short names" SECTION OF SPECIFICATION]
+ [LICENSE TEXT]
+
+Files: debian/*
+Copyright: Copyright $YEAR $DEBFULLNAME <$DEBEMAIL>
+License: [STANDARD ABBREVIATION]
+ [LICENSE TEXT]
+
+[OTHER FILE PARAGRAPHS]
 END
 
 echo $COMPAT > debian/compat


hooks/post-receive
-- 
UNNAMED PROJECT