Compare commits

...

6 Commits

Author SHA1 Message Date
Andreas Henriksson
08f62afc37 [svn-buildpackage] Tagging libgtop2 2.28.3-1 2011-05-04 16:23:00 +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
10 changed files with 98 additions and 36333 deletions

35
debian/changelog vendored
View File

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

8
debian/control vendored
View File

@@ -1,3 +1,8 @@
# 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
@@ -9,6 +14,7 @@ Build-Depends: debhelper (>= 5),
libxau-dev,
libglib2.0-dev (>= 2.6.0),
gnome-pkg-tools (>= 0.10),
dh-autoreconf,
cdbs,
quilt,
texinfo,
@@ -20,6 +26,8 @@ Build-Depends: debhelper (>= 5),
libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
gtk-doc-tools (>= 1.4)
Standards-Version: 3.8.3
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

3
debian/control.in vendored
View File

@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 5),
libxau-dev,
libglib2.0-dev (>= 2.6.0),
gnome-pkg-tools (>= 0.10),
dh-autoreconf,
cdbs,
quilt,
texinfo,
@@ -20,6 +21,8 @@ Build-Depends: debhelper (>= 5),
libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
gtk-doc-tools (>= 1.4)
Standards-Version: 3.8.3
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

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,3 +1,12 @@
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: libgtop-2.28.0/libgtop-sysdeps.m4
===================================================================
--- libgtop-2.28.0.orig/libgtop-sysdeps.m4 2009-11-22 17:31:01.861694527 +0100

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: libgtop-2.28.0/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
@@ -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 @@ _glibtop_sysdeps_freebsd_dev_inode (glib
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,
sizeof (priv))
#else

File diff suppressed because it is too large Load Diff

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

1
debian/rules vendored
View File

@@ -6,6 +6,7 @@ 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