Compare commits

...

26 Commits

Author SHA1 Message Date
Michael Biebl
a8f4063380 Release version 2.28.4-2 to unstable 2011-12-14 20:21:35 +00:00
Michael Biebl
8eb8a8a442 * debian/libgtop2-7.symbols:
- Add symbols file for improved shlibs dependencies.
2011-12-14 20:15:19 +00:00
Michael Biebl
8609dbfefd Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer. 2011-12-14 19:46:04 +00:00
Michael Biebl
a2656e0e76 Drop obsolete Replaces. 2011-12-14 19:45:20 +00:00
Michael Biebl
a278f948b0 Change section of gir1.2-gtop-2.0 to introspection. 2011-12-14 19:43:34 +00:00
Michael Biebl
8b512b54b5 Tighten dependency between libgtop2-dev and gir1.2-gtop-2.0. 2011-12-14 19:41:58 +00:00
Michael Biebl
b07b47a055 * debian/control.in:
- Drop obsolete versioned Build-Depends on dpkg-dev.
2011-12-14 19:39:12 +00:00
Michael Biebl
76df9ba16e * Bump debhelper compatibility level to 8.
- Strip debian/tmp/ from .install files.
  - Bump Build-Depends on debhelper.
2011-12-14 19:38:28 +00:00
Michael Biebl
ef0b9519bc debian/watch: Track .xz tarballs. 2011-12-14 19:36:45 +00:00
Martin Pitt
40a16212be release 2.28.4-1 to unstable 2011-09-06 12:30:32 +00:00
Martin Pitt
5b7a47da52 unfuzz the other patches 2011-09-06 12:13:46 +00:00
Martin Pitt
ab962c4907 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.
2011-09-06 12:12:21 +00:00
Martin Pitt
e76cc391fa * New upstream bug fix release.
* 05_kfreebsd_8.0.patch: Update for new version.
2011-09-06 12:05:30 +00:00
Martin Pitt
c680c2e367 debian/watch: Fix regexp syntax, and watch for *.tar.bz2. 2011-09-02 10:23:55 +00:00
Emilio Pozuelo Monfort
fb752c0fca add closes statement 2011-07-19 09:10:11 +00:00
Josselin Mouette
fb53c14f86 Use kfreebsd-any wildcard. 2011-07-17 08:53:48 +00:00
Martin Pitt
8d0f7dbe87 debian/control.in: Fix section of gir1.2-gtop-2.0, should be "libs" (and
was set like that by ftpmasters).
2011-05-27 20:12:13 +00:00
Martin Pitt
7dccbb9daa release as 2.28.3-2 to unstable 2011-05-27 08:01:11 +00:00
Martin Pitt
d7b6f6ec9d debian/control.in: Bump Standards-Version to 3.9.2. No changes necessary. 2011-05-27 07:55:02 +00:00
Martin Pitt
27633d631c * debian/control.in, debian/gir1.2-gtop-2.0.install: Add gir1.2-gtop-2.0
package to add GI support.
* debian/libgtop2-dev.install: Install .gir.
2011-05-27 07:53:45 +00:00
Andreas Henriksson
91639d509d Team upload to unstable. 2011-05-02 14:55:30 +00:00
Andreas Henriksson
3b6277fbbe New upstream release + some tidy ups while at it... 2011-05-02 14:21:34 +00:00
Sebastian Dröge
b563f6694c * New upstream stable release:
+ debian/patches/90_autotools.patch:
    - Regenerated for the new version.
2010-04-10 04:59:50 +00:00
Emilio Pozuelo Monfort
7e93937adf * debian/patches/02_hurd_stub_backend.patch,
debian/patches/03_kfreebsd_installdirs.patch,
  debian/patches/04_kfreebsd_version_check.patch,
  debian/patches/05_kfreebsd_8.0.patch:
  - Add headers.
2010-01-30 12:58:06 +00:00
Emilio Pozuelo Monfort
d853b62da1 release to unstable 2009-12-15 11:17:20 +00:00
Josselin Mouette
858746c513 05_kfreebsd_8.0.patch: modified patch from Petr Salinger to make
libgtop2 work correctly with kFreeBSD 8.0. Closes: #559291.
2009-12-03 13:04:56 +00:00
20 changed files with 301 additions and 36395 deletions

79
debian/changelog vendored
View File

