summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManoj Srivastava <srivasta@debian.org>2016-01-14 23:47:38 -0800
committerManoj Srivastava <srivasta@debian.org>2016-01-14 23:47:38 -0800
commit583b0098257806e4ea3f8024eb3732de290955c6 (patch)
tree4e90a177fef1e3ecd3110ae6c6b121a1e39a4d30
parent9e60f064a764a47dc5f8eb9ddff24d23b8920319 (diff)
[master]: Updated the copyright file to DEP-5 format.
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
-rw-r--r--debian/changelog5
-rw-r--r--debian/copyright78
2 files changed, 48 insertions, 35 deletions
diff --git a/debian/changelog b/debian/changelog
index 18571d8..8a120ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,11 @@ dist (1:3.5-36.0001-1) unstable; urgency=low
* New upstream snapshot.
* Bug fix: "please make the build reproducible", thanks to Reiner
Herrmann. Applied the supplied patch. (Closes: #785549).
- * Update the VCS-Git filed to use https transport.
+ * Update the VCS-Git filed to use HTTPS transport.
* Update the standard version to 3.6.0. No changes needed.
+ * Updated the copyright file to the DEP-5 format.
- -- Manoj Srivastava <srivasta@debian.org> Thu, 14 Jan 2016 23:28:24 -0800
+ -- Manoj Srivastava <srivasta@debian.org> Thu, 14 Jan 2016 23:46:21 -0800
dist (1:3.5-36-2) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index e77dabf..ecb0555 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,45 @@
- dist 3.0
-
- Copyright © 1988, Larry Wall
- Copyright © 1990-1992, Harlan Stenn
- Copyright © 1991-1997, 2004-2006, Raphael Manfredi
-
-------------------------------------------------------------------------
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, a copy of which can be
- found with this package.
-
- 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
- Artistic License for more details.
-------------------------------------------------------------------------
-
-The Debian specific changes are © 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2008 Manoj Srivastava
-<srivasta@debian.org>, and distributed under the terms of the GNU
-General Public License, version 2.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
- A copy of the GNU General Public License is also available at
- <URL:http://www.gnu.org/copyleft/gpl.html>. You may also obtain
- it by writing to the Free Software Foundation, Inc., 51 Franklin
- St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Manoj Srivastava <srivasta@debian.org>
-arch-tag: d4250e44-a0e0-4ee0-adb9-2bd74f6eeb27
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: dist 3.0
+Upstream-Contact: Raphael Manfredi <Raphael_Manfredi@grenoble.hp.com>
+Sources: https://svn.code.sf.net/p/dist/code/trunk/dist
+
+Files: *
+Copyright: 1988, Larry Wall
+ 1990-1992, Harlan Stenn
+ 1991-1997, 2004-2006, Raphael Manfredi
+License: Artistic
+
+Files: debian/*
+Copyright: 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2008 Manoj Srivastava <srivasta@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.
+ .
+ This package 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 complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-2".
+
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, a copy of which can be
+ found with this package.
+ .
+ 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
+ Artistic License for more details.
+ .
+ On Debian systems, the full text of the Artistic License can be found
+ in the file `/usr/share/common-licenses/Artistic'.