Sync nauty 2.4-2 (multiverse) from Debian unstable (non-free)

[Kamal Mostafa]

Please sync nauty 2.4-2 (multiverse) from Debian unstable (main)

** New version fixes the nauty FTBFS detailed below. **

Changelog entries since current lucid version 2.4~b7-2:

nauty (2.4-2) unstable; urgency=low

  * Fix depends of libnauty-dev to libnauty1d. Thanks to Jan Hauke Rahm
  for noticing.

 -- David Bremner <email address hidden> Tue, 23 Feb 2010 06:44:50 -0400

nauty (2.4-1) unstable; urgency=low

  * New upstream version
  * Fix FTBFS (Closes: #569626), (LP: #521190).
    - Caused by getline becoming visible in stdio.h by default
    - Rename getline to gtools_getline
    - Bump soname because of changed ABI
    - Thanks to Kamal Mostafa <email address hidden>, for the report and patch.
  * Update standards version to 3.8.4 (no changes)
  * Convert to source format 3.0 (quilt)

 -- David Bremner <email address hidden> Sat, 13 Feb 2010 05:27:59 -0400

-----

http://launchpadlibrarian.net/39035800/buildlog_ubuntu-lucid-i386.nauty_2.4~b7-2_FAILEDTOBUILD.txt.gz

gcc -c -g -O2 gtools.c
In file included from gtools.c:6:
gtools.h:159: error: conflicting types for 'getline'
/usr/include/stdio.h:651: note: previous declaration of 'getline' was here
gtools.c:375: error: conflicting types for 'getline'
/usr/include/stdio.h:651: note: previous declaration of 'getline' was here
gtools.c: In function 'gt_abort':
gtools.c:1835: warning: format not a string literal and no format arguments
make[2]: *** [gtools.o] Error 1

[Kamal Mostafa (kamalmostafa)]

Attached branch fixes the FTBFS by renaming the package's internal "getline" routine to "gtools_getline" to avoid the namespace conflict. Patch has been forwarded to Debian.

[Fabrice Coutadeur (fabricesp)]

Hi,

As it seems Debian is moving on to fix this FTBFS and the package in Ubuntu comes directly from Debian, I'd prefer to wait a bit to see if we can sync the package directly, instead of diverging now to sync again later.

If you see that it get stuck, please subscribe again sponsors to get the fix uploaded.

Thanks,
Fabrice

[Kamal Mostafa (kamalmostafa)]

The problem is now fixed upstream. Debian's nauty 2.4-2 builds fine on Lucid. Converting to a sync request.

[Benjamin Drung (bdrung)]

Are the changes between 2.4~b7-2 and 2.4-2 only bug fixes or are new features introduced?

[Kamal Mostafa (kamalmostafa)]

The only changes are bug fixes, as documented in the changelog entries above.

The only code change is the renaming of a routine "getline" to gtools_getline to avoid namespace clash with stdio.h, and that change is required to fix FTBFS on Lucid.

The other changes mentioned are a build-deps fix and small packaging updates.

[Benjamin Drung (bdrung)]

package builds, sync request ACK'd

[James Westby (james-w)]

[Updating] nauty (2.4~b7-2 [Ubuntu] < 2.4-2 [Debian])
 * Trying to add nauty...
  - <nauty_2.4.orig.tar.gz: downloading from http://ftp.debian.org/debian/>
  - <nauty_2.4-2.dsc: downloading from http://ftp.debian.org/debian/>
  - <nauty_2.4-2.debian.tar.gz: downloading from http://ftp.debian.org/debian/>

[James Westby (james-w)]

[Updating] nauty (2.4~b7-2 [Ubuntu] < 2.4-2 [Debian])
 * Trying to add nauty...
  - <nauty_2.4.orig.tar.gz: cached>
  - <nauty_2.4-2.dsc: cached>
  - <nauty_2.4-2.debian.tar.gz: cached>