Update d/copyright + d/changelog for new release.

2 files changed, 18 insertions, 35 deletions

diff --git a/debian/changelog b/debian/changelog
index afea7c9..2b79b6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+infinipath-psm (3.3+20.604758e7-1) unstable; urgency=medium
+
+  * New upstream release (Add upstream fixes up to git commit 604758e).
+  * Add patch for gcc 7 compilation (Closes: #853451).
+  * Remove patches applied upstream.
+  * Update Vcs-Git/Browser to point to new salsa.debian.org repo.
+  * Update Standards-Version to 4.1.3, no changes required.
+  * Update copyright file.
+
+ -- Roland Fehrenbacher <rfehren@debian.org>  Fri, 29 Dec 2017 11:47:37 +0100
+
 infinipath-psm (3.3+19.g67c0807.open-2) UNRELEASED; urgency=medium
 
   * Improve architecture detection. (Closes: #807149)
diff --git a/debian/copyright b/debian/copyright
index 166c425..857e98e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,50 +1,22 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: infinipath-psm
 Upstream-Contact: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Source: https://www.openfabrics.org/downloads/infinipath-psm/
+Source: https://github.com/intel/psm
 
 Files: *
-Copyright: Copyright (c) 2007 Cisco, Inc.  All rights reserved.
+Copyright: Copyright (c) 2012, 2017. Intel Corporation.
+           Copyright (c) 2005, 2006. QLogic Corporation.
 License: BSD-2-clause or GPL-2
  infinipath-psm is licensed under a choice of one of two licenses.  You may
  choose to be licensed under the terms of the GNU General Public
  License (GPL) Version 2, available from the file
  /usr/share/common-licenses/GPL-2 on your Debian system, or the
- OpenIB.org BSD license below:
- .
- ==================================================================
- .
- OpenIB.org BSD license
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
- .
-   * Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following
-     disclaimer in the documentation and/or other materials provided
-     with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
- .
- ==================================================================
+ BSD license available from the file
+ /usr/share/common-licenses/BSD on your Debian system.
 
 Files: debian/*
-Copyright: 2015 Q-Leap Networks GmbH <info@q-leap.de>
+Copyright: 2015-2017 Q-Leap Networks GmbH <info@q-leap.de>
+           2016 Ana Beatriz Guerrero Lopez <ana@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