[Pkg-ofed-commits] [infiniband-diags] 04/18: Drop patches that were accepted upstream

Mon Aug 21 16:13:38 UTC 2017

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

bdrung pushed a commit to branch master
in repository infiniband-diags.

commit 5194409d4117010e17ad3f8ea702e19fcc701ad2
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date:   Mon Aug 21 13:30:43 2017 +0200

    Drop patches that were accepted upstream
---
 debian/patches/fix-spelling-errors     | 68 ----------------------------------
 debian/patches/series                  |  4 --
 debian/patches/update_am_init_automake | 32 ----------------
 debian/patches/update_autotools_option | 32 ----------------
 debian/patches/update_shebang          | 13 -------
 5 files changed, 149 deletions(-)

diff --git a/debian/patches/fix-spelling-errors b/debian/patches/fix-spelling-errors
deleted file mode 100644
index 14d15f8..0000000
--- a/debian/patches/fix-spelling-errors
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Fix spelling errors
-Author: Ana Guerrero Lopez <ana at ekaia.org>, Mehdi Dogguy <mehdi at debian.org>
-Last-Update: 2016-09-04
-
---- a/doc/rst/iblinkinfo.8.in.rst
-+++ b/doc/rst/iblinkinfo.8.in.rst
-@@ -57,7 +57,7 @@
- 
- **--switch, -S <port_guid>** same as "-G". (provided only for backward compatibility)
- 
--How much of the scan to be printed can be controled with the following.
-+How much of the scan to be printed can be controlled with the following.
- 
- **--all, -a**
- Print all nodes found in a partial fabric scan.  Normally a
-@@ -81,7 +81,7 @@
- indicated as down in the specified cache, and is still down, do not output it in the
- resulting output.  This option may be particularly useful for environments
- where switches are not fully populated, thus much of the default iblinkinfo
--info is considered unuseful.  See **ibnetdiscover** for information on caching
-+info is considered useless.  See **ibnetdiscover** for information on caching
- ibnetdiscover output.
- 
- 
---- a/doc/rst/ibqueryerrors.8.in.rst
-+++ b/doc/rst/ibqueryerrors.8.in.rst
-@@ -63,7 +63,7 @@
- 
- **CAUTION** clearing data or error counters will occur regardless of if they
- are printed or not.  See **--counters** and **--data** for details on
--controling which counters are printed.
-+controlling which counters are printed.
- 
- **--details** include receive error and transmit discard details
- 
---- a/doc/rst/infiniband-diags.8.in.rst
-+++ b/doc/rst/infiniband-diags.8.in.rst
-@@ -120,8 +120,8 @@
- 
- 	See: ibtracert, ibroute, dump_lfts, dump_mfts, check_lft_balance, ibfindnodesusing
- 
--Peformance counters
---------------------
-+Performance counters
-+--------------------
- 
- 	See: ibqueryerrors, perfquery
- 
---- a/doc/rst/rdma-ndd.8.in.rst
-+++ b/doc/rst/rdma-ndd.8.in.rst
-@@ -27,7 +27,7 @@
- DETAILS
- =======
- 
--Full operation of this deamon requires kernels which support polling of the
-+Full operation of this daemon requires kernels which support polling of the
- procfs hostname file as well as libudev.
- 
- If your system does not support either of these features, the daemon will set
-@@ -37,7 +37,7 @@
- Node Description format
- -----------------------
- 
--The deamon uses the nd_format configuration option within the ibdiags.conf
-+The daemon uses the nd_format configuration option within the ibdiags.conf
- file.  %h and %d can be used as wildcards in that string to specify the dynamic
- use of <hostname> and <device> respectively.
- 
diff --git a/debian/patches/series b/debian/patches/series
index 114af3c..e613ac0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-update_am_init_automake
-update_shebang
 comment_test_out
-fix-spelling-errors
-update_autotools_option
diff --git a/debian/patches/update_am_init_automake b/debian/patches/update_am_init_automake
deleted file mode 100644
index 7bce409..0000000
--- a/debian/patches/update_am_init_automake
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Update AM_INIT_AUTOMAKE to use subdir-objects
-With this option, the objects are placed into the subdirectory of
-the build directory corresponding to the subdirectory of the source file.
-Fixes this warning:
-
-Makefile.am:103: warning: source file 'src/ibdiag_common.c' is in a subdirectory,
-Makefile.am:103: but option 'subdir-objects' is disabled
-automake: warning: possible forward-incompatibility.
-automake: At least a source file is in a subdirectory, but the 'subdir-objects'
-automake: automake option hasn't been enabled.  For now, the corresponding output
-automake: object file(s) will be placed in the top-level directory.  However,
-automake: this behaviour will change in future Automake versions: they will
-automake: unconditionally cause object files to be placed in the same subdirectory
-automake: of the corresponding sources.
-automake: You are advised to start using 'subdir-objects' option throughout your
-automake: project, to avoid future incompatibilities.
-
-Author: Ana Guerrero Lopez <ana at debian.org>
-Last-Update: 2016-09-04
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,7 +5,8 @@
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(config)
- AM_CONFIG_HEADER(config.h)
--AM_INIT_AUTOMAKE([foreign])
-+#AM_INIT_AUTOMAKE([foreign])
-+AM_INIT_AUTOMAKE([subdir-objects])
- 
- AC_SUBST(RELEASE, ${RELEASE:-unknown})
- AC_SUBST(TARBALL, ${TARBALL:-${PACKAGE}-${VERSION}.tar.gz})
diff --git a/debian/patches/update_autotools_option b/debian/patches/update_autotools_option
deleted file mode 100644
index 732519c..0000000
--- a/debian/patches/update_autotools_option
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Replace INCLUDES with AM_CPPFLAGS
-Fixes:
-
-Makefile.am:4: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
-
-libibnetdisc/Makefile.am:4: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
-
-Author: Ana Guerrero Lopez <ana at debian.org>
-Last-Update: 2016-09-04
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I config
- SUBDIRS = libibnetdisc
- 
--INCLUDES = -I$(top_builddir)/include/ -I$(srcdir)/include -I$(includedir) \
-+AM_CPPFLAGS = -I$(top_builddir)/include/ -I$(srcdir)/include -I$(includedir) \
- 	-I$(includedir)/infiniband -I$(top_srcdir)/libibnetdisc/include
- 
- if DEBUG
---- a/libibnetdisc/Makefile.am
-+++ b/libibnetdisc/Makefile.am
-@@ -1,7 +1,7 @@
- 
- #SUBDIRS = .
- 
--INCLUDES = -I$(srcdir)/include -I$(includedir) -I$(includedir)/infiniband
-+AM_CPPFLAGS = -I$(srcdir)/include -I$(includedir) -I$(includedir)/infiniband
- 
- lib_LTLIBRARIES = libibnetdisc.la
- sbin_PROGRAMS =
diff --git a/debian/patches/update_shebang b/debian/patches/update_shebang
deleted file mode 100644
index 93b1568..0000000
--- a/debian/patches/update_shebang
+++ /dev/null
@@ -1,13 +0,0 @@
-From: Ana Guerrero Lopez <ana at debian.org>
-Date: 2016-09-04
-
-The script contains several bashims, change the shebang to use bash.
-
---- a/doc/generate
-+++ b/doc/generate
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- docdir=`dirname $0`
- mode=$1

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

