diff -Nru aegis-4.24.3/debian/changelog aegis-4.24.3/debian/changelog --- aegis-4.24.3/debian/changelog 2012-01-06 07:37:53.000000000 +0000 +++ aegis-4.24.3/debian/changelog 2012-01-04 17:37:11.000000000 +0000 @@ -1,9 +1,9 @@ -aegis (4.24.3-2ubuntu1) precise; urgency=low +aegis (4.24.3-3) unstable; urgency=low - * Fix FTBFS with -Werror=format-security (LP: #911761), patch by - peter green. + * update debian/po/ files + * Fixed format string error. (Closes: 643347) - -- Ilya Barygin Fri, 06 Jan 2012 11:37:34 +0400 + -- Walter Franzini Wed, 04 Jan 2012 18:36:48 +0100 aegis (4.24.3-2) unstable; urgency=low diff -Nru aegis-4.24.3/debian/control aegis-4.24.3/debian/control --- aegis-4.24.3/debian/control 2012-01-06 07:36:48.000000000 +0000 +++ aegis-4.24.3/debian/control 2011-12-27 18:32:22.000000000 +0000 @@ -1,8 +1,7 @@ Source: aegis Section: vcs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Walter Franzini +Maintainer: Walter Franzini Build-Depends: debhelper (>= 7), bison, zlib1g-dev, groff, gettext, uuid-dev, libcurl4-gnutls-dev, perl, libmagic-dev, gawk, cdbs (>= 0.4.23-1.1), rcs, ed, patchutils (>= 0.2.25), libxml2-dev, libbz2-dev, bzip2, po-debconf, cook, diff -Nru aegis-4.24.3/debian/patches/aegis-4.24.3-fix-debian-643347.patch aegis-4.24.3/debian/patches/aegis-4.24.3-fix-debian-643347.patch --- aegis-4.24.3/debian/patches/aegis-4.24.3-fix-debian-643347.patch 1970-01-01 00:00:00.000000000 +0000 +++ aegis-4.24.3/debian/patches/aegis-4.24.3-fix-debian-643347.patch 2011-12-28 09:25:05.000000000 +0000 @@ -0,0 +1,54 @@ +MIME-Version: 1.0 +Content-Type: application/aegis-patch +Subject: aegis.4.24 - [ Debian #643347] FTBFS format not a string literal and no format arguments +Content-Name: aegis.4.24.C520.patch +Content-Disposition: attachment; filename=aegis.4.24.C520.patch +X-Aegis-Project-Name: aegis.4.24 +X-Aegis-Change-Number: 520 + +# +# Summary: +# [ Debian #643347] FTBFS format not a string literal and no format +# arguments +# +# Description: +# Fixed a build problem on the Debian build farm. +# Thanks to Didier Raboud for reporting the problem and providing a +# patch. +# +# Signed-off-by: Walter Franzini +# +Index: b/aeget/get/project/integr_histo.cc +=================================================================== +--- a/aeget/get/project/integr_histo.cc 2011-12-28 10:20:56.000000000 +0100 ++++ b/aeget/get/project/integr_histo.cc 2011-12-28 10:24:37.000000000 +0100 +@@ -189,14 +189,14 @@ + if (recursive) + { + printf("faster "); +- emit_project_href(pp, ref.c_str()); ++ emit_project_href(pp,"%s", ref.c_str()); + printf("non-"); + } + else + { + printf("slower "); + ref += "+recursive"; +- emit_project_href(pp, ref.c_str()); ++ emit_project_href(pp,"%s", ref.c_str()); + } + printf("recursive listing available.

\n"); + +Index: b/libaegis/http.cc +=================================================================== +--- a/libaegis/http.cc 2011-12-28 10:20:56.000000000 +0100 ++++ b/libaegis/http.cc 2011-12-28 10:24:37.000000000 +0100 +@@ -404,7 +404,7 @@ + emit_change_href(change::pointer cp, const char *modifier) + { + if (cp->bogus) +- emit_project_href(cp->pp, modifier); ++ emit_project_href(cp->pp,"%s", modifier); + else + emit_change_href_n(cp->pp, magic_zero_decode(cp->number), modifier); + } diff -Nru aegis-4.24.3/debian/patches/fix-werror.patch aegis-4.24.3/debian/patches/fix-werror.patch --- aegis-4.24.3/debian/patches/fix-werror.patch 2012-01-06 07:39:28.000000000 +0000 +++ aegis-4.24.3/debian/patches/fix-werror.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -Description: fix FTBFS with -Werror=format-security -Author: peter green -Bug-Debian: http://bugs.debian.org/643347 -Bug-Ubuntu: https://launchpad.net/bugs/911761 - ---- aegis-4.24.3.orig/libaegis/http.cc -+++ aegis-4.24.3/libaegis/http.cc -@@ -404,7 +404,7 @@ void - emit_change_href(change::pointer cp, const char *modifier) - { - if (cp->bogus) -- emit_project_href(cp->pp, modifier); -+ emit_project_href(cp->pp,"%s", modifier); - else - emit_change_href_n(cp->pp, magic_zero_decode(cp->number), modifier); - } ---- aegis-4.24.3.orig/aeget/get/project/integr_histo.cc -+++ aegis-4.24.3/aeget/get/project/integr_histo.cc -@@ -189,14 +189,14 @@ get_project_integration_histogram(projec - if (recursive) - { - printf("faster "); -- emit_project_href(pp, ref.c_str()); -+ emit_project_href(pp,"%s", ref.c_str()); - printf("non-"); - } - else - { - printf("slower "); - ref += "+recursive"; -- emit_project_href(pp, ref.c_str()); -+ emit_project_href(pp,"%s", ref.c_str()); - } - printf("recursive listing available.

\n"); - diff -Nru aegis-4.24.3/debian/patches/series aegis-4.24.3/debian/patches/series --- aegis-4.24.3/debian/patches/series 2012-01-06 07:35:19.000000000 +0000 +++ aegis-4.24.3/debian/patches/series 2011-12-28 09:25:05.000000000 +0000 @@ -2,4 +2,4 @@ debian_remove_manpath_and_use_sensiblepager_in_aedpager.patch debian_install_aefp_binary.patch aegis-4.24.3-allow-white-space.patch -fix-werror.patch +aegis-4.24.3-fix-debian-643347.patch