debdiff attached, as promised!
diff -Nru rhash-1.2.9/debian/changelog rhash-1.2.9/debian/changelog
--- rhash-1.2.9/debian/changelog        2012-06-17 05:11:36.000000000 -0700
+++ rhash-1.2.9/debian/changelog        2012-09-30 15:18:59.000000000 -0700
@@ -1,3 +1,14 @@
+rhash (1.2.9-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Slight simplification of debian/rules that aims to fix
+    parallel builds. In particular, we used to build a dynamically
+    linked rhash binary as 'rhash'; now, we build it as 'rhash-shared'
+    like the default of the upstream build system, and later rename it
+    to 'rhash' as needed. (Closes: #687398)
+
+ -- Asheesh Laroia <ashe...@asheesh.org>  Sun, 30 Sep 2012 15:16:28 -0700
+
 rhash (1.2.9-7) unstable; urgency=low
 
   * Fixed dependencies of ruby-rhash
diff -Nru rhash-1.2.9/debian/rules rhash-1.2.9/debian/rules
--- rhash-1.2.9/debian/rules    2012-06-15 21:54:00.000000000 -0700
+++ rhash-1.2.9/debian/rules    2012-09-30 15:20:21.000000000 -0700
@@ -63,7 +63,10 @@
 build-rhash:
        # Compile static/shared libraries and the program.
        +$(MAKE) lib-static lib-shared rhash-shared CFLAGS="$(CFLAGS)" 
LDFLAGS="$(LDFLAGS)" \
-               LIBCFLAGS="$(LIBCFLAGS)" LIBLDFLAGS="$(LIBLDFLAGS)" 
SHARED_TRG=rhash
+               LIBCFLAGS="$(LIBCFLAGS)" LIBLDFLAGS="$(LIBLDFLAGS)"
+       # Move the rhash_shared binary to be called rhash, so that the tests 
use that
+       # (and also since that is the binary name we will install into /usr/bin)
+       mv rhash_shared rhash
        # Compile language bindings.
        mkdir -p $(DESTDIR) && ln -fs $(CURDIR)/librhash $(DESTDIR)/rhash
        ln -fs $(CURDIR)/librhash/librhash.so.0 $(DESTDIR)/ && ln -fs 
$(DESTDIR)/librhash.so.0 $(DESTDIR)/librhash.so

Reply via email to