This package was blocking a cruft removal in raspbian so I took a look.

First I fixed the error given in the bug report. This was caused by unmatched bracket types in the Makefile. I guess make must have got stricter.

Then I uploaded it to raspbian and discovered that it still had a dependency on the cruft package. Further investigation showed this was a hardcoded dependency. After taking a quick look on packages.debian.org I changed the hardcoded dependency from liblua5.1-socket2 to lua-socket.

A debdiff of what I uploaded to raspbian is attached. I have no intent to NMU this in debian.
diff -Nru ekeyd-1.1.5/debian/changelog ekeyd-1.1.5/debian/changelog
--- ekeyd-1.1.5/debian/changelog        2013-05-21 15:17:42.000000000 +0000
+++ ekeyd-1.1.5/debian/changelog        2013-08-26 12:03:11.000000000 +0000
@@ -1,3 +1,15 @@
+ekeyd (1.1.5-5+rpi2) jessie-staging; urgency=low
+
+  * Change hardcoded dependency on liblua5.1-socket2 to lua-socket
+
+ -- Peter Michael Green <plugw...@raspbian.org>  Mon, 26 Aug 2013 12:01:50 
+0000
+
+ekeyd (1.1.5-5+rpi1) jessie-staging; urgency=low
+
+  * Fix incorrect variable reference in Makefile
+
+ -- Peter Michael Green <plugw...@raspbian.org>  Mon, 26 Aug 2013 10:21:26 
+0000
+
 ekeyd (1.1.5-5) unstable; urgency=low
 
   * Have init scripts not terminate if start-stop-daemon exits with an 
diff -Nru ekeyd-1.1.5/debian/control ekeyd-1.1.5/debian/control
--- ekeyd-1.1.5/debian/control  2012-05-18 12:17:24.000000000 +0000
+++ ekeyd-1.1.5/debian/control  2013-08-26 12:01:40.000000000 +0000
@@ -8,7 +8,7 @@
 
 Package: ekeyd
 Architecture: any
-Depends: ${shlibs:Depends}, lua5.1, liblua5.1-socket2, ${misc:Depends}
+Depends: ${shlibs:Depends}, lua5.1, lua-socket, ${misc:Depends}
 Recommends: udev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 Suggests: munin-node
 Description: Simtec Electronics UDEKEY01 Entropy Key Daemon
diff -Nru ekeyd-1.1.5/debian/patches/makefile-fix-variable-reference.patch 
ekeyd-1.1.5/debian/patches/makefile-fix-variable-reference.patch
--- ekeyd-1.1.5/debian/patches/makefile-fix-variable-reference.patch    
1970-01-01 00:00:00.000000000 +0000
+++ ekeyd-1.1.5/debian/patches/makefile-fix-variable-reference.patch    
2013-08-26 10:25:42.000000000 +0000
@@ -0,0 +1,22 @@
+Description: Fix variable references in Makefile.
+ According to the Make manual variable references can use either braces or
+ paranthesis. The Makefile contained a couple of references which opened with
+ one but closed with the other. It seems make tolerated this in the past but
+ no longer does so.
+Author: Peter Michael Green <plugw...@raspbian.org>
+
+--- ekeyd-1.1.5.orig/Makefile
++++ ekeyd-1.1.5/Makefile
+@@ -29,10 +29,10 @@ endif
+ all: host
+ 
+ host:
+-      ${MAKE} -C host BUILD_ULUSB=${BUILD_ULUSBD} 
BUILD_EGDLINUX=${BUILD_EGDLINUX} DESTDIR=$(DESTDIR} 
++      ${MAKE} -C host BUILD_ULUSB=${BUILD_ULUSBD} 
BUILD_EGDLINUX=${BUILD_EGDLINUX} DESTDIR=${DESTDIR} 
+ 
+ clean:
+-      ${MAKE} -C host BUILD_ULUSB=${BUILD_ULUSBD} 
BUILD_EGDLINUX=${BUILD_EGDLINUX} DESTDIR=$(DESTDIR}  clean
++      ${MAKE} -C host BUILD_ULUSB=${BUILD_ULUSBD} 
BUILD_EGDLINUX=${BUILD_EGDLINUX} DESTDIR=${DESTDIR}  clean
+ 
+ install:
+       ${MAKE} -C host BUILD_ULUSB=$(BUILD_ULUSBD) 
BUILD_EGDLINUX=$(BUILD_EGDLINUX) DESTDIR=$(DESTDIR) install
diff -Nru ekeyd-1.1.5/debian/patches/series ekeyd-1.1.5/debian/patches/series
--- ekeyd-1.1.5/debian/patches/series   2012-05-18 11:57:59.000000000 +0000
+++ ekeyd-1.1.5/debian/patches/series   2013-08-26 10:22:58.000000000 +0000
@@ -1,2 +1,3 @@
 harden-egd.patch
 versionfix.patch
+makefile-fix-variable-reference.patch

Reply via email to