Merge rubrica (2.0-1.3) (universe) from Debian Unstable (universe)

[Vibhav Pant]

rubrica (2.0-1.3) unstable; urgency=low

  * Non-maintainer upload.
  * Fix "FTBFS on kfreebsd-any & hurd-i386 due to rpath":
    - autoreconf: include dh-autoreconf CDBS snippet und build-depend on
      dh-autoreconf
    - add additional build dependencies needed after autoreconfing: intltool,
      gtk-doc-tools
    Thanks to Samuel Thibault for the bug report.
    (Closes: #677361)

[Charlie_Smotherman (cjsmo)]

Please recheck your diff's, they look a little odd to me :)

diff -u spl-1.0~pre6/debian/changelog spl-1.0~pre6/debian/changelog
--- spl-1.0~pre6/debian/changelog
+++ spl-1.0~pre6/debian/changelog
@@ -1,3 +1,14 @@
+spl (1.0~pre6-4ubuntu1) raring; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ + Add 03_ubuntu_multiarch:
+ debian/rules: Use multiarch locations. Fixes FTBFS. (LP: #852606)
+ - Prefer Debian's 02_fix-ld---as-needed-ftbfs, which means we need
+ to reverse-apply it in the actual source so that the patch will
+ apply upon `quilt push -a'.
+
+ -- Vibhav Pant <email address hidden> Sun, 02 Dec 2012 16:56:43 +0530

[Bhavani Shankar (bhavi)]

Hi Vibhav,

Please submit a patch against rubrica package :-)

Regards
Bhavani

[Bhavani Shankar (bhavi)]

And feel free to subscribe sponsors once done :-)

Regards
Bhavani

[Benjamin Drung (bdrung)]

The debian -> ubuntu diff didn't apply:

patching file debian/control
patching file debian/changelog
patch: **** malformed patch at line 28: * Non-maintainer upload.

You probably adjusted your changelog entry and the number of lines changed. I have manually fixed it.

[Benjamin Drung (bdrung)]

Thanks. Uploaded.

[Launchpad Janitor (janitor)]

This bug was fixed in the package rubrica - 2.0-1.3ubuntu1

---------------
rubrica (2.0-1.3ubuntu1) raring; urgency=low

  * Merge from Debian unstable (LP: #1085620). Remaining changes:
    - Pass gthread parameter to the compiler and check for the same during build
      to fix FTBFS with GLib.

rubrica (2.0-1.3) unstable; urgency=low

  * Non-maintainer upload.
  * Fix "FTBFS on kfreebsd-any & hurd-i386 due to rpath":
    - autoreconf: include dh-autoreconf CDBS snippet und build-depend on
      dh-autoreconf
    - add additional build dependencies needed after autoreconfing: intltool,
      gtk-doc-tools
    Thanks to Samuel Thibault for the bug report.
    (Closes: #677361)
 -- Vibhav Pant <email address hidden> Mon, 03 Dec 2012 20:46:11 +0100