release 2.28.4-1 to unstable

(quilt)" source format to support bzip2 orig tarballs. Drop quilt build
dependency and usage in debian/rules.

debian/changelog

@@ -1,3 +1,21 @@
+libgtop2 (2.28.4-1) unstable; urgency=low
+
+  [ Martin Pitt ]
+  * New upstream bug fix release.
+  * 03_kfreebsd_installdirs.patch, 05_kfreebsd_8.0.patch,
+    99_ltmain_as-needed.patch: Update for new version.
+  * debian/control.in: Fix section of gir1.2-gtop-2.0, should be "libs" (and
+    was set like that by ftpmasters).
+  * debian/watch: Fix regexp syntax, and watch for *.tar.bz2.
+  * debian/source/format, debian/control, debian/rules: Switch to "3.0
+    (quilt)" source format to support bzip2 orig tarballs. Drop quilt build
+    dependency and usage in debian/rules.
+
+  [ Josselin Mouette ]
+  * Use kfreebsd-any wildcard. Closes: #634623.
+
+ -- Martin Pitt <mpitt@debian.org>  Tue, 06 Sep 2011 14:19:01 +0200
+
 libgtop2 (2.28.3-2) unstable; urgency=low
 
   * debian/control.in, debian/gir1.2-gtop-2.0.install: Add gir1.2-gtop-2.0

debian/control

@@ -16,14 +16,13 @@ Build-Depends: debhelper (>= 5),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
                cdbs,
-               quilt,
                texinfo,
                dpkg-dev (>= 1.13.19),
                intltool (>= 0.35.0),
                libxt-dev,
-               libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
-               libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
-               libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
+               libgeom-dev [kfreebsd-any],
+               libdevstat-dev [kfreebsd-any],
+               libkvm-dev [kfreebsd-any],
                gtk-doc-tools (>= 1.4),
                gobject-introspection (>= 0.6.7),
                libgirepository1.0-dev (>= 0.6.7),
@@ -81,7 +80,6 @@ Description: gtop system monitoring library (documentation)
 
 Package: gir1.2-gtop-2.0
 Architecture: any
-Section: libdevel
 Depends: ${misc:Depends},
          ${gir:Depends}
 Description: gtop system monitoring library (gir bindings)

debian/control.in

@@ -11,14 +11,13 @@ Build-Depends: debhelper (>= 5),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
                cdbs,
-               quilt,
                texinfo,
                dpkg-dev (>= 1.13.19),
                intltool (>= 0.35.0),
                libxt-dev,
-               libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
-               libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
-               libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
+               libgeom-dev [kfreebsd-any],
+               libdevstat-dev [kfreebsd-any],
+               libkvm-dev [kfreebsd-any],
                gtk-doc-tools (>= 1.4),
                gobject-introspection (>= 0.6.7),
                libgirepository1.0-dev (>= 0.6.7),
@@ -76,7 +75,6 @@ Description: gtop system monitoring library (documentation)
 
 Package: gir1.2-gtop-2.0
 Architecture: any
-Section: libdevel
 Depends: ${misc:Depends},
          ${gir:Depends}
 Description: gtop system monitoring library (gir bindings)

debian/patches/03_kfreebsd_installdirs.patch

@@ -7,20 +7,20 @@ being launched directly. Therefore, it should go in $(libexecdir) instead.
 The patch also adds some missing $(DESTDIR) references in the installation
 hooks.
 
-Index: libgtop-2.28.0/libgtop-sysdeps.m4
+Index: libgtop2/libgtop-sysdeps.m4
 ===================================================================
---- libgtop-2.28.0.orig/libgtop-sysdeps.m4	2009-11-22 17:31:01.861694527 +0100
-+++ libgtop-2.28.0/libgtop-sysdeps.m4	2009-11-22 17:33:11.877189288 +0100
-@@ -73,7 +73,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
+--- libgtop2.orig/libgtop-sysdeps.m4	2011-09-06 14:12:33.925874923 +0200
++++ libgtop2/libgtop-sysdeps.m4	2011-09-06 14:12:37.175874943 +0200
+@@ -73,7 +73,7 @@
  	  libgtop_sysdeps_dir=bsd
  	  libgtop_use_machine_h=yes
  	  libgtop_need_server=yes
 -	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
 +	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
  	  ;;
- 	freebsd*|kfreebsd*)
- 	  libgtop_sysdeps_dir=freebsd
-@@ -81,27 +81,27 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
+ 	openbsd*)
+ 	  libgtop_sysdeps_dir=openbsd
+@@ -87,27 +87,27 @@
  	  libgtop_need_server=yes
  	  libgtop_sysdeps_private_mountlist=yes
  	  libgtop_sysdeps_private_fsusage=yes
@@ -52,11 +52,11 @@ Index: libgtop-2.28.0/libgtop-sysdeps.m4
  	  ;;
  	cygwin*)
  	  libgtop_sysdeps_dir=cygwin
