diff -u sysprof-1.0.9/debian/changelog sysprof-1.0.9/debian/changelog --- sysprof-1.0.9/debian/changelog +++ sysprof-1.0.9/debian/changelog @@ -1,3 +1,18 @@ +sysprof (1.0.9-1ubuntu1) hardy; urgency=low + + * Rebuild for recent libbfd (from binutils) and link statically + against it (LP: #46224) + Add debian/patches/static-libbfd.dpatch from Debian BTS, + provided by Michel Dänzer. + * Better help in case the sysprof-module is not loaded/available + (LP: #30160) + Add debian/patches/better_help_for_missing_module.dpatch + * debian/control: Standards-Version 3.7.3 + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Daniel Hahler Wed, 23 Jan 2008 23:27:38 +0100 + sysprof (1.0.9-1) unstable; urgency=low * New upstream release. diff -u sysprof-1.0.9/debian/control sysprof-1.0.9/debian/control --- sysprof-1.0.9/debian/control +++ sysprof-1.0.9/debian/control @@ -1,9 +1,10 @@ Source: sysprof Section: devel Priority: optional -Maintainer: Samuel Mimram +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Samuel Mimram Build-Depends: debhelper (>= 5.0.37), autotools-dev, automake1.9, binutils-dev (>= 2.17-1), bzip2, libgtk2.0-dev (>= 2.6.0), libglade2-dev, dpatch -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: sysprof Architecture: i386 amd64 diff -u sysprof-1.0.9/debian/patches/00list sysprof-1.0.9/debian/patches/00list --- sysprof-1.0.9/debian/patches/00list +++ sysprof-1.0.9/debian/patches/00list @@ -2,0 +3,2 @@ +better_help_for_missing_module +static-libbfd only in patch2: unchanged: --- sysprof-1.0.9.orig/debian/patches/better_help_for_missing_module.dpatch +++ sysprof-1.0.9/debian/patches/better_help_for_missing_module.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## better_help_for_missing_module.dpatch by Daniel Hahler +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Better help in case the sysprof-module is not loaded. (LP: #30160) + +@DPATCH@ +diff -urNad sysprof-1.0.9~/sysprof.c sysprof-1.0.9/sysprof.c +--- sysprof-1.0.9~/sysprof.c 2007-10-21 23:43:43.000000000 +0200 ++++ sysprof-1.0.9/sysprof.c 2008-01-23 23:00:59.503183308 +0100 +@@ -560,7 +560,14 @@ + "\n" + " modprobe sysprof-module\n" + "\n" +- "as root."); ++ "as root.\n" ++ "\n" ++ "You may need to build and install this module first:\n" ++ " 1. Install the package sysprof-module-source\n" ++ " 2. Execute \"m-a a-i sysprof-module\"\n" ++ " 3. Load the module as described above\n" ++ " 4. Restart sysprof\n" ++ "See also /usr/share/doc/sysprof-module-source/README.Debian" ); + + update_sensitivity (app); + return; only in patch2: unchanged: --- sysprof-1.0.9.orig/debian/patches/static-libbfd.dpatch +++ sysprof-1.0.9/debian/patches/static-libbfd.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## static-libbfd.dpatch by Daniel Hahler +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Link statically against libbfd, because this changes often +## DP: with new binutils uploads and linking against the shared +## DP: libbfd is forbidden (see desc of binutils-dev). +## DP: Debian bug: #439272, LP: #46224 +## DP: Patch from Michel Dänzer + +@DPATCH@ +diff -urNad sysprof-1.0.9~/configure sysprof-1.0.9/configure +--- sysprof-1.0.9~/configure 2007-10-21 23:42:22.000000000 +0200 ++++ sysprof-1.0.9/configure 2008-01-23 22:49:11.255186239 +0100 +@@ -3759,7 +3759,7 @@ + { echo "$as_me:$LINENO: result: $ac_cv_lib_bfd_bfd_get_error" >&5 + echo "${ECHO_T}$ac_cv_lib_bfd_bfd_get_error" >&6; } + if test $ac_cv_lib_bfd_bfd_get_error = yes; then +- DEP_LIBS="$DEP_LIBS -lbfd -liberty" ++ DEP_LIBS="$DEP_LIBS /usr/lib/libbfd.a -liberty" + else + { { echo "$as_me:$LINENO: error: libbfd is required to compile sysprof" >&5 + echo "$as_me: error: libbfd is required to compile sysprof" >&2;} +diff -urNad sysprof-1.0.9~/configure.ac sysprof-1.0.9/configure.ac +--- sysprof-1.0.9~/configure.ac 2007-10-21 23:42:16.000000000 +0200 ++++ sysprof-1.0.9/configure.ac 2008-01-23 22:49:11.259187385 +0100 +@@ -90,7 +90,7 @@ + AC_CHECK_LIB(iberty, cplus_demangle_opname, [], + AC_MSG_ERROR([libiberty is required to compile sysprof]), -ldl)) + +-AC_CHECK_LIB(bfd, bfd_get_error, [DEP_LIBS="$DEP_LIBS -lbfd -liberty"], ++AC_CHECK_LIB(bfd, bfd_get_error, [DEP_LIBS="$DEP_LIBS /usr/lib/libbfd.a -liberty"], + AC_MSG_ERROR([libbfd is required to compile sysprof]), + -liberty) +