[SCM] glpk packaging branch, master, updated. upstream/4.51-14-g857c570

Tue Jun 25 20:42:56 UTC 2013

The following commit has been merged in the master branch:
commit 34e0d1dba335f57677662dc79578d59544638bb8
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Jun 25 21:31:29 2013 +0200

    debian/copyright: update and convert to machine-readable format 1.0

diff --git a/debian/changelog b/debian/changelog
index 5e37bd7..d9e73aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ glpk (4.51-1) UNRELEASED; urgency=low
   * Fix description of glpk-utils: example program "tspsol" has been
     removed upstream (Closes: #698319)
   * Update manpage of glpsol
+  * debian/copyright: update and convert to machine-readable format 1.0
 
  -- Sébastien Villemot <sebastien at debian.org>  Wed, 19 Jun 2013 18:15:36 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 994e8a8..babd503 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,104 @@
-This package was debianized by Falk Hueffner <falk at debian.org> on
-Wed, 10 Oct 2001 02:46:56 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: GLPK
+Upstream-Contact: Andrew Makhorin <mao at gnu.org>
+Source: http://www.gnu.org/software/glpk/glpk.html
 
-It was downloaded from ftp://ftp.gnu.org/pub/gnu/glpk/
+Files: *
+Copyright: 2000-2011, 2013 Andrew Makhorin, Department for Applied Informatics,
+           Moscow Aviation Institute, Moscow, Russia. E-mail: <mao at gnu.org>.
+License: GPL-3+
 
-Upstream Author: Andrew Makhorin <mao at mai2.rcnet.ru>
+Files: src/amd/*
+       src/colamd/*
+Copyright: 1998-2007 Timothy A. Davis,
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or (at
+ your option) any later version.
+ .
+ This library 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 Lesser
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License, version 2.1, can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
 
-Copyright:
+Files: src/zlib/*
+Copyright: 1995-2012 Jean-loup Gailly and Mark Adler
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would
+    be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not
+    be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source
+    distribution.
 
-  Copyright (C) 2000, 01, 02, 03, 04, 05, 06, 07, 08 Andrew Makhorin,
-  Department for Applied Informatics, Moscow Aviation Institute,
-  Moscow, Russia. All rights reserved. E-mail: <mao at mai2.rcnet.ru>.
+Files: aclocal.m4
+       m4/*
+Copyright: 1992-2013, Free Software Foundation, Inc
+License: permissive
+ This file is free software; the Free Software Foundation gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
 
-  GLPK 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 3 of the License, or
-  (at your option) any later version.
+Files: src/minisat/*
+Copyright: 2005 Niklas Sorensson
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-  GLPK 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.
+Files: debian/*
+Copyright: 2001-2006 Falk Hueffner <falk at debian.org>
+           2006-2008 Rafael Laboissiere <rafael at laboissiere.net>
+           2013 Sébastien Villemot <sebastien at debian.org>
+License: GPL-3+
 
-The Debian packaging is Copyright (C) 2001-2006 Falk Hueffner and
-Copyright (C) 2006-2008 Rafael Laboissiere, released under the terms
-of the GNU GPL, version 3 or later.
-
-In Debian systems, the complete text of the GPL License can be found in
-`/usr/share/common-licenses/GPL-3'.
+License: GPL-3+
+ This program 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 3 of the License, or
+ (at your option) any later version.
+ .
+ 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
+ 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, version 3, can be found in the file
+ `/usr/share/common-licenses/GPL-3'.

-- 
glpk packaging

