Revert changes for 2.30 in unstable branch

debian/changelog

@@ -1,11 +1,3 @@
-libgtop2 (2.30.0-1) UNRELEASED; urgency=medium
-
-  * New upstream release.
-  * Change library name to libgtop2-10 for new SONAME
-  * Drop 06_kfreebsd_sys_pipe.patch. Fixed upstream.
-
- -- Jackson Doak <noskcaj@ubuntu.com>  Wed, 02 Jul 2014 08:45:13 +1000
-
 libgtop2 (2.28.5-2) unstable; urgency=low
 
   * Add explicit Build-Depends on libbsd-dev for kfreebsd.

debian/control

@@ -2,11 +2,12 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
+
 Source: libgtop2
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@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,
@@ -29,7 +30,7 @@ Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtop2
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
 
-Package: libgtop2-10
+Package: libgtop2-7
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -44,7 +45,7 @@ Package: libgtop2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libgtop2-10 (= ${binary:Version}),
+         libgtop2-7 (= ${binary:Version}),
          gir1.2-gtop-2.0 (= ${binary:Version}),
          libglib2.0-dev
 Description: gtop system monitoring library (devel)

debian/control.in

@@ -25,7 +25,7 @@ Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtop2
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
 
-Package: libgtop2-10
+Package: libgtop2-7
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -40,7 +40,7 @@ Package: libgtop2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libgtop2-10 (= ${binary:Version}),
+         libgtop2-7 (= ${binary:Version}),
          gir1.2-gtop-2.0 (= ${binary:Version}),
          libglib2.0-dev
 Description: gtop system monitoring library (devel)

debian/libgtop2-7.symbols

@@ -1,4 +1,4 @@
-libgtop-2.0.so.10 libgtop2-10 #MINVER#
+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

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

@@ -1,2 +1,3 @@
 02_hurd_stub_backend.patch
 03_kfreebsd_installdirs.patch
+06_kfreebsd_sys_pipe.patch

debian/rules

@@ -9,7 +9,7 @@ include /usr/share/cdbs/1/rules/autoreconf.mk
 
 GNOME_MODULE := libgtop
 
-SHARED_PKG := libgtop2-10
+SHARED_PKG := libgtop2-7
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed