Copy experimental branch of libgtop2 to unstable
This commit is contained in:
Michael Biebl
24
debian/changelog
vendored
24
debian/changelog
vendored
@@ -1,3 +1,27 @@
|
||||
libgtop2 (2.30.0-2) experimental; urgency=medium
|
||||
|
||||
* Fix build failure on kFreeBSD due to undeclared '__FreeBSD_version',
|
||||
thanks Steven Chamberlain for the patch. Closes: #788709
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Mon, 15 Jun 2015 21:16:09 +0200
|
||||
|
||||
libgtop2 (2.30.0-1) experimental; urgency=medium
|
||||
|
||||
[ Jackson Doak ]
|
||||
* New upstream release.
|
||||
- Increases maximum CPU limit, which breaks ABI.
|
||||
* Change library name to libgtop2-10 for new SONAME
|
||||
* Drop 06_kfreebsd_sys_pipe.patch. Fixed upstream.
|
||||
|
||||
[ Michael Biebl ]
|
||||
* Drop obsolete Replaces from pre-wheezy.
|
||||
* Convert to multiarch.
|
||||
* Bump Standards-Version to 3.9.6.
|
||||
* Bump debhelper compatibility level to 9.
|
||||
* Rename library package to libgtop-2.0-10 to match the SONAME.
|
||||
|
||||
-- Michael Biebl <biebl@debian.org> Sun, 14 Jun 2015 13:04:40 +0200
|
||||
|
||||
libgtop2 (2.28.5-2) unstable; urgency=low
|
||||
|
||||
* Add explicit Build-Depends on libbsd-dev for kfreebsd.
|
||||
|
||||
2
debian/compat
vendored
2
debian/compat
vendored
@@ -1 +1 @@
|
||||
8
|
||||
9
|
||||
|
||||
20
debian/control
vendored
20
debian/control
vendored
@@ -2,20 +2,19 @@
|
||||
#
|
||||
# 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>, 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),
|
||||
Uploaders: Andreas Henriksson <andreas@fatal.se>, Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
|
||||
Build-Depends: debhelper (>= 9),
|
||||
gettext,
|
||||
pkg-config,
|
||||
libxau-dev,
|
||||
libglib2.0-dev (>= 2.6.0),
|
||||
gnome-pkg-tools (>= 0.10),
|
||||
dh-autoreconf,
|
||||
cdbs,
|
||||
cdbs (>= 0.4.93),
|
||||
texinfo,
|
||||
intltool (>= 0.35.0),
|
||||
libxt-dev,
|
||||
@@ -26,12 +25,14 @@ Build-Depends: debhelper (>= 8),
|
||||
gtk-doc-tools (>= 1.4),
|
||||
gobject-introspection (>= 0.6.7),
|
||||
libgirepository1.0-dev (>= 0.10.7-1~)
|
||||
Standards-Version: 3.9.4
|
||||
Standards-Version: 3.9.6
|
||||
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-7
|
||||
Package: libgtop-2.0-10
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Pre-Depends: ${misc:Pre-Depends}
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libgtop2-common (>= ${source:Version})
|
||||
@@ -43,9 +44,10 @@ Description: gtop system monitoring library (shared)
|
||||
|
||||
Package: libgtop2-dev
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Section: libdevel
|
||||
Depends: ${misc:Depends},
|
||||
libgtop2-7 (= ${binary:Version}),
|
||||
libgtop-2.0-10 (= ${binary:Version}),
|
||||
gir1.2-gtop-2.0 (= ${binary:Version}),
|
||||
libglib2.0-dev
|
||||
Description: gtop system monitoring library (devel)
|
||||
@@ -56,6 +58,7 @@ Description: gtop system monitoring library (devel)
|
||||
|
||||
Package: libgtop2-common
|
||||
Architecture: all
|
||||
Multi-Arch: foreign
|
||||
Depends: ${misc:Depends},
|
||||
Description: gtop system monitoring library (common)
|
||||
The gtop library reads information about processes and the state of the
|
||||
@@ -65,9 +68,9 @@ Description: gtop system monitoring library (common)
|
||||
|
||||
Package: libgtop2-doc
|
||||
Architecture: all
|
||||
Multi-Arch: foreign
|
||||
Section: doc
|
||||
Depends: ${misc:Depends},
|
||||
Replaces: libgtop2-dev (<< 2.28.0-1)
|
||||
Description: gtop system monitoring library (documentation)
|
||||
The gtop library reads information about processes and the state of the
|
||||
system. It is used by the GNOME desktop environment.
|
||||
@@ -76,6 +79,7 @@ Description: gtop system monitoring library (documentation)
|
||||
|
||||
Package: gir1.2-gtop-2.0
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Section: introspection
|
||||
Depends: ${misc:Depends},
|
||||
${gir:Depends}
|
||||
|
||||
17
debian/control.in
vendored
17
debian/control.in
vendored
@@ -3,14 +3,14 @@ Section: libs
|
||||
Priority: optional
|
||||
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
|
||||
Uploaders: @GNOME_TEAM@
|
||||
Build-Depends: debhelper (>= 8),
|
||||
Build-Depends: debhelper (>= 9),
|
||||
gettext,
|
||||
pkg-config,
|
||||
libxau-dev,
|
||||
libglib2.0-dev (>= 2.6.0),
|
||||
gnome-pkg-tools (>= 0.10),
|
||||
dh-autoreconf,
|
||||
cdbs,
|
||||
cdbs (>= 0.4.93),
|
||||
texinfo,
|
||||
intltool (>= 0.35.0),
|
||||
libxt-dev,
|
||||
@@ -21,12 +21,14 @@ Build-Depends: debhelper (>= 8),
|
||||
gtk-doc-tools (>= 1.4),
|
||||
gobject-introspection (>= 0.6.7),
|
||||
libgirepository1.0-dev (>= 0.10.7-1~)
|
||||
Standards-Version: 3.9.4
|
||||
Standards-Version: 3.9.6
|
||||
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-7
|
||||
Package: libgtop-2.0-10
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Pre-Depends: ${misc:Pre-Depends}
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libgtop2-common (>= ${source:Version})
|
||||
@@ -38,9 +40,10 @@ Description: gtop system monitoring library (shared)
|
||||
|
||||
Package: libgtop2-dev
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Section: libdevel
|
||||
Depends: ${misc:Depends},
|
||||
libgtop2-7 (= ${binary:Version}),
|
||||
libgtop-2.0-10 (= ${binary:Version}),
|
||||
gir1.2-gtop-2.0 (= ${binary:Version}),
|
||||
libglib2.0-dev
|
||||
Description: gtop system monitoring library (devel)
|
||||
@@ -51,6 +54,7 @@ Description: gtop system monitoring library (devel)
|
||||
|
||||
Package: libgtop2-common
|
||||
Architecture: all
|
||||
Multi-Arch: foreign
|
||||
Depends: ${misc:Depends},
|
||||
Description: gtop system monitoring library (common)
|
||||
The gtop library reads information about processes and the state of the
|
||||
@@ -60,9 +64,9 @@ Description: gtop system monitoring library (common)
|
||||
|
||||
Package: libgtop2-doc
|
||||
Architecture: all
|
||||
Multi-Arch: foreign
|
||||
Section: doc
|
||||
Depends: ${misc:Depends},
|
||||
Replaces: libgtop2-dev (<< 2.28.0-1)
|
||||
Description: gtop system monitoring library (documentation)
|
||||
The gtop library reads information about processes and the state of the
|
||||
system. It is used by the GNOME desktop environment.
|
||||
@@ -71,6 +75,7 @@ Description: gtop system monitoring library (documentation)
|
||||
|
||||
Package: gir1.2-gtop-2.0
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Section: introspection
|
||||
Depends: ${misc:Depends},
|
||||
${gir:Depends}
|
||||
|
||||
2
debian/gir1.2-gtop-2.0.install
vendored
2
debian/gir1.2-gtop-2.0.install
vendored
@@ -1 +1 @@
|
||||
usr/lib/girepository-*
|
||||
usr/lib/*/girepository-*
|
||||
|
||||
1
debian/libgtop-2.0-10.install
vendored
Normal file
1
debian/libgtop-2.0-10.install
vendored
Normal file
@@ -0,0 +1 @@
|
||||
usr/lib/*/*.so.*
|
||||
71
debian/libgtop-2.0-10.symbols
vendored
Normal file
71
debian/libgtop-2.0-10.symbols
vendored
Normal file
@@ -0,0 +1,71 @@
|
||||
libgtop-2.0.so.10 libgtop-2.0-10 #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
|
||||
6
debian/libgtop2-dev.install
vendored
6
debian/libgtop2-dev.install
vendored
@@ -1,5 +1,5 @@
|
||||
usr/include/libgtop-2.0
|
||||
usr/lib/libgtop-2.0.a
|
||||
usr/lib/libgtop-2.0.so
|
||||
usr/lib/pkgconfig
|
||||
usr/lib/*/libgtop-2.0.a
|
||||
usr/lib/*/libgtop-2.0.so
|
||||
usr/lib/*/pkgconfig
|
||||
usr/share/gir-*
|
||||
|
||||
21
debian/patches/04_kfreebsd_version.patch
vendored
Normal file
21
debian/patches/04_kfreebsd_version.patch
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
From: Steven Chamberlain <steven@pyro.eu.org>
|
||||
Date: Mon, 15 Jun 2015 17:09:49 +0100
|
||||
|
||||
Support GNU/kFreeBSD by using __FreeBSD_kernel_version here,
|
||||
rather than simply __FreeBSD_version (which is only defined in
|
||||
FreeBSD itself).
|
||||
|
||||
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788709
|
||||
--- a/sysdeps/freebsd/open.c
|
||||
+++ b/sysdeps/freebsd/open.c
|
||||
@@ -43,6 +43,10 @@
|
||||
server->real_ncpu = ncpus - 1;
|
||||
server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
|
||||
|
||||
+#if defined(__FreeBSD__)
|
||||
server->os_version_code = __FreeBSD_version;
|
||||
+#else
|
||||
+ server->os_version_code = __FreeBSD_kernel_version;
|
||||
+#endif
|
||||
|
||||
}
|
||||
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@@ -1,3 +1,3 @@
|
||||
02_hurd_stub_backend.patch
|
||||
03_kfreebsd_installdirs.patch
|
||||
06_kfreebsd_sys_pipe.patch
|
||||
04_kfreebsd_version.patch
|
||||
|
||||
7
debian/rules
vendored
7
debian/rules
vendored
@@ -9,7 +9,7 @@ include /usr/share/cdbs/1/rules/autoreconf.mk
|
||||
|
||||
GNOME_MODULE := libgtop
|
||||
|
||||
SHARED_PKG := libgtop2-7
|
||||
SHARED_PKG := libgtop-2.0-10
|
||||
|
||||
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
|
||||
|
||||
@@ -21,7 +21,8 @@ DEB_DH_AUTORECONF_ARGS = --as-needed
|
||||
|
||||
DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.24.0)'
|
||||
|
||||
DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)
|
||||
DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
|
||||
--libexecdir=\$${libdir}/$(SHARED_PKG)
|
||||
|
||||
DEB_FIXPERMS_EXCLUDE += libgtop_server2
|
||||
|
||||
@@ -30,5 +31,5 @@ install/$(SHARED_PKG)::
|
||||
# The server is only necessary on kFreeBSD
|
||||
dh_install --autodest -p$(SHARED_PKG) \
|
||||
--ignore=debian/$(SHARED_PKG).install \
|
||||
debian/tmp/usr/lib/*/libgtop_server2
|
||||
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(SHARED_PKG)/libgtop_server2
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user