Hi,

Find attached the updated patches.

Previous patches won't apply and won't work,
due the switch from CDBS to dh_*


Cheers
Geert Stappers
-- 
Live and let live
>From db2dc38c02446f9c78d322b6dfe86e35d77690a7 Mon Sep 17 00:00:00 2001
From: Geert Stappers <stapp...@stappers.nl>
Date: Tue, 13 Mar 2018 22:37:41 +0100
Subject: [PATCH 1/3] Create a seperate Debian package for the udev rules

And depend on that package
---
 debian/control |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/control b/debian/control
index d862be8..8ca7238 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Vcs-Git: https://salsa.debian.org/electronics-team/openocd.git
 Package: openocd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+ , jtag-adapter-udev
 Description: Open on-chip JTAG debug solution for ARM and MIPS systems
  OpenOCD is an on-chip debugging, in-system programming and boundary-scan
  testing tool for ARM and MIPS systems.
@@ -32,3 +33,10 @@ Description: Open on-chip JTAG debug solution for ARM and MIPS systems
  .
  OpenOCD supports many different types of JTAG interfaces/programmers.
 
+Package: jtag-adapter-udev
+Architecture: all
+Depends: ${misc:Depends}
+Description: udev rules for JTAG adapters
+ This package prodives rules for the /dev/ and hotplug management daemon
+ called 'udev'.  It contains udev data about JTAG adapters.
+ These udev rules set permission on those devices.
-- 
1.7.10.4

>From 179db52b991883e8c94b7e219d00c83efab4c66d Mon Sep 17 00:00:00 2001
From: Geert Stappers <stapp...@stappers.nl>
Date: Tue, 13 Mar 2018 22:53:41 +0100
Subject: [PATCH 2/3] Small ChangeLog for udev package

Shipping a 7KB file with a 1.3MB ChangeLog feels wrong
---
 debian/patches/series                              |    1 +
 .../patches/small_changelog_for_udev_package.patch |   28 ++++++++++++++++++++
 debian/rules                                       |    4 +++
 3 files changed, 33 insertions(+)
 create mode 100644 debian/patches/small_changelog_for_udev_package.patch

diff --git a/debian/patches/series b/debian/patches/series
index 5ee72d6..6f7d489 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix-sheeva.patch
 fix-openrd.patch
 bind-localhost-only.patch
 css-fix.patch
+small_changelog_for_udev_package.patch
diff --git a/debian/patches/small_changelog_for_udev_package.patch b/debian/patches/small_changelog_for_udev_package.patch
new file mode 100644
index 0000000..aec3a67
--- /dev/null
+++ b/debian/patches/small_changelog_for_udev_package.patch
@@ -0,0 +1,28 @@
+Description: create a small changelog file for the udev package
+ The package openocd has a large upstream ChangeLog file, 1.3 Mbyte.
+ Shipping that big file makes the jtag-adapter-udev package
+ unnecessary big.
+ A replacement ChangeLog to the rescue.
+ This patch creates that file.
+Author: Geert Stappers <stapp...@debian.org>
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852856
+Forwarded: not-needed
+Reviewed-by: <name and email of a reviewer, optional>
+Last-Update: 2018-03-13
+
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+Index: b/jtag-adapter-udev.ChangeLog
+===================================================================
+--- /dev/null
++++ b/jtag-adapter-udev.ChangeLog
+@@ -0,0 +1,9 @@
++
++This replacement ChangeLog file was created
++during the build of the .deb package.
++
++Purpose of this autogenerated file is to prevent
++that the 7KiloByte sized udev file would be shipped
++with a 1.3MegaByte large ChangeLog file.
++
++(Actual ChangeLog is in the openocd package.)
diff --git a/debian/rules b/debian/rules
index 576fa53..e7dcd86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,3 +65,7 @@ override_dh_auto_configure:
 
 %:
 	dh $@
+
+override_dh_installchangelogs:
+	dh_installchangelogs -popenocd ChangeLog
+	dh_installchangelogs -pjtag-adapter-udev jtag-adapter-udev.ChangeLog
-- 
1.7.10.4

Reply via email to