* Fix incorrect Replaces:.

* Remove the FreeBSD-specific libraries from the -dev dependencies, 
  they are not needed to build libgtop2-based applications.
* Add missing build-dependencies.

debian/changelog

@@ -1,3 +1,115 @@
+libgtop2 (2.26.1-1) unstable; urgency=low
+
+  [ Luca Bruno ]
+  * New upstream release.
+  * debian/copyright:
+    - Specify GPL version 2.
+    - Don't mention /usr/share/doc/libgtop2*/AUTHORS, all upstream authors
+      are already listed here.
+  * debian/control.in:
+    - Updated Standards-Version to 3.8.1, no additional changes needed.
+    - Add ${misc:Depends} to all packages.
+
+  [ Josselin Mouette ]
+  * Fix incorrect Replaces:.
+  * Remove the FreeBSD-specific libraries from the -dev dependencies, 
+    they are not needed to build libgtop2-based applications.
+  * Add missing build-dependencies.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 11 Jun 2009 09:15:19 +0200
+
+libgtop2 (2.24.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 04 Mar 2009 17:47:56 +0100
+
+libgtop2 (2.24.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump shlibs version to 2.23.2.
+  * Bump intltool requirement to 0.35.0.
+
+ -- Josselin Mouette <joss@debian.org>  Fri, 21 Nov 2008 19:18:22 +0100
+
+libgtop2 (2.22.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * debian/control.in:
+    + Updated Standards-Version to 3.8.0, no additional changes needed.
+    + Build depend on intltool as it's now required.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 01 Jul 2008 10:11:55 +0200
+
+libgtop2 (2.22.2-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + Fixes parsing of large /proc/stat on Linux.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sun, 25 May 2008 17:00:32 +0200
+
+libgtop2 (2.22.1-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + Fixes build on non-Linux archs (Closes: #473211).
+  * debian/rules,
+    debian/control.in:
+    + Patch by Petr Salinger to let the -dev package depend on all required
+      packages on GNU/kFreeBSD.
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 04 Apr 2008 21:08:49 +0200
+
+libgtop2 (2.22.0-1) unstable; urgency=low
+
+  * New upstream stable release.
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 14 Mar 2008 11:55:57 +0100
+
+libgtop2 (2.20.2-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + Fixes smaps parsing with Linux kernel >= 2.6.24.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sat, 08 Mar 2008 05:02:09 +0100
+
+libgtop2 (2.20.1-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 08 Jan 2008 14:07:50 +0100
+
+libgtop2 (2.20.0-2) unstable; urgency=low
+
+  * debian/patches/01_kfreebsd.patch,
+    debian/control.in:
+    + Fix FTBFS on GNU/kFreeBSD. Thanks to Petr Salinger for the patch
+      (Closes: #456936).
+  * debian/control.in:
+    + Update Standards-Version to 3.7.3, no additional changes needed.
+  * debian/patches/99_ltmain_as-needed.patch,
+    debian/rules:
+    + Link with --as-needed to remove some unnecessary dependencies.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sat, 05 Jan 2008 07:14:55 +0100
+
+libgtop2 (2.20.0-1) unstable; urgency=low
+
+  * New upstream release, with some API additions.
+  * debian/control.in:
+    + Remove libpopt-dev from build-depends.
+  * debian/rules:
+    + Bump shlibs to >= 2.20.0.
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 17 Sep 2007 06:21:20 +0200
+
+libgtop2 (2.14.9-1) unstable; urgency=low
+
+  * New upstream stable release, with some API and ABI removals of
+    glibtop_init_*() functions which shouldn't have been public and are not
+    known to be used by anything else.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 20 Jun 2007 15:16:55 +0200
+
 libgtop2 (2.14.8-2) unstable; urgency=low
 
   * Upload to unstable; drop check-dist include.

debian/control

@@ -2,25 +2,28 @@ Source: libgtop2
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 5),
                gettext,
                pkg-config,
-               libpopt-dev,
                libxau-dev,
                libglib2.0-dev (>= 2.6.0),
                gnome-pkg-tools (>= 0.10),
                cdbs,
                texinfo,
                dpkg-dev (>= 1.13.19),
-               libxml-parser-perl,
-               libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.7.2
+               intltool (>= 0.35.0),
+               libxt-dev,
+               libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
+               libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
+               libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
+               gtk-doc-tools (>= 1.4)
+Standards-Version: 3.8.1
 
 Package: libgtop2-7
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends},
          libgtop2-common (>= ${source:Version})
 Description: gtop system monitoring library
  The gtop library reads information about processes and the state of the
@@ -31,9 +34,9 @@ Description: gtop system monitoring library
 Package: libgtop2-dev
 Architecture: any
 Section: libdevel
-Depends: libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev,
-         ${libkvm-dev}
+Depends: ${misc:Depends},
+         libgtop2-7 (= ${binary:Version}),
+         libglib2.0-dev
 Description: gtop system monitoring library
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -44,6 +47,7 @@ Description: gtop system monitoring library
 Package: libgtop2-common
 Architecture: all
 Section: libs
+Depends: ${misc:Depends},
 Replaces: libgtop2-5,
           libgtop2-4,
           libgtop2-2,

debian/control.in

@@ -6,21 +6,24 @@ Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
                gettext,
                pkg-config,
-               libpopt-dev,
                libxau-dev,
                libglib2.0-dev (>= 2.6.0),
                gnome-pkg-tools (>= 0.10),
                cdbs,
                texinfo,
                dpkg-dev (>= 1.13.19),
-               libxml-parser-perl,
-               libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.7.2
+               intltool (>= 0.35.0),
+               libxt-dev,
+               libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
+               libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
+               libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
+               gtk-doc-tools (>= 1.4)
+Standards-Version: 3.8.1
 
 Package: libgtop2-7
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends},
          libgtop2-common (>= ${source:Version})
 Description: gtop system monitoring library
  The gtop library reads information about processes and the state of the
@@ -31,9 +34,9 @@ Description: gtop system monitoring library
 Package: libgtop2-dev
 Architecture: any
 Section: libdevel
-Depends: libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev,
-         ${libkvm-dev}
+Depends: ${misc:Depends},
+         libgtop2-7 (= ${binary:Version}),
+         libglib2.0-dev
 Description: gtop system monitoring library
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -44,6 +47,7 @@ Description: gtop system monitoring library
 Package: libgtop2-common
 Architecture: all
 Section: libs
+Depends: ${misc:Depends},
 Replaces: libgtop2-5,
           libgtop2-4,
           libgtop2-2,

debian/copyright

@@ -9,7 +9,6 @@ Upstream Authors and Copyright Holders:
         Martin Baulig (martin@home-of-linux.org)
         Drazen Kacar (dave@srce.hr)
         Benoît Dejean (tazforever@dlfp.org)
-(The full list is in /usr/share/doc/libgtop2*/AUTHORS.)
 
 License:
 
@@ -28,5 +27,5 @@ License:
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 

debian/patches/99_ltmain_as-needed.patch

@@ -0,0 +1,30 @@
+--- ltmain.sh.old	2007-10-09 07:38:25.000000000 +0200
++++ ltmain.sh	2007-10-09 07:39:25.000000000 +0200
+@@ -1794,6 +1794,11 @@
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ 	;;
+ 
++      -Wl,--as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++
+       -Wl,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ 	arg=
+@@ -2137,6 +2142,15 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-Wl,--as-needed)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    deplibs="$deplib $deplibs"
++	  fi
++	  continue
++	  ;;
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"

debian/rules

@@ -9,9 +9,5 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
 GNOME_MODULE := libgtop
 
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.14.2)'
-
-ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
-DEB_DH_GENCONTROL_ARGS += -- -Vlibkvm-dev=libkvm-dev
-endif
-
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.23.2)'