@@ -1,3 +1,82 @@
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 ]
* 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
package to add GI support.
* debian/libgtop2-dev.install: Install .gir.
* debian/control.in: Bump Standards-Version to 3.9.2. No changes necessary.
-- Martin Pitt <mpitt@debian.org> Fri, 27 May 2011 09:56:48 +0200
libgtop2 (2.28.3-1) unstable; urgency=low
* Team upload.
* New upstream release.
- Fixes linking with strict linkers (Closes: #555183)
* Use dh-autoreconf instead of manually updating 90_autotools.patch
* Add Vcs fields to debian/control*
-- Andreas Henriksson <andreas@fatal.se> Mon, 02 May 2011 16:00:40 +0200
libgtop2 (2.28.1-1) unstable; urgency=low
[ Emilio Pozuelo Monfort ]
* debian/patches/02_hurd_stub_backend.patch,
debian/patches/03_kfreebsd_installdirs.patch,
debian/patches/04_kfreebsd_version_check.patch,
debian/patches/05_kfreebsd_8.0.patch:
- Add headers.
[ Sebastian Dröge ]
* New upstream stable release:
+ debian/patches/90_autotools.patch:
- Regenerated for the new version.
-- Sebastian Dröge <slomo@debian.org> Sat, 10 Apr 2010 06:56:34 +0200
libgtop2 (2.28.0-4) unstable; urgency=low
[ Josselin Mouette ]
* 05_kfreebsd_8.0.patch: modified patch from Petr Salinger to make
libgtop2 work correctly with kFreeBSD 8.0. Closes: #559291.
-- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 15 Dec 2009 12:16:51 +0100
libgtop2 (2.28.0-3) unstable; urgency=low
* Switch to quilt for patch management.

2
debian/compat vendored
View File

@@ -1 +1 @@
5
8

50
debian/control vendored
View File

@@ -1,29 +1,39 @@
# This file is autogenerated. DO NOT EDIT!
#
# 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: Sebastien Bacher <seb128@debian.org>
Uploaders: 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>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
Build-Depends: debhelper (>= 8),
gettext,
pkg-config,
libxau-dev,
libglib2.0-dev (>= 2.6.0),
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],
gtk-doc-tools (>= 1.4)
Standards-Version: 3.8.3
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),
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
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
@@ -36,6 +46,7 @@ Architecture: any
Section: libdevel
Depends: ${misc:Depends},
libgtop2-7 (= ${binary:Version}),
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
@@ -46,10 +57,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.
@@ -66,3 +73,16 @@ Description: gtop system monitoring library (documentation)
system. It is used by the GNOME desktop environment.
.
This package contains the documentation.
Package: gir1.2-gtop-2.0
Architecture: any
Section: introspection
Depends: ${misc:Depends},
${gir:Depends}
Description: gtop system monitoring library (gir bindings)
The gtop library reads information about processes and the state of the
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.

43
debian/control.in vendored
View File

@@ -1,29 +1,34 @@
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,
libglib2.0-dev (>= 2.6.0),
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],
gtk-doc-tools (>= 1.4)
Standards-Version: 3.8.3
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),
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
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
@@ -36,6 +41,7 @@ Architecture: any
Section: libdevel
Depends: ${misc:Depends},
libgtop2-7 (= ${binary:Version}),
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
@@ -46,10 +52,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.
@@ -66,3 +68,16 @@ Description: gtop system monitoring library (documentation)
system. It is used by the GNOME desktop environment.
.
This package contains the documentation.
Package: gir1.2-gtop-2.0
Architecture: any
Section: introspection
Depends: ${misc:Depends},
${gir:Depends}
Description: gtop system monitoring library (gir bindings)
The gtop library reads information about processes and the state of the
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.

1
debian/gir1.2-gtop-2.0.install vendored Normal file
View File

@@ -0,0 +1 @@
usr/lib/girepository-*

View File

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

71
debian/libgtop2-7.symbols vendored Normal file
View File

@@ -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

View File

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

View File

@@ -1,4 +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
usr/include/libgtop-2.0
usr/lib/libgtop-2.0.a
usr/lib/libgtop-2.0.so
usr/lib/pkgconfig
usr/share/gir-*

View File

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

View File

@@ -1,3 +1,9 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602662
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557446
Author: Samuel Thibault <sthibault@debian.org>
Fix the stub backend to build again, making libgtop build on the Hurd.
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/Makefile.am libgtop2-2.28.0/sysdeps/stub/Makefile.am
--- libgtop2-2.28.0.sav/sysdeps/stub/Makefile.am 2009-04-18 23:29:49.000000000 +0000
+++ libgtop2-2.28.0/sysdeps/stub/Makefile.am 2009-11-22 01:07:39.000000000 +0000

View File

@@ -1,17 +1,26 @@
Index: libgtop-2.28.0/libgtop-sysdeps.m4
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602664
Author: Josselin Mouette <joss@debian.org>
The libgtop_server2 binary is launched by the library itself, and has no use
being launched directly. Therefore, it should go in $(libexecdir) instead.
The patch also adds some missing $(DESTDIR) references in the installation
hooks.
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
@@ -43,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
@@ -56,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

View File

@@ -1,3 +1,10 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602666
Author: Josselin Mouette <joss@debian.org>
The server binary refuses to start when it is not run on the same hardware as
the one where it was built on. This check is utterly and absolutely useless,
and makes it impossible to produce working binary packages.
Index: libgtop-2.28.0/src/daemon/server.c
===================================================================
--- libgtop-2.28.0.orig/src/daemon/server.c 2009-11-22 21:14:47.613184919 +0100

28
debian/patches/05_kfreebsd_8.0.patch vendored Normal file
View File

@@ -0,0 +1,28 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608518
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559291
Author: Petr Salinger <Petr.Salinger@seznam.cz>
Fix a couple of checks for the kFreeBSD kernel.
Index: libgtop2/sysdeps/freebsd/procmap.c
===================================================================
--- 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>
#undef _KERNEL
-#if __FreeBSD_version >= 800038
+#if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038)
#define _WANT_FILE
#include <sys/file.h>
#undef _WANT_FILE
@@ -113,7 +113,7 @@
return;
}
-#if __FreeBSD_version >= 800039
+#if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039)
if (kvm_read (server->machine.kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv,
sizeof (priv))
#else

File diff suppressed because it is too large Load Diff

View File

@@ -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

View File

@@ -2,5 +2,5 @@
02_hurd_stub_backend.patch
03_kfreebsd_installdirs.patch
04_kfreebsd_version_check.patch
90_autotools.patch
05_kfreebsd_8.0.patch
99_ltmain_as-needed.patch

4
debian/rules vendored
View File

@@ -1,18 +1,18 @@
#!/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
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
include /usr/share/cdbs/1/rules/autoreconf.mk
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)

1
debian/source/format vendored Normal file
View File

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

6
debian/watch vendored
View File

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