Commit c5f27a630b8f3d4364c98e0b484b26842b03ebb3 - ibutils

+0

-2

~~debian/README.source~~ less more

0		/usr/share/doc/dpatch/README.source.gz
1

+16

-0

debian/changelog less more

	0	ibutils (1.2-OFED-1.4.2-1.2) unstable; urgency=low
	1
	2	* Non-maintainer upload; ACKed by the maintainer, see #664426.
	3	* Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
	4	(Closes: #664426).
	5	* In debian/rules::clean make sure to delete all files even if Makefile
	6	is not available.
	7	* Update to Standards-Version to 3.9.3 and debhelper to 9.
	8	* Add build-arch and build-indep targets.
	9	* Fix unused-override (Lintian) by adjusting paths in debian/*-overrides.
	10	* Fix non-empty-dependency_libs-in-la-file by not installing *.la files;
	11	no reverse depends on them exist. For more information, see
	12	http://wiki.debian.org/ReleaseGoals/LAFileRemoval
	13
	14	-- Jari Aalto <jari.aalto@cante.net> Wed, 04 Apr 2012 12:36:59 +0300
	15
0	16	ibutils (1.2-OFED-1.4.2-1.1) unstable; urgency=medium
1	17
2	18	* Non-maintainer upload.

+1

-1

debian/compat less more

0		7
	0	9

+2

-2

debian/control less more

2	2	Priority: extra
3	3	Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel@lists.alioth.debian.org>
4	4	Uploaders: Benoit Mortier <benoit.mortier@opensides.be>, Guy Coates <gmpc@sanger.ac.uk>, Mario Lang <mlang@debian.org>
5		Build-Depends: debhelper (>= 7), autotools-dev, dpatch, chrpath, swig, graphviz, libibcommon-dev, libibumad-dev, tcl8.4-dev, tk8.4-dev, libopensm2-dev (>=3.2.5)
6		Standards-Version: 3.8.3
	5	Build-Depends: debhelper (>= 9), autotools-dev, chrpath, swig, graphviz, libibcommon-dev, libibumad-dev, tcl8.4-dev, tk8.4-dev, libopensm2-dev (>=3.2.5)
	6	Standards-Version: 3.9.3
7	7	Homepage: http://www.openfabrics.org
8	8
9	9	Package: ibutils

+1

-1

debian/libibdm-dev.install less more

0	0	usr/include
1	1	usr/lib/lib*.a
2	2	usr/lib/lib*.so
3		usr/lib/lib*.la
	3

+2

-2

debian/libibdm1.lintian-overrides less more

0		libibdm1: executable-not-elf-or-script ./usr/lib/ibdm1.2/ibnl/MTS3610.ibnl
1		libibdm1: executable-not-elf-or-script ./usr/lib/ibdm1.2/ibnl/MTS3600.ibnl
	0	libibdm1: executable-not-elf-or-script usr/lib/ibdm1.2/ibnl/MTS3610.ibnl
	1	libibdm1: executable-not-elf-or-script usr/lib/ibdm1.2/ibnl/MTS3600.ibnl
2	2

+0

-3

~~debian/patches/00list~~ less more

0		01_topomatch_diff
1		02_sysdef_diff
2

+0

-20

~~debian/patches/01_topomatch_diff.dpatch~~ less more

0		#! /bin/sh /usr/share/dpatch/dpatch-run
1		## 01_topomatch_diff.dpatch by <benoit.mortier@opensides.be>
2		##
3		## All lines beginning with `## DP:' are a description of the patch.
4		## DP: fix char * problem
5
6		@DPATCH@
7
8		--- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/TopoMatch.cpp
9		+++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/TopoMatch.cpp
10		@@ -676,7 +676,7 @@
11		IBSystem *p_system = p_node->p_system;
12
13		// we always mark the board of the node by examining all but the "UXXX"
14		- char *p_lastSlash = rindex(p_node->name.c_str(), '/');
15		+ const char *p_lastSlash = rindex(p_node->name.c_str(), '/');
16		char nodeBoardName[512];
17		int boardNameLength;
18		if (!p_lastSlash) {
19

+16

-0

debian/patches/01_topomatch_diff.patch less more

	0	From: <benoit.mortier@opensides.be>
	1	Subject: fix char * problem
	2
	3
	4	--- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/TopoMatch.cpp
	5	+++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/TopoMatch.cpp
	6	@@ -676,7 +676,7 @@
	7	IBSystem *p_system = p_node->p_system;
	8
	9	// we always mark the board of the node by examining all but the "UXXX"
	10	- char *p_lastSlash = rindex(p_node->name.c_str(), '/');
	11	+ const char *p_lastSlash = rindex(p_node->name.c_str(), '/');
	12	char nodeBoardName[512];
	13	int boardNameLength;
	14	if (!p_lastSlash) {
	15

+0

-19

~~debian/patches/02_sysdef_diff.dpatch~~ less more

0		#! /bin/sh /usr/share/dpatch/dpatch-run
1		## 02_sysdef_diff.dpatch by <benoit.mortier@opensides.be>
2		##
3		## All lines beginning with `## DP:' are a description of the patch.
4		## DP: fix char * problem
5
6		@DPATCH@
7
8		--- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/SysDef.cpp
9		+++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/SysDef.cpp
10		@@ -79,7 +79,7 @@
11
12		// the device number should be embedded in the master name of
13		// the node: MT23108 ...
14		- char *p_digit;
15		+ const char *p_digit;
16		if ((p_digit = strpbrk(p_inst->master.c_str(), "0123456789")) != NULL)
17		sscanf(p_digit,"%u", &p_node->devId);
18

+15

-0

debian/patches/02_sysdef_diff.patch less more

	0	From: <benoit.mortier@opensides.be>
	1	Subject: fix char * problem
	2
	3
	4	--- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/SysDef.cpp
	5	+++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/SysDef.cpp
	6	@@ -79,7 +79,7 @@
	7
	8	// the device number should be embedded in the master name of
	9	// the node: MT23108 ...
	10	- char *p_digit;
	11	+ const char *p_digit;
	12	if ((p_digit = strpbrk(p_inst->master.c_str(), "0123456789")) != NULL)
	13	sscanf(p_digit,"%u", &p_node->devId);
	14

+2

-0

debian/patches/series less more

	0	01_topomatch_diff.patch
	1	02_sysdef_diff.patch

+26

-21

debian/rules less more

21	21
22	22
23	23
24		config.status: patch configure
	24	config.status: configure
25	25	dh_testdir
26	26	# Add here commands to configure the package.
27		ifneq "$(wildcard /usr/share/misc/config.sub)" ""
28	27	cp -f /usr/share/misc/config.sub config.sub
29		endif
30		ifneq "$(wildcard /usr/share/misc/config.guess)" ""
31	28	cp -f /usr/share/misc/config.guess config.guess
32		endif
33	29	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
34	30	--sysconfdir=/etc --with-graphviz-lib=/usr/lib/graphbiz/tcl
	31
	32	build-arch: build
	33	build-indep: build
35	34
36	35	build: build-stamp
37	36

44	43
45	44	touch $@
46	45
47		clean: clean-patched unpatch
48		clean-patched:
	46	clean:
49	47	dh_testdir
50	48	dh_testroot
51		rm -f build-stamp
52
	49	rm -f build-stamp config.guess config.sub
	50	find . -type d -name .libs \
	51	\| xargs --no-run-if-empty rm -rf
53	52	# Add here commands to clean up after the build process.
54	53	[ ! -f Makefile ] \|\| $(MAKE) clean
55
56		rm -f config.sub config.guess config.status config.log Makefile
	54	find . -type f \
	55	-name Makefile \
	56	-o -name libtool \
	57	-o -name "*.[ao]" \
	58	-o -name "*.l[ao]" \
	59	\| xargs --no-run-if-empty rm -f
	60	rm -f \
	61	ibdiag/src/ibdiagnet \
	62	ibdiag/src/ibdiagpath \
	63	ibdiag/src/ibdiagui \
	64	ibdm/ibdm/ibdmsh \
	65	ibdm/src/ibdmchk \
	66	ibdm/src/ibdmtr \
	67	ibdm/src/ibnlparse \
	68	ibdm/src/ibtopodiff \
	69	ibis/src/ibis
	70	rm -f config.sub config.guess config.status config.log ibutils.spec
57	71	rm -f ibdiag/config.status ibdiag/config.log ibdm/config.status ibdm/config.log ibis/config.status ibis/config.log
58	72	dh_clean
59
60		patch: patch-stamp
61		patch-stamp:
62		dpatch apply-all
63		dpatch cat-all >patch-stamp
64
65		unpatch:
66		dpatch deapply-all
67		rm -rf patch-stamp debian/patched
68	73
69	74	install: build
70	75	dh_testdir
71	76	dh_testroot
72		dh_prep
	77	dh_prep
73	78	dh_installdirs
74	79
75	80	# Add here commands to install the package into debian/ibutils.

+1

-0

debian/source/format less more

0

3.0 (quilt)