diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 48b599a..0000000 --- a/debian/README.source +++ /dev/null @@ -1,2 +0,0 @@ -/usr/share/doc/dpatch/README.source.gz - diff --git a/debian/changelog b/debian/changelog index 5277a9f..55a616c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +ibutils (1.2-OFED-1.4.2-1.2) unstable; urgency=low + + * Non-maintainer upload; ACKed by the maintainer, see #664426. + * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt" + (Closes: #664426). + * In debian/rules::clean make sure to delete all files even if Makefile + is not available. + * Update to Standards-Version to 3.9.3 and debhelper to 9. + * Add build-arch and build-indep targets. + * Fix unused-override (Lintian) by adjusting paths in debian/*-overrides. + * Fix non-empty-dependency_libs-in-la-file by not installing *.la files; + no reverse depends on them exist. For more information, see + http://wiki.debian.org/ReleaseGoals/LAFileRemoval + + -- Jari Aalto Wed, 04 Apr 2012 12:36:59 +0300 + ibutils (1.2-OFED-1.4.2-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index d7f2d7e..a3cb04d 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Priority: extra Maintainer: OFED and Debian Developement and Discussion Uploaders: Benoit Mortier , Guy Coates , Mario Lang -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) -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 9), autotools-dev, chrpath, swig, graphviz, libibcommon-dev, libibumad-dev, tcl8.4-dev, tk8.4-dev, libopensm2-dev (>=3.2.5) +Standards-Version: 3.9.3 Homepage: http://www.openfabrics.org Package: ibutils diff --git a/debian/libibdm-dev.install b/debian/libibdm-dev.install index 3d2e10e..e7a3896 100644 --- a/debian/libibdm-dev.install +++ b/debian/libibdm-dev.install @@ -1,4 +1,4 @@ usr/include usr/lib/lib*.a usr/lib/lib*.so -usr/lib/lib*.la + diff --git a/debian/libibdm1.lintian-overrides b/debian/libibdm1.lintian-overrides index 6e4e097..b65c198 100644 --- a/debian/libibdm1.lintian-overrides +++ b/debian/libibdm1.lintian-overrides @@ -1,3 +1,3 @@ -libibdm1: executable-not-elf-or-script ./usr/lib/ibdm1.2/ibnl/MTS3610.ibnl -libibdm1: executable-not-elf-or-script ./usr/lib/ibdm1.2/ibnl/MTS3600.ibnl +libibdm1: executable-not-elf-or-script usr/lib/ibdm1.2/ibnl/MTS3610.ibnl +libibdm1: executable-not-elf-or-script usr/lib/ibdm1.2/ibnl/MTS3600.ibnl diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 146e41b..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,3 +0,0 @@ -01_topomatch_diff -02_sysdef_diff - diff --git a/debian/patches/01_topomatch_diff.dpatch b/debian/patches/01_topomatch_diff.dpatch deleted file mode 100644 index 7d9ca87..0000000 --- a/debian/patches/01_topomatch_diff.dpatch +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_topomatch_diff.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: fix char * problem - -@DPATCH@ - ---- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/TopoMatch.cpp -+++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/TopoMatch.cpp -@@ -676,7 +676,7 @@ - IBSystem *p_system = p_node->p_system; - - // we always mark the board of the node by examining all but the "UXXX" -- char *p_lastSlash = rindex(p_node->name.c_str(), '/'); -+ const char *p_lastSlash = rindex(p_node->name.c_str(), '/'); - char nodeBoardName[512]; - int boardNameLength; - if (!p_lastSlash) { - diff --git a/debian/patches/01_topomatch_diff.patch b/debian/patches/01_topomatch_diff.patch new file mode 100644 index 0000000..89b4de4 --- /dev/null +++ b/debian/patches/01_topomatch_diff.patch @@ -0,0 +1,16 @@ +From: +Subject: fix char * problem + + +--- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/TopoMatch.cpp ++++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/TopoMatch.cpp +@@ -676,7 +676,7 @@ + IBSystem *p_system = p_node->p_system; + + // we always mark the board of the node by examining all but the "UXXX" +- char *p_lastSlash = rindex(p_node->name.c_str(), '/'); ++ const char *p_lastSlash = rindex(p_node->name.c_str(), '/'); + char nodeBoardName[512]; + int boardNameLength; + if (!p_lastSlash) { + diff --git a/debian/patches/02_sysdef_diff.dpatch b/debian/patches/02_sysdef_diff.dpatch deleted file mode 100644 index 810dfc4..0000000 --- a/debian/patches/02_sysdef_diff.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_sysdef_diff.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: fix char * problem - -@DPATCH@ - ---- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/SysDef.cpp -+++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/SysDef.cpp -@@ -79,7 +79,7 @@ - - // the device number should be embedded in the master name of - // the node: MT23108 ... -- char *p_digit; -+ const char *p_digit; - if ((p_digit = strpbrk(p_inst->master.c_str(), "0123456789")) != NULL) - sscanf(p_digit,"%u", &p_node->devId); - diff --git a/debian/patches/02_sysdef_diff.patch b/debian/patches/02_sysdef_diff.patch new file mode 100644 index 0000000..496de0d --- /dev/null +++ b/debian/patches/02_sysdef_diff.patch @@ -0,0 +1,15 @@ +From: +Subject: fix char * problem + + +--- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/SysDef.cpp ++++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/SysDef.cpp +@@ -79,7 +79,7 @@ + + // the device number should be embedded in the master name of + // the node: MT23108 ... +- char *p_digit; ++ const char *p_digit; + if ((p_digit = strpbrk(p_inst->master.c_str(), "0123456789")) != NULL) + sscanf(p_digit,"%u", &p_node->devId); + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d26ff2a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +01_topomatch_diff.patch +02_sysdef_diff.patch diff --git a/debian/rules b/debian/rules index 526f0db..07757f8 100755 --- a/debian/rules +++ b/debian/rules @@ -22,17 +22,16 @@ -config.status: patch configure +config.status: configure dh_testdir # Add here commands to configure the package. -ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess -endif ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \ --sysconfdir=/etc --with-graphviz-lib=/usr/lib/graphbiz/tcl + +build-arch: build +build-indep: build build: build-stamp @@ -45,32 +44,38 @@ touch $@ -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot - rm -f build-stamp - + rm -f build-stamp config.guess config.sub + find . -type d -name .libs \ + | xargs --no-run-if-empty rm -rf # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) clean - - rm -f config.sub config.guess config.status config.log Makefile + find . -type f \ + -name Makefile \ + -o -name libtool \ + -o -name "*.[ao]" \ + -o -name "*.l[ao]" \ + | xargs --no-run-if-empty rm -f + rm -f \ + ibdiag/src/ibdiagnet \ + ibdiag/src/ibdiagpath \ + ibdiag/src/ibdiagui \ + ibdm/ibdm/ibdmsh \ + ibdm/src/ibdmchk \ + ibdm/src/ibdmtr \ + ibdm/src/ibnlparse \ + ibdm/src/ibtopodiff \ + ibis/src/ibis + rm -f config.sub config.guess config.status config.log ibutils.spec rm -f ibdiag/config.status ibdiag/config.log ibdm/config.status ibdm/config.log ibis/config.status ibis/config.log dh_clean - -patch: patch-stamp -patch-stamp: - dpatch apply-all - dpatch cat-all >patch-stamp - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched install: build dh_testdir dh_testroot - dh_prep + dh_prep dh_installdirs # Add here commands to install the package into debian/ibutils. diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)