[Pkg-ofed-commits] [libibmad] 06/06: Imported Debian patch 1.3.9-1

Ana Beatriz Guerrero López ana at moszumanska.debian.org
Tue Jul 1 07:18:05 UTC 2014


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

ana pushed a commit to branch master
in repository libibmad.

commit 6b59bc0193da5b0890f1c5565cc2c6eac66c0d99
Author: Roland Dreier <rbd at debian.org>
Date:   Tue Nov 27 12:01:36 2012 -0800

    Imported Debian patch 1.3.9-1
---
 debian/changelog                                 |  7 ++
 debian/compat                                    |  2 +-
 debian/control                                   |  3 +-
 debian/libibmad-dev.install                      |  4 +-
 debian/libibmad5.install                         |  2 +-
 debian/patches/01-pass-foreign-to-automake.patch | 17 +++++
 debian/patches/series                            |  1 +
 debian/rules                                     | 90 +-----------------------
 8 files changed, 33 insertions(+), 93 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef6e514..4be7bf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libibmad (1.3.9-1) experimental; urgency=low
+
+  * Acknowledge NMU. (Closes: #690601)
+  * Update to debhelper 9 and minimized rule file.
+
+ -- Roland Dreier <rbd at debian.org>  Tue, 27 Nov 2012 12:01:36 -0800
+
 libibmad (1.3.9-0.1) experimental; urgency=low
 
   * 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 945ab34..925d47e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libibmad
 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 (>= 7), autotools-dev, libibumad-dev (>= 1.3.6-OFED-1.5.2)
+Build-Depends: debhelper (>= 9),  dh-autoreconf, libibumad-dev (>= 1.3.6-OFED-1.5.2)
 Standards-Version: 3.9.4
 Section: libs
 Homepage: http://www.openfabrics.org/
@@ -25,6 +25,7 @@ Description: Development files for libibmad
 Package: libibmad5
 Section: libs
 Architecture: i386 ia64 amd64 powerpc
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Infiniband Management Datagram (MAD) library
  libibmad provides low layer InfiniBand functions for use by the
diff --git a/debian/libibmad-dev.install b/debian/libibmad-dev.install
index d1bffed..a3c8f6c 100644
--- a/debian/libibmad-dev.install
+++ b/debian/libibmad-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/libibmad5.install b/debian/libibmad5.install
index a551fd8..d89b393 100644
--- a/debian/libibmad5.install
+++ b/debian/libibmad5.install
@@ -1 +1 @@
-usr/lib/libibmad*.so.*
+usr/lib/*/libibmad*.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..4b6417c
--- /dev/null
+++ b/debian/patches/01-pass-foreign-to-automake.patch
@@ -0,0 +1,17 @@
+Description: Add "foreign" option to automake so autoreconf works
+ Avoid complaints about missing NEWS, README, etc.
+Author: Roland Dreier <rbd at debian.org>
+---
+Index: libibmad-1.3.9/configure.in
+===================================================================
+--- libibmad-1.3.9.orig/configure.in	2012-04-30 13:42:43.000000000 -0700
++++ libibmad-1.3.9/configure.in	2012-11-27 12:05:31.000000000 -0800
+@@ -6,7 +6,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
new file mode 100644
index 0000000..1a200bb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-pass-foreign-to-automake.patch
diff --git a/debian/rules b/debian/rules
index 98a3c6c..baa138d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,91 +1,5 @@
 #!/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
-
-
-# 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
-
-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)" LDFLAGS="-Wl,-z,defs" --sysconfdir=/etc
-
-
-build: build-stamp
-build-stamp:  config.status 
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep  
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	rm -f $(CURDIR)/debian/tmp/usr/lib/lib*.la
-
-
-# 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  --sourcedir=debian/tmp --fail-missing
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	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 
+%:
+	dh $@ --with autoreconf

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



More information about the Pkg-ofed-commits mailing list