diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2008-12-14 22:55:07 +0000 |
---|---|---|
committer | Ritesh Raj Sarraf <rrs@researchut.com> | 2010-05-20 01:24:37 +0530 |
commit | 6fa9fd315e5bf9db109ca1cfe507baf1b8b4c71c (patch) | |
tree | baa76bfb42aa294cc4a3336c2df6dad72b7ba861 | |
parent | a9b5fad28f78e6f5342ba4f4d1c8bb83c244e99f (diff) |
Imported Debian patch 1.0.12-1debian/1.0.12-1
-rw-r--r-- | debian/changelog | 66 | ||||
-rw-r--r-- | debian/control | 15 | ||||
-rw-r--r-- | debian/control.modules.in | 4 | ||||
-rw-r--r-- | debian/copyright | 2 | ||||
-rw-r--r-- | debian/patches/00list | 2 | ||||
-rw-r--r-- | debian/patches/better_help_for_missing_module.dpatch | 26 | ||||
-rw-r--r-- | debian/patches/static_libbfd.dpatch | 31 | ||||
-rwxr-xr-x | debian/rules | 4 | ||||
-rw-r--r-- | debian/sysprof.desktop | 8 | ||||
-rw-r--r-- | debian/sysprof.menu | 2 |
10 files changed, 148 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 58dfd65..65d0bae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,69 @@ +sysprof (1.0.12-1) unstable; urgency=low + + * Orphan package + * New upstream release + + Fix compiling on amd64 with kernel >= 2.6.25 (Closes: #508265) + * Change sysprof-module-source to Architecture: all since the package + itself is not architecture-dependent + + -- Ben Hutchings <ben@decadent.org.uk> Sun, 14 Dec 2008 22:55:07 +0000 + +sysprof (1.0.11-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release. + + Don't use proc_root. (Closes: #484838). + * Remove encoding tag from desktop file. + * Fix copyright line in debian/copyright. + * Bump Standards Version to 3.8.0. (No changes needed). + + -- Barry deFreese <bdefreese@debian.org> Wed, 29 Oct 2008 13:57:20 -0400 + +sysprof (1.0.10-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Mimram <smimram@debian.org> Fri, 06 Jun 2008 00:53:57 +0200 + +sysprof (1.0.9-2) unstable; urgency=low + + * Link statically with libbfd (thanks Michel Dänzer), closes: #439272. + * Better help message when module is not found (thanks Daniel Hahler), + closes: #462321. + + -- Samuel Mimram <smimram@debian.org> Fri, 25 Jan 2008 19:29:19 +0100 + +sysprof (1.0.9-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Mimram <smimram@debian.org> Thu, 15 Nov 2007 11:06:43 +0000 + +sysprof (1.0.8-4) unstable; urgency=low + + * Added a .desktop file, closes: #444132. + + -- Samuel Mimram <smimram@debian.org> Tue, 09 Oct 2007 11:24:47 +0000 + +sysprof (1.0.8-3) unstable; urgency=low + + * Rebuild against latest binutils, closes: #434361. + + -- Samuel Mimram <smimram@debian.org> Thu, 09 Aug 2007 10:41:01 +0200 + +sysprof (1.0.8-2) unstable; urgency=low + + * Don't build sysprof on ia64 since it is not supposed to be useable on this + arch, closes: #422573. + + -- Samuel Mimram <smimram@debian.org> Mon, 07 May 2007 10:11:07 +0200 + +sysprof (1.0.8-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Mimram <smimram@debian.org> Mon, 25 Dec 2006 23:17:31 +0000 + sysprof (1.0.7-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 033a352..a285af7 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,15 @@ Source: sysprof Section: devel Priority: optional -Maintainer: Samuel Mimram <smimram@debian.org> -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 +Maintainer: Debian QA Group <packages@qa.debian.org> +Build-Depends: debhelper (>= 5.0.37), autotools-dev, automake1.9, binutils-dev (>= 2.17), bzip2, libgtk2.0-dev (>= 2.6.0), libglade2-dev, dpatch +Standards-Version: 3.8.0 Package: sysprof -Architecture: i386 amd64 ia64 +Architecture: i386 amd64 Depends: ${shlibs:Depends} Recommends: sysprof-module-source -Description: A system-wide linux profiler +Description: A system-wide Linux profiler Sysprof is a sampling CPU profiler that uses a Linux kernel module to profile the entire system, not just a single application. Sysprof handles shared libraries and applications do not need to be recompiled. In fact they don't @@ -25,7 +25,7 @@ Description: A system-wide linux profiler sysprof. Package: sysprof-module-source -Architecture: i386 amd64 ia64 +Architecture: all Depends: debhelper (>= 4.1.0), build-essential, module-assistant, bzip2 Description: Source for the sysprof module Sysprof is a sampling CPU profiler that uses a Linux kernel module to profile @@ -35,4 +35,5 @@ Description: Source for the sysprof module . This package contains the source for the sysprof's kernel module. . - You need a linux kernel version 2.6.11 or newer. + You need a Linux kernel version 2.6.11 or newer on an i386 or amd64 + processor. diff --git a/debian/control.modules.in b/debian/control.modules.in index 6a857fa..7699524 100644 --- a/debian/control.modules.in +++ b/debian/control.modules.in @@ -2,8 +2,8 @@ Source: sysprof Section: devel Priority: optional Maintainer: Samuel Mimram <smimram@debian.org> -Build-Depends: debhelper (>= 4.1.0), bzip2 -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5.0.37), bzip2 +Standards-Version: 3.8.0 Package: sysprof-module-_KVERS_ Architecture: any diff --git a/debian/copyright b/debian/copyright index dc87c71..e2e691d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Sat, 29 Oct 2005 14:22:59 +0200. It was downloaded from http://www.daimi.au.dk/~sandmann/sysprof/ -Copyright Holder: Søren Sandmann <sandmann@redhat.com> +Copyright: Copyright (C) 2004-2008 Søren Sandmann <sandmann@redhat.com> License: diff --git a/debian/patches/00list b/debian/patches/00list index 4f5e13e..c0d0ecb 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1,4 @@ foreign_kernel package_version +static_libbfd +better_help_for_missing_module diff --git a/debian/patches/better_help_for_missing_module.dpatch b/debian/patches/better_help_for_missing_module.dpatch new file mode 100644 index 0000000..ad027e7 --- /dev/null +++ b/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 <ubuntu@thequod.de> +## +## 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:21:09.027183686 +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; diff --git a/debian/patches/static_libbfd.dpatch b/debian/patches/static_libbfd.dpatch new file mode 100644 index 0000000..68de64c --- /dev/null +++ b/debian/patches/static_libbfd.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## static_libbfd.dpatch by Michel Dänzer <daenzer@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Link statically with libbfd. + +@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-25 19:19:41.000000000 +0100 +@@ -3759,7 +3759,7 @@ + { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bfd_bfd_get_error" >&5 + $as_echo "$ac_cv_lib_bfd_bfd_get_error" >&6; } + if test "x$ac_cv_lib_bfd_bfd_get_error" = x""yes; then +- DEP_LIBS="$DEP_LIBS -lbfd -liberty" ++ DEP_LIBS="$DEP_LIBS /usr/lib/libbfd.a -liberty" + else + { { $as_echo "$as_me:$LINENO: error: libbfd is required to compile sysprof" >&5 + $as_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-25 19:19:41.000000000 +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) + diff --git a/debian/rules b/debian/rules index f6c3063..f6ee89c 100755 --- a/debian/rules +++ b/debian/rules @@ -55,7 +55,7 @@ clean: unpatch dh_testdir dh_testroot rm -f build-stamp - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean rm -f config.log dh_clean @@ -68,6 +68,8 @@ install: build # Install sysprof. make install DESTDIR=$(SYSPROFDIR) cp debian/sysprof.xpm $(SYSPROFDIR)/usr/share/pixmaps + mkdir -p $(SYSPROFDIR)/usr/share/applications + cp debian/sysprof.desktop $(SYSPROFDIR)/usr/share/applications # Install the sources of the kernel module. install -D -m 0755 debian/rules.modules debian/tmp/modules/sysprof-module/debian/rules diff --git a/debian/sysprof.desktop b/debian/sysprof.desktop new file mode 100644 index 0000000..cab2de5 --- /dev/null +++ b/debian/sysprof.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Name=Sysprof Profiler +Comment=A system-wide linux profiler +Exec=sysprof +Icon=sysprof +Type=Application +Categories=Profiling;Development; diff --git a/debian/sysprof.menu b/debian/sysprof.menu index 8c16649..9eb0f12 100644 --- a/debian/sysprof.menu +++ b/debian/sysprof.menu @@ -1,4 +1,4 @@ ?package(sysprof):command="/usr/bin/sysprof" \ needs="x11" \ - section="Apps/Programming" title="Sysprof" \ + section="Applications/Programming" title="Sysprof" \ icon="/usr/share/pixmaps/sysprof.xpm" |