[Pkg-ofed-commits] [qperf] 01/04: Cleanup packaging and copyright. Removed BSD license.

Brian Smith bsmith-guest at moszumanska.debian.org
Fri Nov 10 20:27:37 UTC 2017


This is an automated email from the git hooks/post-receive script.

bsmith-guest pushed a commit to branch master
in repository qperf.

commit b827b85cffd8a78f3e21ef4e2c5d0175d4f02797
Author: Brian T. Smith <bsmith at systemfabricworks.com>
Date:   Fri Nov 10 11:34:29 2017 -0600

    Cleanup packaging and copyright. Removed BSD license.
    
    Incorporating advice from Afif Elghraoui:
    
      - Don't include empty NEWS.
      - Don't include empty debian/tests/control.
      - changelog should only indicate initial revision.
        This also reverts the version to 0.4.9-1.
      - Revise copyright to GPL-2.
      - Remove explicit declaration of installation
        dependencies, rely upon ${shlibs:Depends}.
      - Remove parallel and autoreconf options from
        rules, they are enabled by default with debhelper
        compat 10.
    
    debian/copyright no longer contains the BSD license. The
    upstream license is GPL-2, and copyright now reflects that.
    
    In debian/rules, override dh_clean to restore the moved
    configure.in file.
---
 debian/changelog     |  9 +--------
 debian/control       |  4 +---
 debian/copyright     | 55 +++-------------------------------------------------
 debian/docs          |  1 -
 debian/rules         |  9 ++++++---
 debian/tests/control |  2 --
 6 files changed, 11 insertions(+), 69 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9fb3ce..2d760e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,6 @@
-qperf (0.4.9-2) unstable; urgency=medium
-
-  * Change package distribution to unstable.
-  * Add debian/tests/control with an empty Tests stanza.
-
- -- Brian T. Smith <bsmith at systemfabricworks.com>  Wed, 08 Nov 2017 21:58:22 -0600
-
 qperf (0.4.9-1) UNRELEASED; urgency=medium
 
   * Initial release. (Closes: #881220)
 
- -- Brian T. Smith <bsmith at systemfabricworks.com>  Tue, 31 Oct 2017 15:40:01 -0500
+ -- Brian T. Smith <bsmith at systemfabricworks.com>  Fri, 10 Nov 2017 10:50:22 -0600
 
diff --git a/debian/control b/debian/control
index 0a828ae..6950165 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,7 @@ Build-Depends: debhelper (>= 10),
 Package: qperf
 Architecture: linux-any
 Depends: ${misc:Depends},
- ${shlibs:Depends},
- libibverbs1,
- librdmacm1
+ ${shlibs:Depends}
 Description: Measure socket and RDMA performance
  qperf measures bandwidth and latency between two nodes. It can work
  over TCP/IP as well as the RDMA transports.
diff --git a/debian/copyright b/debian/copyright
index f3cc426..3cb02fb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,61 +7,12 @@ Files: *
 Copyright: 2002-2009 Johann George
  2006-2009 QLogic Corporation
  2012 Intel Corporation
-License: GPL-2 or BSD-3-clause
+License: GPL-2
 
 Files: debian/*
 Copyright: 2016-2017 System Fabric Works, Inc.
-License: GPL-2 or BSD-3-clause
+License: GPL-2
 
 License: GPL-2
- 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 2 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 package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
  On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-
-License: BSD-3-Clause
- Copyright (c) 2015 Intel Corporation. All rights reserved. 
- Copyright (c) 2016 System Fabric Works. All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- .
- 2. 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.
- .
- 3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
- .
- 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 HOLDER 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.
-
+ License version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.
diff --git a/debian/docs b/debian/docs
index 1666b7a..17cc4d4 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,2 @@
 AUTHORS
-NEWS
 src/help.txt
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 89c3ee5..f5aebdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,14 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
-	dh $@ --parallel --with autoreconf
+	dh $@
+
+.PHONY: override_dh_clean
+override_dh_clean:
+	if [ -f configure.ac ] ; then mv configure.ac configure.in; fi
+	dh_clean
 
 .PHONY: override_dh_autoreconf
 override_dh_autoreconf:
 	mv configure.in configure.ac
 	dh_autoreconf
-
-
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 8409af8..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests:
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/qperf.git



More information about the Pkg-ofed-commits mailing list