Release version 2.28.4-3 to unstable

this dependency.

debian/changelog

@@ -1,3 +1,34 @@
+libgtop2 (2.28.4-3) unstable; urgency=low
+
+  * debian/patches/06_kfreebsd_sys_pipe.patch: Don't include sys/pipe.h on
+    kFreeBSD. Defining _KERNEL to include sys/pipe.h subsequently breaks
+    sys/conf.h; since sys/pipe.h is not meant to be used in userland, and
+    libgtop2 builds anyway on kFreeBSD without it, don't include it.
+    Thanks to Steven Chamberlain for the patch. Closes: #667984
+  * Update Vcs-* URLs.
+  * Drop Build-Depends on gir1.2-glib-2.0 and let libgirepository1.0-dev pull
+    this dependency.
+  * Bump Standards-Version to 3.9.3.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 13 Apr 2012 20:13:21 +0200
+
+libgtop2 (2.28.4-2) unstable; urgency=low
+
+  * debian/watch: Track .xz tarballs.
+  * Bump debhelper compatibility level to 8.
+    - Strip debian/tmp/ from .install files.
+    - Bump Build-Depends on debhelper.
+  * debian/control.in:
+    - Drop obsolete versioned Build-Depends on dpkg-dev.
+    - Tighten dependency between libgtop2-dev and gir1.2-gtop-2.0.
+    - Change section of gir1.2-gtop-2.0 to introspection.
+    - Drop obsolete Replaces.
+    - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer.
+  * debian/libgtop2-7.symbols:
+    - Add symbols file for improved shlibs dependencies.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 14 Dec 2011 21:20:53 +0100
+
 libgtop2 (2.28.4-1) unstable; urgency=low
 
   [ Martin Pitt ]

debian/compat

@@ -1 +1 @@
-5
+8

debian/control

@@ -6,9 +6,9 @@
 Source: libgtop2
 Section: libs
 Priority: optional
-Maintainer: Sebastien Bacher <seb128@debian.org>
-Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
-Build-Depends: debhelper (>= 5),
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
+Build-Depends: debhelper (>= 8),
                gettext,
                pkg-config,
                libxau-dev,
@@ -17,7 +17,6 @@ Build-Depends: debhelper (>= 5),
                dh-autoreconf,
                cdbs,
                texinfo,
-               dpkg-dev (>= 1.13.19),
                intltool (>= 0.35.0),
                libxt-dev,
                libgeom-dev [kfreebsd-any],
@@ -25,15 +24,15 @@ Build-Depends: debhelper (>= 5),
                libkvm-dev [kfreebsd-any],
                gtk-doc-tools (>= 1.4),
                gobject-introspection (>= 0.6.7),
-               libgirepository1.0-dev (>= 0.6.7),
-               gir1.2-glib-2.0
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgtop2
+               libgirepository1.0-dev (>= 0.10.7-1~)
+Standards-Version: 3.9.3
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
 
 Package: libgtop2-7
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
          libgtop2-common (>= ${source:Version})
 Description: gtop system monitoring library (shared)
  The gtop library reads information about processes and the state of the
@@ -46,8 +45,8 @@ Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
          libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev,
-         gir1.2-gtop-2.0
+         gir1.2-gtop-2.0 (= ${binary:Version}),
+         libglib2.0-dev
 Description: gtop system monitoring library (devel)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -57,10 +56,6 @@ Description: gtop system monitoring library (devel)
 Package: libgtop2-common
 Architecture: all
 Depends: ${misc:Depends},
-Replaces: libgtop2-5,
-          libgtop2-4,
-          libgtop2-2,
-          libgtop2
 Description: gtop system monitoring library (common)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -80,6 +75,7 @@ Description: gtop system monitoring library (documentation)
 
 Package: gir1.2-gtop-2.0
 Architecture: any
+Section: introspection
 Depends: ${misc:Depends},
          ${gir:Depends}
 Description: gtop system monitoring library (gir bindings)
@@ -87,5 +83,5 @@ Description: gtop system monitoring library (gir bindings)
  system. It is used by the GNOME desktop environment.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings. 
+ generate dynamic bindings.
 

debian/control.in

@@ -1,9 +1,9 @@
 Source: libgtop2
 Section: libs
 Priority: optional
-Maintainer: Sebastien Bacher <seb128@debian.org>
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 8),
                gettext,
                pkg-config,
                libxau-dev,
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 5),
                dh-autoreconf,
                cdbs,
                texinfo,
