[Pkg-ofed-commits] r517 - in /branches/sid-uploads/opensm/trunk/debian: ./ patches/

opensides-guest at alioth.debian.org opensides-guest at alioth.debian.org
Mon Dec 21 10:59:32 UTC 2009


Author: opensides-guest
Date: Mon Dec 21 10:59:32 2009
New Revision: 517

URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=517
Log:
- Corrected package
- Added patch for Debian bug #560537
- Added dpatch dependancies


Added:
    branches/sid-uploads/opensm/trunk/debian/patches/
    branches/sid-uploads/opensm/trunk/debian/patches/00list
    branches/sid-uploads/opensm/trunk/debian/patches/01_gcc_4.4_else_in_place_elif.dpatch   (with props)
Modified:
    branches/sid-uploads/opensm/trunk/debian/changelog
    branches/sid-uploads/opensm/trunk/debian/control
    branches/sid-uploads/opensm/trunk/debian/rules

Modified: branches/sid-uploads/opensm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/opensm/trunk/debian/changelog?rev=517&op=diff
==============================================================================
--- branches/sid-uploads/opensm/trunk/debian/changelog (original)
+++ branches/sid-uploads/opensm/trunk/debian/changelog Mon Dec 21 10:59:32 2009
@@ -2,7 +2,7 @@
 
   * Depends on unavailable infiniband-diags (Closes: #558829)
   * FTBFS: ../include/vendor/osm_vendor.h:68:6: error: #elif with no
-    expression (Closes: #560537)
+    expression is not supported by gcc => 4.4 (Closes: #560537)
 
  -- Benoit Mortier <benoit.mortier at opensides.be>  Sun, 20 Dec 2009 00:00:26 +0100
 

Modified: branches/sid-uploads/opensm/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/opensm/trunk/debian/control?rev=517&op=diff
==============================================================================
--- branches/sid-uploads/opensm/trunk/debian/control (original)
+++ branches/sid-uploads/opensm/trunk/debian/control Mon Dec 21 10:59:32 2009
@@ -3,7 +3,7 @@
 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, flex, bison, libibumad-dev, libibcommon-dev
+Build-Depends: debhelper (>= 7), autotools-dev, dpatch, flex, bison, libibumad-dev, libibcommon-dev
 Standards-Version: 3.8.3
 Homepage: http://www.openfabrics.org
 

Added: branches/sid-uploads/opensm/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/opensm/trunk/debian/patches/00list?rev=517&op=file
==============================================================================
--- branches/sid-uploads/opensm/trunk/debian/patches/00list (added)
+++ branches/sid-uploads/opensm/trunk/debian/patches/00list Mon Dec 21 10:59:32 2009
@@ -1,0 +1,1 @@
+01_gcc_4.4_else_in_place_elif

Added: branches/sid-uploads/opensm/trunk/debian/patches/01_gcc_4.4_else_in_place_elif.dpatch
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/opensm/trunk/debian/patches/01_gcc_4.4_else_in_place_elif.dpatch?rev=517&op=file
==============================================================================
--- branches/sid-uploads/opensm/trunk/debian/patches/01_gcc_4.4_else_in_place_elif.dpatch (added)
+++ branches/sid-uploads/opensm/trunk/debian/patches/01_gcc_4.4_else_in_place_elif.dpatch Mon Dec 21 10:59:32 2009
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_gcc_4.4_else_in_place_elif.dpatch by  <benoit.mortier at opensides.be>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: replace solo elif by else for gcc => 4.4
+
+ at DPATCH@
+
+--- trunk/include/vendor/osm_vendor.h	2009-12-21 11:16:55.000000000 +0100
++++ trunk/include/vendor/osm_vendor.h.new	2009-12-21 11:23:38.000000000 +0100
+@@ -65,7 +65,7 @@
+ #include <vendor/osm_vendor_ibumad.h>
+ #elif defined( OSM_VENDOR_INTF_AL )
+ #include <vendor/osm_vendor_al.h>
+-#elif
++#else
+ #error No MAD Interface selected!
+ #error Choose an interface in osm_config.h
+ #endif

Propchange: branches/sid-uploads/opensm/trunk/debian/patches/01_gcc_4.4_else_in_place_elif.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: branches/sid-uploads/opensm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/opensm/trunk/debian/rules?rev=517&op=diff
==============================================================================
--- branches/sid-uploads/opensm/trunk/debian/rules (original)
+++ branches/sid-uploads/opensm/trunk/debian/rules Mon Dec 21 10:59:32 2009
@@ -22,7 +22,7 @@
 
 
 
-config.status: configure
+config.status: patch configure
 	dh_testdir
 	# Add here commands to configure the package.
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
@@ -39,7 +39,8 @@
 
 	touch $@
 
-clean: 
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
@@ -51,6 +52,15 @@
 	-find $(CURDIR) -type d -name ".svn" -exec rm -rf {} \;
 
 	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




More information about the Pkg-ofed-commits mailing list