diff -Nru libinfinity-0.5.1/debian/changelog libinfinity-0.5.1/debian/changelog --- libinfinity-0.5.1/debian/changelog 2012-02-19 08:52:23.000000000 +0000 +++ libinfinity-0.5.1/debian/changelog 2012-02-19 12:18:31.000000000 +0000 @@ -1,8 +1,9 @@ -libinfinity (0.5.1-2ubuntu1) precise; urgency=low +libinfinity (0.5.1-3) unstable; urgency=low - * Updated aclocal.m4 to fix FTBFS with automake 1.11.3 (LP: #935237). + * Use dh-autoreconf to regenerate the build system. + (Closes: #657973) (LP: #935237) - -- Leo Iannacone Sun, 19 Feb 2012 02:37:16 +0100 + -- Philipp Kern Sun, 19 Feb 2012 13:17:47 +0100 libinfinity (0.5.1-2) unstable; urgency=low diff -Nru libinfinity-0.5.1/debian/control libinfinity-0.5.1/debian/control --- libinfinity-0.5.1/debian/control 2012-02-19 08:52:23.000000000 +0000 +++ libinfinity-0.5.1/debian/control 2012-02-19 12:16:14.000000000 +0000 @@ -1,8 +1,7 @@ Source: libinfinity Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Philipp Kern -Build-Depends: debhelper (>= 7.0.50), autotools-dev, automake, automake1.11, hardening-includes, libgnutls-dev, libgsasl7-dev, libxml2-dev, libgtk2.0-dev, libavahi-client-dev, gtk-doc-tools, libdaemon-dev, libpam-dev +Maintainer: Philipp Kern +Build-Depends: debhelper (>= 7.0.50), autotools-dev, dh-autoreconf, hardening-includes, libgnutls-dev, libgsasl7-dev, libxml2-dev, libgtk2.0-dev, libavahi-client-dev, gtk-doc-tools, libdaemon-dev, libpam-dev Build-Conflicts: autoconf2.13, automake1.4 Standards-Version: 3.9.2 Section: libs diff -Nru libinfinity-0.5.1/debian/patches/regenerate-aclocal.patch libinfinity-0.5.1/debian/patches/regenerate-aclocal.patch --- libinfinity-0.5.1/debian/patches/regenerate-aclocal.patch 2012-02-19 08:52:23.000000000 +0000 +++ libinfinity-0.5.1/debian/patches/regenerate-aclocal.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,431 +0,0 @@ -Description: Regenarate aclocal.m4 to fix FTBFS with automake 1.11.3. -Author: Leo Iannacone -Bug-Ubuntu: https://bugs.launchpad.net/bugs/935237 - ---- - aclocal.m4 | 146 ++++++++++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 101 insertions(+), 45 deletions(-) - ---- libinfinity.orig/aclocal.m4 -+++ libinfinity/aclocal.m4 -@@ -2931,14 +2931,7 @@ freebsd* | dragonfly*) - *) objformat=elf ;; - esac - fi -- # Handle Gentoo/FreeBSD as it was Linux -- case $host_vendor in -- gentoo) -- version_type=linux ;; -- *) -- version_type=freebsd-$objformat ;; -- esac -- -+ version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -@@ -2949,12 +2942,6 @@ freebsd* | dragonfly*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; -- linux) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- need_lib_prefix=no -- need_version=no -- ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in -@@ -2984,6 +2971,7 @@ gnu*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -@@ -3148,6 +3136,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -3753,7 +3753,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -@@ -4564,7 +4564,7 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -5022,6 +5022,9 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -+ linux* | k*bsd*-gnu | gnu*) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -5085,6 +5088,9 @@ dnl Note also adjust exclude_expsyms for - openbsd*) - with_gnu_ld=no - ;; -+ linux* | k*bsd*-gnu | gnu*) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes -@@ -5307,7 +5313,7 @@ _LT_EOF - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -5484,6 +5490,7 @@ _LT_EOF - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi -+ _LT_TAGVAR(link_all_deplibs, $1)=no - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -5792,7 +5799,7 @@ _LT_EOF - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -9114,12 +9121,15 @@ else - fi[]dnl - ])# PKG_CHECK_MODULES - --# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -+# Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - -+# serial 1 -+ - # AM_AUTOMAKE_VERSION(VERSION) - # ---------------------------- - # Automake X.Y traces this macro to ensure aclocal.m4 has been -@@ -9129,7 +9139,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], - [am__api_version='1.11' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.11.1], [], -+m4_if([$1], [1.11.3], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -9145,19 +9155,21 @@ m4_define([_AM_AUTOCONF_VERSION], []) - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.11.1])dnl -+[AM_AUTOMAKE_VERSION([1.11.3])dnl - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl - _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - - # AM_AUX_DIR_EXPAND -*- Autoconf -*- - --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - -+# serial 1 -+ - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets - # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to - # `$srcdir', `$srcdir/..', or `$srcdir/../..'. -@@ -9239,14 +9251,14 @@ AC_CONFIG_COMMANDS_PRE( - Usually this means the macro was only invoked conditionally.]]) - fi])]) - --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 --# Free Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -+# 2010, 2011 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 10 -+# serial 12 - - # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be - # written in clear, in which case automake, when reading aclocal.m4, -@@ -9286,6 +9298,7 @@ AC_CACHE_CHECK([dependency style of $dep - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. -+ rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. -@@ -9350,7 +9363,7 @@ AC_CACHE_CHECK([dependency style of $dep - break - fi - ;; -- msvisualcpp | msvcmsys) -+ msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. -@@ -9415,10 +9428,13 @@ AC_DEFUN([AM_DEP_TRACK], - if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -+ am__nodep='_no' - fi - AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) - AC_SUBST([AMDEPBACKSLASH])dnl - _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -+AC_SUBST([am__nodep])dnl -+_AM_SUBST_NOTMAKE([am__nodep])dnl - ]) - - # Generate code to set up dependency tracking. -*- Autoconf -*- -@@ -9640,12 +9656,15 @@ for _am_header in $config_headers :; do - done - echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - --# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -+# Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - -+# serial 1 -+ - # AM_PROG_INSTALL_SH - # ------------------ - # Define $install_sh. -@@ -9685,8 +9704,8 @@ AC_SUBST([am__leading_dot])]) - # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- - # From Jim Meyering - --# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 --# Free Software Foundation, Inc. -+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -+# 2011 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -9706,7 +9725,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) --AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) -+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], - [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful -@@ -9852,12 +9871,15 @@ else - fi - ]) - --# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -+# Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - -+# serial 1 -+ - # AM_PROG_MKDIR_P - # --------------- - # Check for `mkdir -p'. -@@ -9880,13 +9902,14 @@ esac - - # Helper functions for option handling. -*- Autoconf -*- - --# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -+# Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 4 -+# serial 5 - - # _AM_MANGLE_OPTION(NAME) - # ----------------------- -@@ -9894,13 +9917,13 @@ AC_DEFUN([_AM_MANGLE_OPTION], - [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - - # _AM_SET_OPTION(NAME) --# ------------------------------ -+# -------------------- - # Set option NAME. Presently that only means defining a flag for this option. - AC_DEFUN([_AM_SET_OPTION], - [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - - # _AM_SET_OPTIONS(OPTIONS) --# ---------------------------------- -+# ------------------------ - # OPTIONS is a space-separated list of Automake options. - AC_DEFUN([_AM_SET_OPTIONS], - [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -@@ -9976,13 +9999,13 @@ Check your system clock]) - fi - AC_MSG_RESULT(yes)]) - --# Copyright (C) 2009 Free Software Foundation, Inc. -+# Copyright (C) 2009, 2011 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 1 -+# serial 2 - - # AM_SILENT_RULES([DEFAULT]) - # -------------------------- -@@ -9997,18 +10020,50 @@ yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; - esac -+dnl -+dnl A few `make' implementations (e.g., NonStop OS and NextStep) -+dnl do not support nested variable expansions. -+dnl See automake bug#9928 and bug#10237. -+am_make=${MAKE-make} -+AC_CACHE_CHECK([whether $am_make supports nested variables], -+ [am_cv_make_support_nested_variables], -+ [if AS_ECHO([['TRUE=$(BAR$(V)) -+BAR0=false -+BAR1=true -+V=1 -+am__doit: -+ @$(TRUE) -+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then -+ am_cv_make_support_nested_variables=yes -+else -+ am_cv_make_support_nested_variables=no -+fi]) -+if test $am_cv_make_support_nested_variables = yes; then -+ dnl Using `$V' instead of `$(V)' breaks IRIX make. -+ AM_V='$(V)' -+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -+else -+ AM_V=$AM_DEFAULT_VERBOSITY -+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -+fi -+AC_SUBST([AM_V])dnl -+AM_SUBST_NOTMAKE([AM_V])dnl -+AC_SUBST([AM_DEFAULT_V])dnl -+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl - AC_SUBST([AM_DEFAULT_VERBOSITY])dnl - AM_BACKSLASH='\' - AC_SUBST([AM_BACKSLASH])dnl - _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl - ]) - --# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - -+# serial 1 -+ - # AM_PROG_INSTALL_STRIP - # --------------------- - # One issue with vendor `install' (even GNU) is that you can't -@@ -10031,13 +10086,13 @@ fi - INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - AC_SUBST([INSTALL_STRIP_PROGRAM])]) - --# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 2 -+# serial 3 - - # _AM_SUBST_NOTMAKE(VARIABLE) - # --------------------------- -@@ -10046,13 +10101,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) - AC_DEFUN([_AM_SUBST_NOTMAKE]) - - # AM_SUBST_NOTMAKE(VARIABLE) --# --------------------------- -+# -------------------------- - # Public sister of _AM_SUBST_NOTMAKE. - AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - - # Check how to create a tarball. -*- Autoconf -*- - --# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -10074,10 +10129,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_ - # a tarball read from stdin. - # $(am__untar) < result.tar - AC_DEFUN([_AM_PROG_TAR], --[# Always define AMTAR for backward compatibility. --AM_MISSING_PROG([AMTAR], [tar]) -+[# Always define AMTAR for backward compatibility. Yes, it's still used -+# in the wild :-( We should find a proper way to deprecate it ... -+AC_SUBST([AMTAR], ['$${TAR-tar}']) - m4_if([$1], [v7], -- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) - AC_MSG_CHECKING([how to create a $1 tar archive]) diff -Nru libinfinity-0.5.1/debian/patches/series libinfinity-0.5.1/debian/patches/series --- libinfinity-0.5.1/debian/patches/series 2012-02-19 08:52:23.000000000 +0000 +++ libinfinity-0.5.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -regenerate-aclocal.patch diff -Nru libinfinity-0.5.1/debian/rules libinfinity-0.5.1/debian/rules --- libinfinity-0.5.1/debian/rules 2011-11-11 17:31:27.000000000 +0000 +++ libinfinity-0.5.1/debian/rules 2012-02-19 12:17:11.000000000 +0000 @@ -8,7 +8,7 @@ LDFLAGS+=$(HARDENING_LDFLAGS) %: - dh $@ --parallel + dh $@ --parallel --with autoreconf override_dh_auto_configure: automake-1.11