[Pkg-ofed-commits] [qperf] 02/02: Further cleanup of packaging for qperf 0.4.10-1.

Thu Nov 16 19:38:54 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 b83fb17ff2184de526c0caf3a6bcd6b3706f3857
Author: Brian T. Smith <bsmith at systemfabricworks.com>
Date:   Thu Nov 16 13:35:31 2017 -0600

    Further cleanup of packaging for qperf 0.4.10-1.
    
    Incorporate advice from Afif Elghraoui and Benjamin Drung:
    
     - Use wrap-and-sort to format debian packaging files.
     - Remove System Fabric Works copyright from d/rules. The
       information for debian/* in d/copyright should suffice.
     - Add BSD-2-Clause/OpenIB license to d/copyright.
     - Add per-file license overrides to d/copyright.
     - Update d/watch to point at GitHub linux-rdma/qperf.
     - Remove the renaming of configure.in from d/rules.
    
    Also:
     - Add Vcs-Git and Vcs-Browser stanzas to d/control.
---
 debian/control   | 10 ++++------
 debian/copyright | 56 +++++++++++++++++++++++++++++++++++++++-----------------
 debian/docs      |  2 +-
 debian/rules     |  5 -----
 debian/watch     |  5 +++--
 5 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/debian/control b/debian/control
index eb790f8..729f2da 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,17 @@ Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel at lists.al
 Uploaders: Brian T. Smith <bsmith at systemfabricworks.com>
 Section: utils
 Priority: optional
+Vcs-Git: https://anonscm.debian.org/git/pkg-ofed/qperf.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ofed/qperf.git
 Homepage: https://github.com/linux-rdma/qperf
 Standards-Version: 4.1.1
-Build-Depends: debhelper (>= 10),
- libibverbs-dev,
- librdmacm-dev
+Build-Depends: debhelper (>= 10), libibverbs-dev, librdmacm-dev
 
 Package: qperf
 Architecture: linux-any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends}, ${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.
  .
  qperf is part of the OpenFabrics Enterprise Distribution (OFED).
-
diff --git a/debian/copyright b/debian/copyright
index edacd1d..cf2000b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,29 +3,51 @@ Upstream-Name: qperf
 Source: https://github.com/linux-rdma/qperf
 
 Files: *
-Copyright: 2002-2009 Johann George
- 2006-2009 QLogic Corporation
- 2012 Intel Corporation
+Copyright: Johann George
 License: GPL-2
 
+Files: src/*.c
+       src/*.h
+       src/mkhelp
+       src/mkman
+Copyright: 2002-2009 Johann George
+           2006-2009 QLogic Corporation
+License: GPL-2 or BSD-2-Clause/OpenIB
+
+Files: src/rds.c
+Copyright: 2002-2009 Johann George
+           2006-2009 QLogic Corporation
+           2012 Intel Corporation
+License: GPL-2 or BSD-2-Clause/OpenIB
+
 Files: debian/*
 Copyright: 2016-2017 System Fabric Works, Inc.
-License: GPL-2
+License: GPL-2 or BSD-2-Clause/OpenIB
 
 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.
+ 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-2-Clause/OpenIB
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
  .
- 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.
+ - Redistributions of source code must retain the above
+   copyright notice, this list of conditions and the following
+   disclaimer.
  .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ - 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.
  .
- 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'.
+ 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.
diff --git a/debian/docs b/debian/docs
index 17cc4d4..c269145 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-src/help.txt
\ No newline at end of file
+src/help.txt
diff --git a/debian/rules b/debian/rules
index b5bb130..a22ae2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
-#
-# Copyright (c)2016-2017 System Fabric Works, Inc. All Rights Reserved,
-#
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
@@ -10,10 +7,8 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
-	if [ -f configure.ac ] ; then mv configure.ac configure.in; fi
 	./cleanup
 
 .PHONY: override_dh_autoreconf
 override_dh_autoreconf:
-	if [ ! -f configure.ac ] ; then mv configure.in configure.ac; fi
 	./autogen.sh
diff --git a/debian/watch b/debian/watch
index 93d0c88..a6198bf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=4
-opts="uversionmangle=s/-rc/~rc/" \
-  https://www.openfabrics.org/downloads/qperf/qperf-(.+)\.tar\.gz
\ No newline at end of file
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/qperf-$1\.tar\.gz/ \
+  https://github.com/linux-rdma/qperf/tags .*/v?(\d\S+)\.tar\.gz
+

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

