[Pkg-ofed-commits] [ibsim] 03/05: Imported Debian patch 0.5-1.1

[Ana Beatriz Guerrero López]

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

ana pushed a commit to branch master
in repository ibsim.

commit 7b596d6538a79b643467a0f12890754c4974422f
Author: Jari Aalto <jari.aalto at cante.net>
Date:   Wed Apr 4 11:03:22 2012 +0300

    Imported Debian patch 0.5-1.1
---
 debian/README.source                                  |  2 --
 debian/changelog                                      | 12 ++++++++++++
 debian/compat                                         |  2 +-
 debian/control                                        |  6 +++---
 debian/ibsim.substvars                                |  1 -
 debian/patches/00list                                 |  1 -
 ....10-scandir.dpatch => 01_glibc-2.10-scandir.patch} |  8 ++------
 debian/patches/series                                 |  1 +
 debian/rules                                          | 19 ++++++-------------
 debian/source/format                                  |  1 +
 10 files changed, 26 insertions(+), 27 deletions(-)

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 aa0a1ea..b27cb19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ibsim (0.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload; ACKed by the maintainer, see #664425.
+  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
+    (Closes: #664425).
+  * Update to Standards-Version to 3.9.3.1 and debhelper to 9.
+  * Add build-arch and build-indep targets.
+  * Fix description-synopsis-starts-with-article (Lintian).
+  * Fix diff-contains-substvars debian/ibsim.substvars (Lintian).
+
+ -- Jari Aalto <jari.aalto at cante.net>  Wed, 04 Apr 2012 11:03:22 +0300
+
 ibsim (0.5-1) unstable; urgency=low
 
   * Initial release (Closes: #539799)
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 6953d96..c9bd6ae 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ 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 (>= 7),  libibumad-dev, libibmad-dev, libibcommon-dev, dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9),  libibumad-dev, libibmad-dev, libibcommon-dev
+Standards-Version: 3.9.3.1
 Homepage: http://www.openfabrics.org
 
 Package: ibsim-utils
@@ -22,7 +22,7 @@ Description: InfiniBand fabric simulator utilities
 Package: libumad2sim0
 Architecture: i386 ia64 amd64 powerpc
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: An InfiniBand fabric simulator
+Description: InfiniBand fabric simulator
  ibsim provides a simulation of an InfiniBand fabric,
  which can be used by the opensm subnet manager and
  infiniband diagnostics and management tools.
diff --git a/debian/ibsim.substvars b/debian/ibsim.substvars
deleted file mode 100644
index b127b5f..0000000
--- a/debian/ibsim.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3), libibcommon1, libibmad1, libibumad1
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ed3cf57..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_glibc-2.10-scandir
diff --git a/debian/patches/01_glibc-2.10-scandir.dpatch b/debian/patches/01_glibc-2.10-scandir.patch
similarity index 63%
rename from debian/patches/01_glibc-2.10-scandir.dpatch
rename to debian/patches/01_glibc-2.10-scandir.patch
index 3c35d39..905a4a6 100644
--- a/debian/patches/01_glibc-2.10-scandir.dpatch
+++ b/debian/patches/01_glibc-2.10-scandir.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_glibc-2.10-scandir.dpatch by  <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: patch for glibc 2.10 scandir function
+From: <benoit.mortier at opensides.be>
+Subject: patch for glibc 2.10 scandir function
 
- at DPATCH@
 
 --- trunk/umad2sim/umad2sim.c	2009-07-29 14:58:36.000000000 +0200
 +++ trunk/umad2sim/new-umad2sim.c	2009-12-24 12:30:15.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e1883da
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_glibc-2.10-scandir.patch
diff --git a/debian/rules b/debian/rules
index 2a5b11b..8b68ca2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,10 @@ configure-stamp:
 
 	touch configure-stamp
 
+build-arch: build
+build-indep: build
 
-build: patch build-stamp
+build: build-stamp
 
 build-stamp: configure-stamp  
 	dh_testdir
@@ -29,30 +31,21 @@ build-stamp: configure-stamp
 
 	touch $@
 
-clean: clean-patched unpatch
-clean-patched: 
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
+	rm -f debian/ibsim.substvars
 
 	# Add here commands to clean up after the build process.
 	$(MAKE) clean
 
 	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
 
 	-find $(CURDIR) -type d -name ".svn" -exec rm -rf {} \; >/dev/null 2>&1
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)

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