diff -Nru twinkle-1.4.2/debian/changelog twinkle-1.4.2/debian/changelog --- twinkle-1.4.2/debian/changelog 2013-11-28 20:48:30.000000000 +0000 +++ twinkle-1.4.2/debian/changelog 2014-01-26 23:53:34.000000000 +0000 @@ -1,10 +1,9 @@ -twinkle (1:1.4.2-3ubuntu1) trusty; urgency=low +twinkle (1:1.4.2-4) unstable; urgency=medium - * Add missing Build-Depends on libncurses5-dev - * Build-Depend on dh-autoreconf and use its CDBS integration to update - autotools files for use with automake1.14 + * Tweak for automake 1.14. closes: #733611. + * Bump to Standards-Version 3.9.5. - -- Andreas Moog Thu, 28 Nov 2013 21:17:58 +0100 + -- Clint Adams Sun, 26 Jan 2014 18:37:34 -0500 twinkle (1:1.4.2-3) unstable; urgency=low diff -Nru twinkle-1.4.2/debian/control twinkle-1.4.2/debian/control --- twinkle-1.4.2/debian/control 2013-11-28 20:48:52.000000000 +0000 +++ twinkle-1.4.2/debian/control 2014-01-27 00:01:31.000000000 +0000 @@ -1,17 +1,16 @@ Source: twinkle Section: comm Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Clint Adams +Maintainer: Clint Adams Build-Depends: debhelper (>= 7), cdbs, help2man, - autotools-dev, autoconf, + autotools-dev, autoconf, automake, libcommoncpp2-dev (>= 1.4.2), libccrtp-dev, libzrtpcpp-dev (>= 1.4.0), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libgsm1-dev, libsndfile1-dev, libspeex-dev, libspeexdsp-dev, libreadline-dev, - libboost-regex-dev, libxml2-dev, libxpm-dev, libmagic-dev, - dh-autoreconf, libncurses5-dev -Standards-Version: 3.9.4 + libboost-regex-dev, libxml2-dev, libxpm-dev, libmagic-dev + , libncurses-dev +Standards-Version: 3.9.5 Homepage: http://www.twinklephone.com/ Package: twinkle diff -Nru twinkle-1.4.2/debian/patches/newer-automake.diff twinkle-1.4.2/debian/patches/newer-automake.diff --- twinkle-1.4.2/debian/patches/newer-automake.diff 2013-07-27 15:39:38.000000000 +0000 +++ twinkle-1.4.2/debian/patches/newer-automake.diff 2014-01-26 23:45:02.000000000 +0000 @@ -1,7 +1,5 @@ -Index: twinkle-1.4.2/configure.in -=================================================================== ---- twinkle-1.4.2.orig/configure.in 2013-07-25 11:32:43.203525624 -0400 -+++ twinkle-1.4.2/configure.in 2013-07-25 12:17:17.239196424 -0400 +--- a/configure.in ++++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(src/phone.h) +AC_INIT(twinkle,[1.4.2]) @@ -17,13 +15,11 @@ AC_DEFINE(VERSION_DATE,["February 25 2009"],[Version release date]) AC_PROG_CC AC_PROG_CXX -Index: twinkle-1.4.2/aclocal.m4 -=================================================================== ---- twinkle-1.4.2.orig/aclocal.m4 2013-07-25 12:03:07.037354140 -0400 -+++ twinkle-1.4.2/aclocal.m4 2013-07-25 12:18:01.034465825 -0400 +--- a/aclocal.m4 ++++ b/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -+# generated automatically by aclocal 1.13.3 -*- Autoconf -*- ++# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -64,10 +60,10 @@ -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], -+[am__api_version='1.13' ++[am__api_version='1.14' +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.13.3], [], ++m4_if([$1], [1.14.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + @@ -86,7 +82,7 @@ +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) -+[AM_AUTOMAKE_VERSION([1.13.3])dnl ++[AM_AUTOMAKE_VERSION([1.14.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -437,7 +433,7 @@ # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], -@@ -568,29 +635,14 @@ +@@ -568,32 +635,23 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) @@ -468,7 +464,16 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. -@@ -606,16 +658,20 @@ ++dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. ++m4_define([AC_PROG_CC], ++m4_defn([AC_PROG_CC]) ++[_AM_PROG_CC_C_O ++]) ++ + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) + # AM_INIT_AUTOMAKE([OPTIONS]) + # ----------------------------------------------- +@@ -606,16 +664,20 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], @@ -494,7 +499,7 @@ fi # test whether we have cygpath -@@ -631,48 +687,81 @@ +@@ -631,48 +693,121 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], @@ -565,6 +570,7 @@ - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-]) + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl @@ -584,18 +590,58 @@ +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl - ]) - ++ ++# POSIX will say in a future version that running "rm -f" with no argument ++# is OK; and we want to be able to make that assumption in our Makefile ++# recipes. So use an aggressive probe to check that the usage we want is ++# actually supported "in the wild" to an acceptable degree. ++# See automake bug#10828. ++# To make any issue more visible, cause the running configure to be aborted ++# by default if the 'rm' program in use doesn't match our expectations; the ++# user can still override this though. ++if rm -f && rm -fr && rm -rf; then : OK; else ++ cat >&2 <<'END' ++Oops! ++ ++Your 'rm' program seems unable to run without file operands specified ++on the command line, even when the '-f' option is present. This is contrary ++to the behaviour of most rm programs out there, and not conforming with ++the upcoming POSIX standard: ++ ++Please tell bug-automake@gnu.org about your system, including the value ++of your $PATH and any error possibly output before this message. This ++can help us improve future automake versions. + ++END ++ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then ++ echo 'Configuration will proceed anyway, since you have set the' >&2 ++ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 ++ echo >&2 ++ else ++ cat >&2 <<'END' ++Aborting the configuration process, to ensure you take notice of the issue. ++ ++You can download and install GNU coreutils to get an 'rm' implementation ++that behaves properly: . ++ ++If you want to complete the configuration process using your problematic ++'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM ++to "yes", and re-run configure. ++ ++END ++ AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) ++ fi ++fi]) ++ +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) -+ # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header -@@ -683,18 +772,19 @@ +@@ -683,18 +818,19 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. @@ -618,7 +664,7 @@ # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, -@@ -705,17 +795,22 @@ +@@ -705,17 +841,22 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl @@ -646,7 +692,7 @@ # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], -@@ -731,14 +826,12 @@ +@@ -731,14 +872,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- @@ -662,7 +708,7 @@ # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. -@@ -746,7 +839,7 @@ +@@ -746,7 +885,7 @@ [am_make=${MAKE-make} cat > confinc << 'END' am__doit: @@ -671,7 +717,7 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -@@ -756,24 +849,24 @@ +@@ -756,24 +895,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf @@ -711,7 +757,7 @@ fi AC_SUBST([am__include]) AC_SUBST([am__quote]) -@@ -783,15 +876,12 @@ +@@ -783,15 +922,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- @@ -728,7 +774,7 @@ # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], -@@ -799,112 +889,83 @@ +@@ -799,112 +935,83 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) @@ -883,20 +929,86 @@ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- -@@ -914,45 +975,60 @@ +@@ -912,47 +1019,126 @@ + AC_DEFUN([_AM_IF_OPTION], + [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - # Check to make sure that the build environment is sane. -*- Autoconf -*- +-# Check to make sure that the build environment is sane. -*- Autoconf -*- ++# Copyright (C) 1999-2013 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. ++ ++# _AM_PROG_CC_C_O ++# --------------- ++# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC ++# to automatically call this. ++AC_DEFUN([_AM_PROG_CC_C_O], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([compile])dnl ++AC_LANG_PUSH([C])dnl ++AC_CACHE_CHECK( ++ [whether $CC understands -c and -o together], ++ [am_cv_prog_cc_c_o], ++ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) ++ # Make sure it works both with $CC and with simple cc. ++ # Following AC_PROG_CC_C_O, we do the test twice because some ++ # compilers refuse to overwrite an existing .o file with -o, ++ # though they will create one. ++ am_cv_prog_cc_c_o=yes ++ for am_i in 1 2; do ++ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ ++ && test -f conftest2.$ac_objext; then ++ : OK ++ else ++ am_cv_prog_cc_c_o=no ++ break ++ fi ++ done ++ rm -f core conftest* ++ unset am_i]) ++if test "$am_cv_prog_cc_c_o" != yes; then ++ # Losing compiler, so override with the script. ++ # FIXME: It is wrong to rewrite CC. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__CC in this case, ++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" ++ CC="$am_aux_dir/compile $CC" ++fi ++AC_LANG_POP([C])]) ++ ++# For backward compatibility. ++AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -+# Copyright (C) 1996-2013 Free Software Foundation, Inc. ++# Copyright (C) 2001-2013 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 -- ++# AM_RUN_LOG(COMMAND) ++# ------------------- ++# Run COMMAND, save the exit status in ac_status, and log it. ++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) ++AC_DEFUN([AM_RUN_LOG], ++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD ++ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ (exit $ac_status); }]) ++ ++# Check to make sure that the build environment is sane. -*- Autoconf -*- ++ ++# Copyright (C) 1996-2013 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. + # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], @@ -969,7 +1081,7 @@ test "$[2]" = conftest.file ) then -@@ -962,9 +1038,85 @@ +@@ -962,9 +1148,85 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi @@ -1057,7 +1169,7 @@ # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, -@@ -972,40 +1124,55 @@ +@@ -972,40 +1234,55 @@ # AM_PROG_INSTALL_STRIP # --------------------- @@ -1124,7 +1236,7 @@ # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory -@@ -1015,78 +1182,116 @@ +@@ -1015,78 +1292,116 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar @@ -1305,10 +1417,8 @@ -m4_include([m4/vl_lib_readline.m4]) m4_include([acinclude.m4]) -Index: twinkle-1.4.2/Makefile.am -=================================================================== ---- twinkle-1.4.2.orig/Makefile.am 2013-07-25 12:02:25.490044654 -0400 -+++ twinkle-1.4.2/Makefile.am 2013-07-25 12:25:44.682747804 -0400 +--- a/Makefile.am ++++ b/Makefile.am @@ -5,7 +5,7 @@ noinst_SCRIPTS = twinkle.desktop diff -Nru twinkle-1.4.2/debian/rules twinkle-1.4.2/debian/rules --- twinkle-1.4.2/debian/rules 2013-11-28 20:16:40.000000000 +0000 +++ twinkle-1.4.2/debian/rules 2014-01-26 23:47:53.000000000 +0000 @@ -3,11 +3,13 @@ URL = http://www.xs4all.nl/~mfnboer/twinkle/download/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz -include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk DEB_CONFIGURE_EXTRA_FLAGS := --without-ilbc --without-kde +DEB_AUTO_UPDATE_AUTOCONF := yes +DEB_AUTO_UPDATE_AUTOMAKE := 1.14 +DEB_AUTOMAKE_ARGS := --add-missing --copy get-orig-source: @@dh_testdir