-               dpkg-dev (>= 1.13.19),
                intltool (>= 0.35.0),
                libxt-dev,
                libgeom-dev [kfreebsd-any],
@@ -20,15 +19,15 @@ Build-Depends: debhelper (>= 5),
                libkvm-dev [kfreebsd-any],
                gtk-doc-tools (>= 1.4),
                gobject-introspection (>= 0.6.7),
-               libgirepository1.0-dev (>= 0.6.7),
-               gir1.2-glib-2.0
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgtop2
+               libgirepository1.0-dev (>= 0.10.7-1~)
+Standards-Version: 3.9.3
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
 
 Package: libgtop2-7
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
          libgtop2-common (>= ${source:Version})
 Description: gtop system monitoring library (shared)
  The gtop library reads information about processes and the state of the
@@ -41,8 +40,8 @@ Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
          libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev,
-         gir1.2-gtop-2.0
+         gir1.2-gtop-2.0 (= ${binary:Version}),
+         libglib2.0-dev
 Description: gtop system monitoring library (devel)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -52,10 +51,6 @@ Description: gtop system monitoring library (devel)
 Package: libgtop2-common
 Architecture: all
 Depends: ${misc:Depends},
-Replaces: libgtop2-5,
-          libgtop2-4,
-          libgtop2-2,
-          libgtop2
 Description: gtop system monitoring library (common)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -75,6 +70,7 @@ Description: gtop system monitoring library (documentation)
 
 Package: gir1.2-gtop-2.0
 Architecture: any
+Section: introspection
 Depends: ${misc:Depends},
          ${gir:Depends}
 Description: gtop system monitoring library (gir bindings)
@@ -82,5 +78,5 @@ Description: gtop system monitoring library (gir bindings)
  system. It is used by the GNOME desktop environment.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings. 
+ generate dynamic bindings.
 

debian/gir1.2-gtop-2.0.install

@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-*
+usr/lib/girepository-*

debian/libgtop2-7.install

