[Pkg-electronics-commits] [openocd] 02/02: Drop usage of CDBS

[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 43cbaf589ea2bba711cfb777e6f4439fba3869b4
Author: Jonathan McDowell <noodles at earth.li>
Date:   Mon Sep 25 22:33:02 2017 +0100

    Drop usage of CDBS
    
    Move to just using debhelper alone.
---
 debian/changelog                       |  2 ++
 debian/control                         |  6 ++---
 debian/docs                            |  3 +++
 debian/patches/no-duplicate-udev.patch | 19 +++++++++++++++
 debian/patches/series                  |  1 +
 debian/rules                           | 44 +++++++++++-----------------------
 debian/udev                            |  1 +
 7 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e9c247..3c9e58f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openocd (0.10.0-2) UNRELEASED; urgency=medium
 
   * Re-enable jlink and add libjaylink-dev dependency.
+  * Drop use of CDBS
+    + Remove needless dep on autotools / dh-autoreconf.
 
  -- Jonathan McDowell <noodles at earth.li>  Fri, 22 Sep 2017 10:52:20 +0100
 
diff --git a/debian/control b/debian/control
index 2de867b..0742cb0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,13 @@ Section: embedded
 Priority: optional
 Maintainer: Debian Electronics Packaging Team <pkg-electronics-devel at lists.alioth.debian.org>
 Uploaders: Jonathan McDowell <noodles at earth.li>
-Build-Depends: cdbs, debhelper (>= 10), libftdi1-dev,
+Build-Depends: debhelper (>= 10), libftdi1-dev,
                libusb-1.0-0-dev, libusb-dev,
                libjaylink-dev,
                texinfo, texlive,
-               autotools-dev, autoconf,
                libhidapi-dev,
                libjim-dev,
-               pkg-config,
-               dh-autoreconf
+               pkg-config
 Standards-Version: 4.0.1
 Homepage: http://openocd.sourceforge.net/
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-electronics/openocd.git
diff --git a/debian/docs b/debian/docs
index 200741d..c8356d4 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,7 +1,10 @@
 AUTHORS
+BUGS
 NEWS
 README
 NEWTAPS
+TODO
+contrib/loaders
 doc/manual/
 doc/openocd.pdf
 doc/openocd.html/
diff --git a/debian/patches/no-duplicate-udev.patch b/debian/patches/no-duplicate-udev.patch
new file mode 100644
index 0000000..973485a
--- /dev/null
+++ b/debian/patches/no-duplicate-udev.patch
@@ -0,0 +1,19 @@
+Description: Don't install the udev file into /usr/share
+ We install the udev rules into /etc/udev/ so there's no need for a
+ duplicate copy in /usr/share/
+Author: Jonathan McDowell <noodles at earth.li>
+Last-Update: 2017-09-25
+diff --git a/Makefile.am b/Makefile.am
+index 930a3073..249438a7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,8 +13,7 @@ nobase_dist_pkgdata_DATA = \
+ 	contrib/libdcc/dcc_stdio.c \
+ 	contrib/libdcc/dcc_stdio.h \
+ 	contrib/libdcc/example.c \
+-	contrib/libdcc/README \
+-	contrib/60-openocd.rules
++	contrib/libdcc/README
+ 
+ SUBDIRS =
+ DIST_SUBDIRS =
diff --git a/debian/patches/series b/debian/patches/series
index 5be8208..9e153dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 #Patch-file list
 buspirate-swd.patch
+no-duplicate-udev.patch
diff --git a/debian/rules b/debian/rules
index 8fef3fc..576fa53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,19 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-
 DEB_MAKE_BUILD_TARGET := all
 # Also build PDF and HTML documentation if nodoc is not set
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 	DEB_MAKE_BUILD_TARGET += pdf html
+	DEB_CONFIGURE_EXTRA_FLAGS := \
+		--enable-doxygen-pdf \
+		--enable-doxygen-html
+else
+	DEB_CONFIGURE_EXTRA_FLAGS := \
+		--disable-doxygen-pdf \
+		--disable-doxygen-html
 endif
 
-# TODO: Use --enable-oocd_trace later, right now it's just a proof-of-concept.
-DEB_CONFIGURE_EXTRA_FLAGS := \
+DEB_CONFIGURE_EXTRA_FLAGS += \
 	--disable-werror \
 	--disable-internal-jimtcl \
 	--disable-internal-libjaylink \
@@ -34,7 +34,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-sysfsgpio \
 	--enable-jlink \
 
-
 configure_flags_parport := \
 	--enable-parport \
 	--enable-parport_ppdev
@@ -58,26 +57,11 @@ DEB_CONFIGURE_EXTRA_FLAGS += $(configure_flags_parport) \
 			     --enable-ti-icdi
 endif
 
-post-patches::
-	@# Copy udev rules file into debian/ so that dh_installudev finds it.
-	cp contrib/60-openocd.rules debian/openocd.udev
-
-binary-install/openocd::
-	# Install the loaders/ subdir in /usr/share/doc.
-	cp -r contrib/loaders debian/openocd/usr/share/doc/openocd
-
-binary-post-install/openocd::
-	@# Don't ship openocd.udev in /usr/share, dh_installudev handles it.
-	rm -f debian/openocd/usr/share/openocd/contrib/60-openocd.rules
-	@# Drop /usr/share/info/dir, it's generated at runtime.
-	rm -f debian/openocd/usr/share/info/dir
-	@# Drop .la files
-	rm -f `find debian/openocd -name '*.la'`
-
-clean::
-	@# Clean copied udev file.
-	rm -f debian/openocd.udev
+override_dh_auto_build:
+	dh_auto_build -- $(DEB_MAKE_BUILD_TARGET)
 
-# For /usr/share/cdbs/1/rules/utils.mk sanity check.
-common-binary-post-install-arch:: list-missing
+override_dh_auto_configure:
+	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
 
+%:
+	dh $@
diff --git a/debian/udev b/debian/udev
new file mode 100644
index 0000000..5551c56
--- /dev/null
+++ b/debian/udev
@@ -0,0 +1 @@
+contrib/60-openocd.rules

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