Merge xorp 1.8.5-2 (universe) from Debian unstable (main)

[xteejx]

Please sync xorp 1.8.5-2 (universe) from Debian unstable (main)

Explanation of the Ubuntu delta and why it can be dropped:
  * Build on all architectures again, accidentally dropped in sync.
  * add build failure with GCC 4.7 work around from debian
    - debian/rules, debian/control: build with gcc-4.6
  * add build failure with GCC 4.7 work around from debian
    - debian/rules, debian/control: build with gcc-4.6
  * Merge from debian unstable. Remaining changes:
    + Build with -U_FORTIFY_SOURCE instead of -D_FORTIFY_SOURCE=0

Builds fine in trusty

Changelog entries since current trusty version 1.8.5-1.1ubuntu1:

xorp (1.8.5-2) unstable; urgency=low

  * Remade the previous work around to build with GCC 4.7 and 4.8, now use
    only cpp-4.6.
  * Fix bashism on bgp_xrl_shell_funcs.sh and fea_xrl_shell_funcs.sh
    scripts (Closes: #690647).
  * Make init.d more LSB compliant (Closes: #693776).

 -- Jose M Calhariz <email address hidden> Fri, 16 Aug 2013 19:51:12 +0100

[Sebastien Bacher (seb128)]

Thank you for your bug report, the architecture change is not in Debian though and it seems like a diff we still need
e.g http://launchpadlibrarian.net/123734322/xorp_1.8.5-1.1_1.8.5-1.1ubuntu1.diff.gz
without that the package is not going to build for armhf for example

Could you do a merge with those changes?

[xteejx (xteejx-deactivatedaccount)]

Updated to merge the arch change in debian/control, debdiffs attached

[Launchpad Janitor (janitor)]

This bug was fixed in the package xorp - 1.8.5-2ubuntu1

---------------
xorp (1.8.5-2ubuntu1) trusty; urgency=low

  * Merge from Debian unstable (LP: #1254779). Remaining changes:
    - Build on all architectures again.
 -- Roy Jamison <email address hidden> Wed, 27 Nov 2013 15:43:26 +0000