[Blends-commit] [SCM] blends-dev branch, master, updated. b30635d4a6e74aa70a932c4d46104d3f916492c3

Andreas Tille tille at debian.org
Fri Nov 16 14:49:30 UTC 2012


The following commit has been merged in the master branch:
commit b30635d4a6e74aa70a932c4d46104d3f916492c3
Author: Andreas Tille <tille at debian.org>
Date:   Fri Nov 16 15:49:35 2012 +0100

    DEP5 formated copyright while checking this in connection to bug #692946

diff --git a/debian/changelog b/debian/changelog
index 1e2140d..066a83d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ blends (0.6.16) UNRELEASED; urgency=low
   * Debhelper 9 (control+compat)
   * Drop transitional cdd-* packages completely
     Closes: #692946
+  * DEP5 formated copyright while checking this in connection to
+    bug #692946
 
  -- Andreas Tille <tille at debian.org>  Fri, 16 Nov 2012 14:31:49 +0100
 
diff --git a/debian/copyright b/debian/copyright
index b2661be..c21835e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,25 @@
-X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-X-Debianized-By: Andreas Tille <tille at debian.org>
-X-Debinized-Date: Tue, 23 Mar 2004 18:41:20 +0100
-X-Source-Downloaded-From: http://bio.math.berkeley.edu/amap/download
-X-Upstream-Author: 2003-2008 Andreas Tille <tille at debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: © 2003-2008 Andreas Tille <tille at debian.org>
+Copyright: © 2003-2012 Andreas Tille <tille at debian.org>
 License: GPL-2+
- This package 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.
-X-Comment: On Debian systems, the complete text of the GNU GPL version 2
- can be found in: `/usr/share/common-licenses/GPL-2'
 
 Files: devtools/blend-gen-control
 Copyright: © 2003-2007 Petter Reinholdtsen <pere at debian.org>
-           © 2007-2008 Andreas Tille <tille at debian.org>
+           © 2007-2012 Andreas Tille <tille at debian.org>
 License: GPL-2+
- This package 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.
-X-Comment: On Debian systems, the complete text of the GNU GPL version 2
- can be found in: `/usr/share/common-licenses/GPL-2'
 
 Files: share/blends/*
 Copyright: © 2003      Cosimo Alfarano <kalfa at debian.org>
-           © 2003-2008 Andreas Tille <tille at debian.org>
+           © 2003-2012 Andreas Tille <tille at debian.org>
+License: GPL-2+
+
 License: GPL-2+
  This package 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.
-X-Comment: On Debian systems, the complete text of the GNU GPL version 2
+ (at your option) any later version.
+ .
+ On Debian systems, the complete text of the GNU GPL version 2
  can be found in: `/usr/share/common-licenses/GPL-2'
+

-- 
Git repository for blends code



More information about the Blends-commit mailing list