@@ -1 +1 @@
-debian/tmp/usr/lib/*.so.*
+usr/lib/*.so.*

debian/libgtop2-7.symbols

@@ -0,0 +1,71 @@
+libgtop-2.0.so.7 libgtop2-7 #MINVER#
+ glibtop_call_l@Base 2.22.3
+ glibtop_close@Base 2.22.3
+ glibtop_close_r@Base 2.22.3
+ glibtop_get_cpu@Base 2.22.3
+ glibtop_get_cpu_l@Base 2.22.3
+ glibtop_get_fsusage@Base 2.22.3
+ glibtop_get_fsusage_l@Base 2.22.3
+ glibtop_get_loadavg@Base 2.22.3
+ glibtop_get_loadavg_l@Base 2.22.3
+ glibtop_get_mem@Base 2.22.3
+ glibtop_get_mem_l@Base 2.22.3
+ glibtop_get_mountlist@Base 2.22.3
+ glibtop_get_mountlist_l@Base 2.22.3
+ glibtop_get_msg_limits@Base 2.22.3
+ glibtop_get_msg_limits_l@Base 2.22.3
+ glibtop_get_netlist@Base 2.22.3
+ glibtop_get_netlist_l@Base 2.22.3
+ glibtop_get_netload@Base 2.22.3
+ glibtop_get_netload_l@Base 2.22.3
+ glibtop_get_parameter_l@Base 2.22.3
+ glibtop_get_ppp@Base 2.22.3
+ glibtop_get_ppp_l@Base 2.22.3
+ glibtop_get_proc_affinity@Base 2.24.0
+ glibtop_get_proc_affinity_l@Base 2.24.0
+ glibtop_get_proc_args@Base 2.22.3
+ glibtop_get_proc_args_l@Base 2.22.3
+ glibtop_get_proc_argv@Base 2.22.3
+ glibtop_get_proc_argv_l@Base 2.22.3
+ glibtop_get_proc_kernel@Base 2.22.3
+ glibtop_get_proc_kernel_l@Base 2.22.3
+ glibtop_get_proc_map@Base 2.22.3
+ glibtop_get_proc_map_l@Base 2.22.3
+ glibtop_get_proc_mem@Base 2.22.3
+ glibtop_get_proc_mem_l@Base 2.22.3
+ glibtop_get_proc_open_files@Base 2.22.3
+ glibtop_get_proc_open_files_l@Base 2.22.3
+ glibtop_get_proc_segment@Base 2.22.3
+ glibtop_get_proc_segment_l@Base 2.22.3
+ glibtop_get_proc_signal@Base 2.22.3
+ glibtop_get_proc_signal_l@Base 2.22.3
+ glibtop_get_proc_state@Base 2.22.3
+ glibtop_get_proc_state_l@Base 2.22.3
+ glibtop_get_proc_time@Base 2.22.3
+ glibtop_get_proc_time_l@Base 2.22.3
+ glibtop_get_proc_uid@Base 2.22.3
+ glibtop_get_proc_uid_l@Base 2.22.3
+ glibtop_get_proc_wd@Base 2.22.3
+ glibtop_get_proc_wd_l@Base 2.22.3
+ glibtop_get_proclist@Base 2.22.3
+ glibtop_get_proclist_l@Base 2.22.3
+ glibtop_get_sem_limits@Base 2.22.3
+ glibtop_get_sem_limits_l@Base 2.22.3
+ glibtop_get_shm_limits@Base 2.22.3
+ glibtop_get_shm_limits_l@Base 2.22.3
+ glibtop_get_swap@Base 2.22.3
+ glibtop_get_swap_l@Base 2.22.3
+ glibtop_get_sysdeps@Base 2.22.3
+ glibtop_get_sysdeps_r@Base 2.22.3
+ glibtop_get_sysinfo@Base 2.22.3
+ glibtop_get_uptime@Base 2.22.3
+ glibtop_get_uptime_l@Base 2.22.3
+ glibtop_global_server@Base 2.22.3
+ glibtop_init@Base 2.22.3
+ glibtop_init_r@Base 2.22.3
+ glibtop_internet_addr@Base 2.22.3
+ glibtop_make_connection@Base 2.22.3
+ glibtop_open_l@Base 2.22.3
+ glibtop_server_features@Base 2.22.3
+ glibtop_set_parameter_l@Base 2.22.3
+ glibtop_sys_siglist@Base 2.22.3

debian/libgtop2-common.install

@@ -1 +1 @@
-debian/tmp/usr/share/locale
+usr/share/locale

debian/libgtop2-dev.install

@@ -1,5 +1,5 @@
-debian/tmp/usr/include/libgtop-2.0
-debian/tmp/usr/lib/libgtop-2.0.a
-debian/tmp/usr/lib/libgtop-2.0.so
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/share/gir-*
+usr/include/libgtop-2.0
+usr/lib/libgtop-2.0.a
+usr/lib/libgtop-2.0.so
+usr/lib/pkgconfig
+usr/share/gir-*

debian/libgtop2-doc.install

@@ -1 +1 @@
-debian/tmp/usr/share/gtk-doc
+usr/share/gtk-doc

debian/patches/06_kfreebsd_sys_pipe.patch

@@ -0,0 +1,22 @@
+Description: Don't include sys/pipe.h on kFreeBSD
+ Defining _KERNEL to include sys/pipe.h subsequently breaks sys/conf.h;
+ since sys/pipe.h is not meant to be used in userland, and libgtop2 builds
+ anyway on kFreeBSD without it, don't include it.
+Author: Steven Chamberlain <steven@pyro.eu.org>
+Bug-Debian: http://bugs.debian.org/667984
+
+Index: libgtop2-2.28.4/sysdeps/freebsd/procmap.c
+===================================================================
+--- libgtop2-2.28.4.orig/sysdeps/freebsd/procmap.c	2012-04-07 22:49:20.000000000 +0100
++++ libgtop2-2.28.4/sysdeps/freebsd/procmap.c	2012-04-07 22:51:00.163079809 +0100
+@@ -38,10 +38,7 @@
+ #include <sys/vnode.h>
+ #undef _KVM_VNODE
+ 
+-#define _KERNEL
+-#include <sys/pipe.h>
+ #include <sys/conf.h>
+-#undef _KERNEL
+ #if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038)
+ #define _WANT_FILE
+ #include <sys/file.h>

debian/patches/series

@@ -3,4 +3,5 @@
 03_kfreebsd_installdirs.patch
 04_kfreebsd_version_check.patch
 05_kfreebsd_8.0.patch
+06_kfreebsd_sys_pipe.patch
 99_ltmain_as-needed.patch

debian/rules

@@ -12,7 +12,7 @@ GNOME_MODULE := libgtop
 SHARED_PKG := libgtop2-7
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.23.2)'
+DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.24.0)'
 
 DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)
 

debian/watch

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