[pkg-opensc-commit] [SCM] OpenCT packaging branch, master, updated. 7f58e9516b7db976b1e2b5c0a2a13bccf51fd8f0

[Eric Dorland]

The following commit has been merged in the master branch:
commit 7f58e9516b7db976b1e2b5c0a2a13bccf51fd8f0
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Tue Jan 4 03:13:26 2011 -0500

    * Non-maintainer upload.
    * Fix build on kfreebsd-* (Closes: #564652)
      - d/control: Add Build-Depends on libusb2-dev [kfreebsd-i386 kfreebsd-amd64]
      - d/control: Add Build-Conflict on libusb-dev (for all archs)
      - d/rules: Use conditional configure option to enable libusb on kfreebsd-*
      Thanks to Petr Salinger and Andreas Jellinghaus!

diff --git a/debian/changelog b/debian/changelog
index b279c83..159f8e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+openct (0.6.20-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix build on kfreebsd-* (Closes: #564652)
+    - d/control: Add Build-Depends on libusb2-dev [kfreebsd-i386 kfreebsd-amd64]
+    - d/control: Add Build-Conflict on libusb-dev (for all archs)
+    - d/rules: Use conditional configure option to enable libusb on kfreebsd-*
+    Thanks to Petr Salinger and Andreas Jellinghaus!
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 07 Apr 2010 23:04:57 +0200
+
 openct (0.6.20-1) unstable; urgency=low
 
   * New upstream release. (Closes: #570105, #569132)
diff --git a/debian/control b/debian/control
index 221f5a8..0b2c138 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: openct
 Section: utils
 Priority: extra
 Maintainer: Eric Dorland <eric at debian.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5.0.45), libpcsclite-dev (>= 1.4.0), pkg-config, libltdl3-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5.0.45), libpcsclite-dev (>= 1.4.0), pkg-config, libltdl3-dev, libusb2-dev [kfreebsd-i386 kfreebsd-amd64]
+Build-Conflicts: libusb-dev
 Standards-Version: 3.8.3
 Homepage: http://www.opensc-project.org/
 Vcs-Git: git://git.debian.org/git/pkg-opensc/openct.git
diff --git a/debian/rules b/debian/rules
index c1cc9f6..56aad6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-pcsc --with-udev=/lib/udev \
 	--with-bundle=/usr/lib/pcsc/drivers
 
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+     DEB_CONFIGURE_EXTRA_FLAGS += --enable-usb
+endif
+
 DEB_INSTALL_DOCS_ALL := NEWS TODO
 
 install/openct::

-- 
OpenCT packaging