update compat

Upstream version 0.4.1.1

debian/changelog

@@ -1,3 +1,10 @@
+megactl (0.4.1.1-1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * megatrace in own package
+
+ -- Mario Fetka <mario.fetka@gmail.com>  Sat, 22 Apr 2017 16:52:02 +0200
+
 megactl (0.4.1-6) unstable; urgency=medium
 
   * Update 003-Fix_disk_enumeration_loop patch (fix issues with PERC6e).

debian/compat

@@ -1 +1 @@
-5
+7

debian/patches/008-device_id.dpatch

@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 008-device_id.dpatch by Mario Fetka (geos_one) <mario.fetka@gmail.com>
+##
+## DP: add device_id to output
+## DP: thx. to gentoo devs
+
+@DPATCH@
+--- megactl/src/adapter.c.orig	2017-04-22 17:15:55.068000000 +0200
++++ megactl/src/adapter.c	2017-04-22 17:17:17.624000000 +0200
+@@ -193,9 +193,9 @@
+ 	d->id = info->slot;
+ 
+ 	if (d->channel == DISK_NOENC)
+-	    snprintf (d->name, sizeof (d->name), "%se*s%u", a->name, d->id);
++	    snprintf (d->name, sizeof (d->name), "d%u%se*s%u", info->device_id, a->name, d->id);
+ 	else
+-	    snprintf (d->name, sizeof (d->name), "%se%us%u", a->name, d->channel, d->id);
++	    snprintf (d->name, sizeof (d->name), "d%u%se%us%u", info->device_id, a->name, d->channel, d->id);
+ 
+ 	d->inquiry = info->inquiry.inq;
+ 	strncpy (d->vendor, d->inquiry.vendor_info, sizeof (d->vendor) - 1);

debian/patches/00list

@@ -5,3 +5,4 @@
 005-Makefile.dpatch
 006-gcc-fixes.dpatch
 007-tracefix.dpatch
+008-device_id.dpatch

debian/rules

@@ -16,15 +16,17 @@ endif
 
 ifeq ($(ARCH),i386)
 	MY_MAKEOPTS="ARCH=-m32"
+	MT_MAKEOPTS="ARCH=-m32"
 else
 	MY_MAKEOPTS="ARCH=-m64"
+	MT_MAKEOPTS="ARCH=-m32"
 endif
 #	$(MAKE) CFLAGS="$(CFLAGS) \$$(INC) \$$(ARCH)" -C src/
 
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
-	$(MAKE) CFLAGS="$(CFLAGS) \$$(INC) \$$(ARCH)" -C src/ megatrace
+	$(MAKE) $(MT_MAKEOPTS) CFLAGS="$(CFLAGS) \$$(INC) \$$(ARCH)" -C src/ megatrace
 	mv src/megatrace src/megatrace.i386
 	$(MAKE) clean -C src/
 	$(MAKE) $(MY_MAKEOPTS) CFLAGS="$(CFLAGS) \$$(INC) \$$(ARCH)" -C src/