[med-svn] [SCM] situs branch, master, updated. 4905695e6278b49aa143db8fa2152568006fb618

[Mickaël Canévet]

The following commit has been merged in the master branch:
commit 4905695e6278b49aa143db8fa2152568006fb618
Author: Mickaël Canévet <canevet at embl.fr>
Date:   Mon Jul 16 09:44:23 2012 +0200

    Removed commented text from debian/rules
    debian/copyright follows DEP5 guidelines

diff --git a/debian/copyright b/debian/copyright
index 2af7472..3422608 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,15 @@
-This work was packaged for Debian by:
-
-    Mickaël Canévet <canevet at embl.fr> on Fri, 13 Jul 2012 11:10:20 +0200
-
-It was downloaded from:
-
-    http://situs.biomachina.org/
-
-Upstream Author(s):
-
-    Willy Wriggers and collaborators
-
-Copyright:
-
-    The software is copyrighted, (c) 1998-2012 under the terms of the legal statement in the distribution.
-    Willy Wriggers
-
-License:
-
-    GNU GPL.
-
-The Debian packaging is:
-
-    Copyright (C) 2012 Mickaël Canévet <canevet at embl.fr>
-
-    GPU GPL
-
-and is licensed under the GPL version 3,
-see "/usr/share/common-licenses/GPL-3".
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: situs
+Upstream-Contact: Willy Wriggers <situs at biomachina.org>
+Source: http://situs.biomachina.org/
+
+Files: *
+Copyright: Copyright 1998-2012 Willy Wriggers <situs at biomachina.org>
+License: GNU GPL.
+
+Files: debian/*
+Copyright: Copyright 2012 Mickaël Canévet <canevet at embl.fr>
+License: GPU GPL
+ This software is distributed free of charge under the GNU GPL license and
+ includes the C/C++ source code, an implementation of the FFTW library, online
+ tutorials, and documentation. The development is supported by NIH.
diff --git a/debian/rules b/debian/rules
index 04e84a5..83ea2a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

-- 
Packaging of situs in Debian