Compare commits
26 Commits
debian/2.2
...
debian/2.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da997e6041 | ||
|
|
789c3bb8f3 | ||
|
|
7703689954 | ||
|
|
63a53ee03b | ||
|
|
8f617063ea | ||
|
|
a8f4063380 | ||
|
|
8eb8a8a442 | ||
|
|
8609dbfefd | ||
|
|
a2656e0e76 | ||
|
|
a278f948b0 | ||
|
|
8b512b54b5 | ||
|
|
b07b47a055 | ||
|
|
76df9ba16e | ||
|
|
ef0b9519bc | ||
|
|
40a16212be | ||
|
|
5b7a47da52 | ||
|
|
ab962c4907 | ||
|
|
e76cc391fa | ||
|
|
c680c2e367 | ||
|
|
fb752c0fca | ||
|
|
fb53c14f86 | ||
|
|
8d0f7dbe87 | ||
|
|
7dccbb9daa | ||
|
|
d7b6f6ec9d | ||
|
|
27633d631c | ||
|
|
91639d509d |
62
debian/changelog
vendored
62
debian/changelog
vendored
@@ -1,4 +1,64 @@
|
||||
libgtop2 (2.28.3-1) UNRELEASED; urgency=low
|
||||
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 ]
|
||||
* 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)
|
||||
|
||||
2
debian/compat
vendored
2
debian/compat
vendored
@@ -1 +1 @@
|
||||
5
|
||||
8
|
||||
|
||||
45
debian/control
vendored
45
debian/control
vendored
@@ -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,
|
||||
@@ -16,22 +16,23 @@ 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],
|
||||
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
|
||||
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.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
|
||||
@@ -44,6 +45,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
|
||||
@@ -54,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.
|
||||
@@ -74,3 +72,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
43
debian/control.in
vendored
@@ -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,
|
||||
@@ -11,22 +11,23 @@ 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],
|
||||
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
|
||||
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.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
|
||||
@@ -39,6 +40,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
|
||||
@@ -49,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.
|
||||
@@ -69,3 +67,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
1
debian/gir1.2-gtop-2.0.install
vendored
Normal file
@@ -0,0 +1 @@
|
||||
usr/lib/girepository-*
|
||||
2
debian/libgtop2-7.install
vendored
2
debian/libgtop2-7.install
vendored
@@ -1 +1 @@
|
||||
debian/tmp/usr/lib/*.so.*
|
||||
usr/lib/*.so.*
|
||||
|
||||
71
debian/libgtop2-7.symbols
vendored
Normal file
71
debian/libgtop2-7.symbols
vendored
Normal 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
|
||||
2
debian/libgtop2-common.install
vendored
2
debian/libgtop2-common.install
vendored
@@ -1 +1 @@
|
||||
debian/tmp/usr/share/locale
|
||||
usr/share/locale
|
||||
|
||||
9
debian/libgtop2-dev.install
vendored
9
debian/libgtop2-dev.install
vendored
@@ -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-*
|
||||
|
||||
2
debian/libgtop2-doc.install
vendored
2
debian/libgtop2-doc.install
vendored
@@ -1 +1 @@
|
||||
debian/tmp/usr/share/gtk-doc
|
||||
usr/share/gtk-doc
|
||||
|
||||
30
debian/patches/03_kfreebsd_installdirs.patch
vendored
30
debian/patches/03_kfreebsd_installdirs.patch
vendored
@@ -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
|
||||
|
||||
14
debian/patches/05_kfreebsd_8.0.patch
vendored
14
debian/patches/05_kfreebsd_8.0.patch
vendored
@@ -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
|
||||
|
||||
22
debian/patches/06_kfreebsd_sys_pipe.patch
vendored
Normal file
22
debian/patches/06_kfreebsd_sys_pipe.patch
vendored
Normal file
@@ -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>
|
||||
10
debian/patches/99_ltmain_as-needed.patch
vendored
10
debian/patches/99_ltmain_as-needed.patch
vendored
@@ -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
|
||||
|
||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@@ -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
|
||||
|
||||
3
debian/rules
vendored
3
debian/rules
vendored
@@ -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
|
||||
@@ -13,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)
|
||||
|
||||
|
||||
1
debian/source/format
vendored
Normal file
1
debian/source/format
vendored
Normal file
@@ -0,0 +1 @@
|
||||
3.0 (quilt)
|
||||
6
debian/watch
vendored
6
debian/watch
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user