[Pkg-ofed-commits] [infiniband-diags] 07/07: Imported Debian patch 1.6.1-1
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Tue Jul 1 07:17:58 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository infiniband-diags.
commit 5764342f61ac972ac773dde864c87f8f2aec87f1
Author: Roland Dreier <rbd at debian.org>
Date: Mon Dec 3 11:44:59 2012 -0800
Imported Debian patch 1.6.1-1
---
debian/changelog | 7 ++
debian/control | 7 +-
debian/libibnetdisc-dev.install | 4 +-
debian/libibnetdisc5.install | 2 +-
debian/patches/01-pass-foreign-to-automake.patch | 15 +++
debian/patches/series | 1 +
debian/rules | 111 +++--------------------
7 files changed, 41 insertions(+), 106 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5b28f1d..176ff84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+infiniband-diags (1.6.1-1) experimental; urgency=low
+
+ * Acknowledge NMU. (Closes: #690602)
+ * Convert to minimized rules file.
+
+ -- Roland Dreier <rbd at debian.org> Mon, 03 Dec 2012 11:44:59 -0800
+
infiniband-diags (1.6.1-0.1) experimental; urgency=low
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 2b62ab1..ce7bb5f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
Priority: extra
Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel at lists.alioth.debian.org>
Uploaders: Benoit Mortier <benoit.mortier at opensides.be>, Guy Coates <gmpc at sanger.ac.uk>, Mario Lang <mlang at debian.org>
-Build-Depends: debhelper (>= 9), autotools-dev, automake, chrpath, libibumad-dev (>= 1.3.7-OFED-1.5.4), libibmad-dev (>= 1.3.8-OFED-1.5.4), libopensm-dev (>= 3.3.12-OFED-1.5.4)
+Build-Depends: debhelper (>= 9), dh-autoreconf, libibumad-dev (>= 1.3.7-OFED-1.5.4), libibmad-dev (>= 1.3.8-OFED-1.5.4), libopensm-dev (>= 3.3.12-OFED-1.5.4)
Standards-Version: 3.9.4
Homepage: http://www.openfabrics.org
DM-Upload-Allowed: yes
@@ -22,8 +22,9 @@ Description: InfiniBand diagnostic programs
Package: libibnetdisc5
Architecture: i386 ia64 amd64 powerpc
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Infiniband diagnostics library
+Description: InfiniBand diagnostics library
InfiniBand is a switched fabric communications link used in
high-performance computing and enterprise data centers. Its features
include high throughput, low latency, quality of service and
@@ -36,7 +37,7 @@ Package: libibnetdisc-dev
Section: libdevel
Architecture: i386 ia64 amd64 powerpc
Depends: libibnetdisc5 (= ${binary:Version}), ${misc:Depends}
-Description: Infiniband diagnostics library headers
+Description: InfiniBand diagnostics library headers
InfiniBand is a switched fabric communications link used in
high-performance computing and enterprise data centers. Its features
include high throughput, low latency, quality of service and
diff --git a/debian/libibnetdisc-dev.install b/debian/libibnetdisc-dev.install
index d1bffed..a3c8f6c 100644
--- a/debian/libibnetdisc-dev.install
+++ b/debian/libibnetdisc-dev.install
@@ -1,3 +1,3 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff --git a/debian/libibnetdisc5.install b/debian/libibnetdisc5.install
index d0dbfd1..3ddde58 100644
--- a/debian/libibnetdisc5.install
+++ b/debian/libibnetdisc5.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/patches/01-pass-foreign-to-automake.patch b/debian/patches/01-pass-foreign-to-automake.patch
new file mode 100644
index 0000000..cfa2183
--- /dev/null
+++ b/debian/patches/01-pass-foreign-to-automake.patch
@@ -0,0 +1,15 @@
+Description: Add "foreign" option to automake so autoreconf works
+ Avoid complaints about missing NEWS, README, etc.
+Author: Roland Dreier <rbd at debian.org>
+---
+--- a/configure.in
++++ b/configure.in
+@@ -5,7 +5,7 @@
+ AC_CONFIG_AUX_DIR(config)
+ AC_CONFIG_MACRO_DIR(config)
+ AM_CONFIG_HEADER(config.h)
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+
+ AC_SUBST(RELEASE, ${RELEASE:-unknown})
+ AC_SUBST(TARBALL, ${TARBALL:-${PACKAGE}-${VERSION}.tar.gz})
diff --git a/debian/patches/series b/debian/patches/series
index 74a86ff..0465a3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
30-ibhosts-bashisms.patch
32-ibrouters-bashisms.patch
34-ibswitches-bashisms.patch
+01-pass-foreign-to-automake.patch
diff --git a/debian/rules b/debian/rules
index 556abd0..3ba2789 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,19 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --with autoreconf
+override_dh_autoreconf:
+ dh_autoreconf autoreconf -- -f -i -I config
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
+override_dh_install:
+ mv debian/tmp/usr/sbin/ibfindnodesusing.pl debian/tmp/usr/sbin/ibfindnodesusing
+ mv debian/tmp/usr/sbin/ibidsverify.pl debian/tmp/usr/sbin/ibidsverify
+ mv debian/tmp/usr/sbin/check_lft_balance.pl debian/tmp/usr/sbin/check_lft_balance
+ mv debian/tmp/usr/sbin/dump_lfts.sh debian/tmp/usr/sbin/dump_lfts
+ mv debian/tmp/usr/sbin/dump_mfts.sh debian/tmp/usr/sbin/dump_mfts
+ dh_install
# Modified by build process
KEEP_FILES = \
@@ -41,87 +36,3 @@ KEEP_FILES = \
scripts/ibnodes \
scripts/ibrouters \
scripts/ibswitches
-
-config.status: configure
- dh_testdir
- for f in $(KEEP_FILES); do [ -f $$f.save ] || cp -a $$f $$f.save ; done
- # Add here commands to configure the package.
- cp -f /usr/share/misc/config.sub config.sub
- cp -f /usr/share/misc/config.guess config.guess
- ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" --with-perl-installdir=/usr/share/perl5 --sbindir=/usr/sbin
-
-
-
-build-arch: build
-build-indep: build
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/infiniband-diags.sgml > infiniband-diags.1
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f build-stamp config.sub config.guess
-
- dh_clean
- for f in $(KEEP_FILES); do [ ! -f $$f.save ] || mv $$f.save $$f; done
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/infiniband-diags.
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
- rm -f debian/tmp/usr/lib/lib*.la
-
- mv debian/tmp/usr/sbin/ibfindnodesusing.pl debian/tmp/usr/sbin/ibfindnodesusing
- mv debian/tmp/usr/sbin/ibidsverify.pl debian/tmp/usr/sbin/ibidsverify
- mv debian/tmp/usr/sbin/check_lft_balance.pl debian/tmp/usr/sbin/check_lft_balance
- mv debian/tmp/usr/sbin/dump_lfts.sh debian/tmp/usr/sbin/dump_lfts
- mv debian/tmp/usr/sbin/dump_mfts.sh debian/tmp/usr/sbin/dump_mfts
- chrpath -d debian/tmp/usr/sbin/ibtracert
- chrpath -d debian/tmp/usr/sbin/saquery
- chrpath -d debian/tmp/usr/sbin/smpquery
- chrpath -d debian/tmp/usr/sbin/iblinkinfo
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install --list-missing
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_perl
- dh_makeshlibs -V
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/infiniband-diags.git
More information about the Pkg-ofed-commits
mailing list