[Pkg-electronics-commits] [openocd] 01/02: Re-enable jlink and add libjaylink-dev dependency

[Jonathan McDowell]

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

noodles pushed a commit to branch master
in repository openocd.

commit 93439861bb5e26453c8932e590970b9c9316fa3d
Author: Jonathan McDowell <noodles at earth.li>
Date:   Fri Sep 22 10:53:16 2017 +0100

    Re-enable jlink and add libjaylink-dev dependency
    
    Now libjaylink is in the archive and has migrated to testing,
    re-enable support for jlink.
---
 debian/changelog | 6 ++++++
 debian/control   | 1 +
 debian/rules     | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aae7ed6..4e9c247 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openocd (0.10.0-2) UNRELEASED; urgency=medium
+
+  * Re-enable jlink and add libjaylink-dev dependency.
+
+ -- Jonathan McDowell <noodles at earth.li>  Fri, 22 Sep 2017 10:52:20 +0100
+
 openocd (0.10.0-1) unstable; urgency=medium
 
   [ Jonathan McDowell ]
diff --git a/debian/control b/debian/control
index 2180575..2de867b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Electronics Packaging Team <pkg-electronics-devel at lists.aliot
 Uploaders: Jonathan McDowell <noodles at earth.li>
 Build-Depends: cdbs, debhelper (>= 10), libftdi1-dev,
                libusb-1.0-0-dev, libusb-dev,
+               libjaylink-dev,
                texinfo, texlive,
                autotools-dev, autoconf,
                libhidapi-dev,
diff --git a/debian/rules b/debian/rules
index 1b21451..8fef3fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-remote-bitbang \
 	--enable-bcm2835gpio \
 	--enable-sysfsgpio \
-#	--enable-jlink \
+	--enable-jlink \
 
 
 configure_flags_parport := \

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