* 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.

debian/changelog

@@ -1,3 +1,27 @@
+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

debian/control

@@ -2,11 +2,10 @@ 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>, Loic Minier <lool@dooz.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),
@@ -14,8 +13,10 @@ Build-Depends: debhelper (>= 5),
                texinfo,
                dpkg-dev (>= 1.13.19),
                libxml-parser-perl,
+               libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
+               libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
                libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: libgtop2-7
 Architecture: any

debian/control.in

@@ -6,7 +6,6 @@ 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),
@@ -14,8 +13,10 @@ Build-Depends: debhelper (>= 5),
                texinfo,
                dpkg-dev (>= 1.13.19),
                libxml-parser-perl,
+               libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
+               libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
                libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: libgtop2-7
 Architecture: any

debian/patches/01_kfreebsd.patch

@@ -0,0 +1,16 @@
+--- libgtop2-2.20.0.orig/sysdeps/freebsd/open.c
++++ libgtop2-2.20.0/sysdeps/freebsd/open.c
+@@ -63,9 +63,11 @@
+ 	server->machine.euid = geteuid ();
+ 	server->machine.gid = getgid ();
+ 	server->machine.egid = getegid ();
+-
++#if defined(__FreeBSD_kernel__)
++	server->os_version_code = __FreeBSD_kernel_version;
++#else
+ 	server->os_version_code = __FreeBSD_version;
+-
++#endif
+ 	/* Setup machine-specific data */
+ 	server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");
+ 

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