-Index: libgtop-2.28.0/src/daemon/Makefile.am
+Index: libgtop2/src/daemon/Makefile.am
 ===================================================================
---- libgtop-2.28.0.orig/src/daemon/Makefile.am	2009-11-22 17:29:07.097688961 +0100
-+++ libgtop-2.28.0/src/daemon/Makefile.am	2009-11-22 17:29:46.589689603 +0100
-@@ -28,7 +28,7 @@ suid_sysdeps			=
+--- libgtop2.orig/src/daemon/Makefile.am	2011-06-01 17:40:47.000000000 +0200
++++ libgtop2/src/daemon/Makefile.am	2011-09-06 14:12:37.175874943 +0200
+@@ -28,7 +28,7 @@
  suid_common			=
  endif
  
@@ -65,11 +65,11 @@ Index: libgtop-2.28.0/src/daemon/Makefile.am
  
  EXTRA_PROGRAMS			= libgtop_server2
  
-Index: libgtop-2.28.0/configure.in
+Index: libgtop2/configure.in
 ===================================================================
---- libgtop-2.28.0.orig/configure.in	2009-11-22 17:36:21.481188616 +0100
-+++ libgtop-2.28.0/configure.in	2009-11-22 17:36:35.733188858 +0100
-@@ -287,8 +287,8 @@ libgtop_save_prefix="$prefix"
+--- libgtop2.orig/configure.in	2011-08-30 13:25:29.000000000 +0200
++++ libgtop2/configure.in	2011-09-06 14:12:37.175874943 +0200
+@@ -290,8 +290,8 @@
  libgtop_save_exec_prefix="$exec_prefix"
  test "x$prefix" = xNONE && prefix=$ac_default_prefix
  test "x$exec_prefix" = xNONE && exec_prefix=$prefix

debian/patches/05_kfreebsd_8.0.patch

@@ -4,10 +4,10 @@ Author: Petr Salinger <Petr.Salinger@seznam.cz>
 
 Fix a couple of checks for the kFreeBSD kernel.
 
-Index: libgtop-2.28.0/sysdeps/freebsd/procmap.c
+Index: libgtop2/sysdeps/freebsd/procmap.c
 ===================================================================
---- libgtop-2.28.0.orig/sysdeps/freebsd/procmap.c	2009-12-03 13:59:57.866694125 +0100
-+++ libgtop-2.28.0/sysdeps/freebsd/procmap.c	2009-12-03 14:03:16.298688337 +0100
+--- libgtop2.orig/sysdeps/freebsd/procmap.c	2011-07-24 21:13:56.000000000 +0200
++++ libgtop2/sysdeps/freebsd/procmap.c	2011-09-06 14:03:04.705871157 +0200
 @@ -42,7 +42,7 @@
  #include <sys/pipe.h>
  #include <sys/conf.h>
@@ -17,12 +17,12 @@ Index: libgtop-2.28.0/sysdeps/freebsd/procmap.c
  #define _WANT_FILE
  #include <sys/file.h>
  #undef _WANT_FILE
-@@ -113,7 +113,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glib
+@@ -113,7 +113,7 @@
+                 return;
+         }
  
-         if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si,
- 	              sizeof (si)) != sizeof (si) ||
 -#if __FreeBSD_version >= 800039
 +#if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039)
-             kvm_read (server->machine.kd, (gulong)  cdev2priv(&si), (char *) &priv,
+         if (kvm_read (server->machine.kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv,
  		      sizeof (priv))
  #else

debian/patches/99_ltmain_as-needed.patch

@@ -1,8 +1,8 @@
-Index: libgtop-2.28.0/ltmain.sh
+Index: libgtop2/ltmain.sh
 ===================================================================
---- libgtop-2.28.0.orig/ltmain.sh	2009-09-21 09:54:29.000000000 +0200
-+++ libgtop-2.28.0/ltmain.sh	2009-11-22 17:17:07.677688108 +0100
-@@ -4716,6 +4716,11 @@ func_mode_link ()
+--- libgtop2.orig/ltmain.sh	2011-08-30 13:25:39.000000000 +0200
++++ libgtop2/ltmain.sh	2011-09-06 14:12:45.695875002 +0200
+@@ -5787,6 +5787,11 @@
  	arg=$func_stripname_result
  	;;
  
@@ -14,7 +14,7 @@ Index: libgtop-2.28.0/ltmain.sh
        -Wl,*)
  	func_stripname '-Wl,' '' "$arg"
  	args=$func_stripname_result
-@@ -5070,6 +5075,15 @@ func_mode_link ()
+@@ -6150,6 +6155,15 @@
  	lib=
  	found=no
  	case $deplib in

debian/rules

@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/watch

@@ -1,3 +1,3 @@
 version=2
-http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+)[02468]/ \
-	libgtop-(.*)\.tar\.gz
+http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+[02468])/ \
+	libgtop-(.*)\.tar\.bz2