Debian packaging fixes based on feedback from debian-mentors mailing list

Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/ChangeLog b/ChangeLog
index 2f1c217f8743c0dc7594aa5adb8d6a03a128a047..75bb41678fe68d4f3a2cec7ef0d505dc6699b705 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-14  Roland Dreier  <rdreier@cisco.com>
+
+       * Makefile.am (EXTRA_DIST): Remove debian/ directory from
+       tarballs, since Debian policy is that upstream tarballs should not
+       include it.
+
 2006-03-13  Roland Dreier  <rdreier@cisco.com>
 
        * Release version 1.0.1.

diff --git a/Makefile.am b/Makefile.am
index e038d8db7667135d7fb6cccbaa93341abd100327..171bcecfcc60cb2a487e5c775aee2493effb68f8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,7 @@ EXTRA_DIST = include/infiniband/driver.h include/infiniband/kern-abi.h \
     include/infiniband/opcode.h include/infiniband/verbs.h include/infiniband/marshall.h \
     include/infiniband/sa-kern-abi.h include/infiniband/sa.h \
     src/ibverbs.h examples/pingpong.h \
-    src/libibverbs.map libibverbs.spec.in $(man_MANS) $(DEBIAN)
+    src/libibverbs.map libibverbs.spec.in $(man_MANS)
 
 dist-hook: libibverbs.spec
        cp libibverbs.spec $(distdir)

diff --git a/debian/changelog b/debian/changelog
index b6607cf7db09f4f56374e6b86aab529207e0f207..68f308291a6e7b337c3e5bc10cc870dea99a78bc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,4 +3,3 @@ libibverbs (1.0.2-1) unstable; urgency=low
   * Initial Release.  (Closes: #325752)
 
  -- Roland Dreier <rolandd@cisco.com>  Wed, 15 Feb 2006 11:21:59 -0700
-

diff --git a/debian/compat b/debian/compat
index b8626c4cff2849624fb67f87cd0ad72b163671ad..7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5

diff --git a/debian/control b/debian/control
index 295161aa4cc0d7e59d53673224d86ade45d8e8ca..3df6f4be1822f7cdb453593304045b031fd74bcc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Section: libdevel
 Priority: extra
 Architecture: any
 Depends: libibverbs1 (= ${Source-Version})
-Description: Development files for the libmthca driver
+Description: Debugging symbols for the libibverbs library
  libibverbs is a library that allows userspace processes to use
  InfiniBand "verbs" as described in the InfiniBand Architecture
  Specification.  This includes direct hardware access for fast path

diff --git a/debian/copyright b/debian/copyright
index 38dd1369bbe1cd7eb3610714864221c1f59886d9..0a445f88169dbd72dc0be4fa47ada7af082d78f6 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,10 +7,19 @@ It was downloaded from the OpenIB web site at
 <https://openib.org/downloads.html>
 
 Authors:
-The complete list of upstream authors is in the file
-/usr/share/doc/libibverbs/AUTHORS.
+  Roland Dreier                <roland@topspin.com>
+  Dotan Barak          <dotanb@mellanox.co.il>
+  Sean Hefty           <sean.hefty@intel.com>
+  Michael S. Tsirkin   <mst@mellanox.co.il>
 
 Copyright:
+ * Copyright (c) 2005, 2006 Cisco Systems.  All rights reserved.
+ * Copyright (c) 2004, 2005 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies Ltd.  All rights reserved.
+ * Copyright (c) 2005 PathScale, Inc.  All rights reserved.
+ * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005 Voltaire, Inc. All rights reserved.
+
 libibverbs is licensed under a choice of the GPL and the OpenIB BSD
 license.  You should have a copy of the GPL in the file
 /usr/share/common-licenses/GPL on your Debian system.

diff --git a/debian/rules b/debian/rules
index d26d78b0b4afe4ce863c7f4efc2cd5890c177f10..01b7505c5883065d7bc04a84e9e0a69de1675b61 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # -*- mode: makefile; coding: utf-8 -*-
 
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_DH_STRIP_ARGS := --dbg-package=libibverbs1
+DEB_DH_STRIP_ARGS := --dbg-package=libibverbs1-dbg
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk