[Pkg-ofed-commits] [libibumad] 06/07: Imported Debian patch 1.3.8-0.2

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


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

ana pushed a commit to branch master
in repository libibumad.

commit ccb7f54f44dd11c358411d796b4677072b2e62ed
Author: Roland Dreier <rbd at debian.org>
Date:   Tue Oct 23 10:12:56 2012 -0700

    Imported Debian patch 1.3.8-0.2
---
 debian/changelog                                 |  6 ++
 debian/compat                                    |  2 +-
 debian/control                                   |  3 +-
 debian/dirs                                      |  2 -
 debian/libibumad-dev.dirs                        |  2 -
 debian/libibumad-dev.install                     |  4 +-
 debian/libibumad3.dirs                           |  1 -
 debian/libibumad3.install                        |  2 +-
 debian/patches/01-pass-foreign-to-automake.patch | 15 ++++
 debian/patches/series                            |  1 +
 debian/rules                                     | 90 +-----------------------
 11 files changed, 30 insertions(+), 98 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2bb876..255f276 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libibumad (1.3.8-0.2) experimental; urgency=low
+
+  * Update to debhelper 9 and minimized rule file.
+
+ -- Roland Dreier <rbd at debian.org>  Tue, 23 Oct 2012 10:12:56 -0700
+
 libibumad (1.3.8-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 6c0fc5f..3830455 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libibumad
 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
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.13.19), dh-autoreconf
 Standards-Version: 3.9.4
 Section: libs
 Homepage: http://openfabrics.org/
@@ -24,6 +24,7 @@ Description: Development files for libibumad
 Package: libibumad3
 Section: libs
 Architecture: i386 ia64 amd64 powerpc
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: InfiniBand Userspace Management Datagram (uMAD) library
  libibumad provides userspace Infiniband Management Datagram (uMAD)
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/libibumad-dev.dirs b/debian/libibumad-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/debian/libibumad-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/debian/libibumad-dev.install b/debian/libibumad-dev.install
index 30adda3..f93690f 100644
--- a/debian/libibumad-dev.install
+++ b/debian/libibumad-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
 usr/share/man/man3
diff --git a/debian/libibumad3.dirs b/debian/libibumad3.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libibumad3.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libibumad3.install b/debian/libibumad3.install
index d0dbfd1..3ddde58 100644
--- a/debian/libibumad3.install
+++ b/debian/libibumad3.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..57340b7
--- /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>
+---
+--- libibumad-1.3.8.orig/configure.in	2012-08-02 00:33:28.000000000 -0700
++++ libibumad-1.3.8/configure.in	2012-10-23 10:25:19.147305980 -0700
+@@ -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 5ef8fe0..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 --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/libibumad.git



More information about the Pkg-ofed-commits mailing list