From 66f0c4caec9547d01edd4bf7aa090b7afd1f99d1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 14 Jun 2015 10:25:24 +0000 Subject: [PATCH 01/11] Update changelog, mention ABI break --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index e45b6292..819c7fef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libgtop2 (2.30.0-1) UNRELEASED; urgency=medium * 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. From 9e617d186e6e69b79c349acbd69eebcfc6ff51a0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 14 Jun 2015 10:27:52 +0000 Subject: [PATCH 02/11] Drop obsolete Replaces from pre-wheezy. --- debian/changelog | 4 ++++ debian/control | 1 - debian/control.in | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 819c7fef..383ee549 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ libgtop2 (2.30.0-1) UNRELEASED; 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. + -- Jackson Doak Wed, 02 Jul 2014 08:45:13 +1000 libgtop2 (2.28.5-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 01323fbd..b0346425 100644 --- a/debian/control +++ b/debian/control @@ -66,7 +66,6 @@ Package: libgtop2-doc Architecture: all 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. diff --git a/debian/control.in b/debian/control.in index 333ed87c..f947c2cc 100644 --- a/debian/control.in +++ b/debian/control.in @@ -62,7 +62,6 @@ Package: libgtop2-doc Architecture: all 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. From 991fa776256664ded143e89ae0c6e4946b2b9a42 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 14 Jun 2015 10:54:12 +0000 Subject: [PATCH 03/11] Convert to multiarch. --- debian/changelog | 1 + debian/compat | 2 +- debian/control.in | 10 ++++++++-- debian/gir1.2-gtop-2.0.install | 2 +- debian/libgtop2-10.install | 2 +- debian/libgtop2-dev.install | 6 +++--- debian/rules | 5 +++-- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 383ee549..d11c7e62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ libgtop2 (2.30.0-1) UNRELEASED; urgency=medium [ Michael Biebl ] * Drop obsolete Replaces from pre-wheezy. + * Convert to multiarch. -- Jackson Doak Wed, 02 Jul 2014 08:45:13 +1000 diff --git a/debian/compat b/debian/compat index 45a4fb75..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control.in b/debian/control.in index f947c2cc..e4d2874f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,14 +3,14 @@ Section: libs Priority: optional Maintainer: Debian GNOME Maintainers 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, @@ -27,6 +27,8 @@ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop Package: libgtop2-10 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libgtop2-common (>= ${source:Version}) @@ -38,6 +40,7 @@ Description: gtop system monitoring library (shared) Package: libgtop2-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, libgtop2-10 (= ${binary:Version}), @@ -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,6 +64,7 @@ Description: gtop system monitoring library (common) Package: libgtop2-doc Architecture: all +Multi-Arch: foreign Section: doc Depends: ${misc:Depends}, Description: gtop system monitoring library (documentation) @@ -70,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} diff --git a/debian/gir1.2-gtop-2.0.install b/debian/gir1.2-gtop-2.0.install index e8a103ca..e68ee28e 100644 --- a/debian/gir1.2-gtop-2.0.install +++ b/debian/gir1.2-gtop-2.0.install @@ -1 +1 @@ -usr/lib/girepository-* +usr/lib/*/girepository-* diff --git a/debian/libgtop2-10.install b/debian/libgtop2-10.install index 093956b1..3de3b10a 100644 --- a/debian/libgtop2-10.install +++ b/debian/libgtop2-10.install @@ -1 +1 @@ -usr/lib/*.so.* +usr/lib/*/*.so.* diff --git a/debian/libgtop2-dev.install b/debian/libgtop2-dev.install index ad5ec157..4999cae7 100644 --- a/debian/libgtop2-dev.install +++ b/debian/libgtop2-dev.install @@ -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-* diff --git a/debian/rules b/debian/rules index 11706577..a3b97673 100755 --- a/debian/rules +++ b/debian/rules @@ -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 From 8bbdca1d55d3141fd267fe17494fed28ba904ca0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 14 Jun 2015 10:54:41 +0000 Subject: [PATCH 04/11] Bump Standards-Version to 3.9.6. --- debian/changelog | 1 + debian/control | 12 +++++++++--- debian/control.in | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d11c7e62..65cc6c11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ libgtop2 (2.30.0-1) UNRELEASED; urgency=medium [ Michael Biebl ] * Drop obsolete Replaces from pre-wheezy. * Convert to multiarch. + * Bump Standards-Version to 3.9.6. -- Jackson Doak Wed, 02 Jul 2014 08:45:13 +1000 diff --git a/debian/control b/debian/control index b0346425..4310d871 100644 --- a/debian/control +++ b/debian/control @@ -7,14 +7,14 @@ Section: libs Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Martin Pitt , Michael Biebl , Sebastian Dröge -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, @@ -25,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-10 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libgtop2-common (>= ${source:Version}) @@ -42,6 +44,7 @@ Description: gtop system monitoring library (shared) Package: libgtop2-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, libgtop2-10 (= ${binary:Version}), @@ -55,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 @@ -64,6 +68,7 @@ Description: gtop system monitoring library (common) Package: libgtop2-doc Architecture: all +Multi-Arch: foreign Section: doc Depends: ${misc:Depends}, Description: gtop system monitoring library (documentation) @@ -74,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} diff --git a/debian/control.in b/debian/control.in index e4d2874f..2856413c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 9), 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 From 031bae96afa16e792c99f4929b5370c699afc509 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 14 Jun 2015 10:55:12 +0000 Subject: [PATCH 05/11] Bump debhelper compatibility level to 9. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 65cc6c11..79feee49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ libgtop2 (2.30.0-1) UNRELEASED; urgency=medium * Drop obsolete Replaces from pre-wheezy. * Convert to multiarch. * Bump Standards-Version to 3.9.6. + * Bump debhelper compatibility level to 9. -- Jackson Doak Wed, 02 Jul 2014 08:45:13 +1000 From 3f5a0f56f14f92d4f660786c03a98f716c7d18e6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 14 Jun 2015 11:04:33 +0000 Subject: [PATCH 06/11] Rename library package to libgtop-2.0-10 to match the SONAME. --- debian/changelog | 1 + debian/control | 4 ++-- debian/control.in | 4 ++-- debian/{libgtop2-10.install => libgtop-2.0-10.install} | 0 debian/{libgtop2-10.symbols => libgtop-2.0-10.symbols} | 2 +- debian/rules | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) rename debian/{libgtop2-10.install => libgtop-2.0-10.install} (100%) rename debian/{libgtop2-10.symbols => libgtop-2.0-10.symbols} (98%) diff --git a/debian/changelog b/debian/changelog index 79feee49..19d5f990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ libgtop2 (2.30.0-1) UNRELEASED; urgency=medium * 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. -- Jackson Doak Wed, 02 Jul 2014 08:45:13 +1000 diff --git a/debian/control b/debian/control index 4310d871..fef41246 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ 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-10 +Package: libgtop-2.0-10 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -47,7 +47,7 @@ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtop2-10 (= ${binary:Version}), + libgtop-2.0-10 (= ${binary:Version}), gir1.2-gtop-2.0 (= ${binary:Version}), libglib2.0-dev Description: gtop system monitoring library (devel) diff --git a/debian/control.in b/debian/control.in index 2856413c..0feb0b6f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -25,7 +25,7 @@ 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-10 +Package: libgtop-2.0-10 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -43,7 +43,7 @@ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtop2-10 (= ${binary:Version}), + libgtop-2.0-10 (= ${binary:Version}), gir1.2-gtop-2.0 (= ${binary:Version}), libglib2.0-dev Description: gtop system monitoring library (devel) diff --git a/debian/libgtop2-10.install b/debian/libgtop-2.0-10.install similarity index 100% rename from debian/libgtop2-10.install rename to debian/libgtop-2.0-10.install diff --git a/debian/libgtop2-10.symbols b/debian/libgtop-2.0-10.symbols similarity index 98% rename from debian/libgtop2-10.symbols rename to debian/libgtop-2.0-10.symbols index 89e4abae..7ba9be71 100644 --- a/debian/libgtop2-10.symbols +++ b/debian/libgtop-2.0-10.symbols @@ -1,4 +1,4 @@ -libgtop-2.0.so.10 libgtop2-10 #MINVER# +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 diff --git a/debian/rules b/debian/rules index a3b97673..e5fa4242 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ include /usr/share/cdbs/1/rules/autoreconf.mk GNOME_MODULE := libgtop -SHARED_PKG := libgtop2-10 +SHARED_PKG := libgtop-2.0-10 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed From 22814b56f8566cc2fa7522221443c7b9db25feb4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 14 Jun 2015 11:05:13 +0000 Subject: [PATCH 07/11] Release version 2.30.0-1 to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 19d5f990..533e9483 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libgtop2 (2.30.0-1) UNRELEASED; urgency=medium +libgtop2 (2.30.0-1) unstable; urgency=medium [ Jackson Doak ] * New upstream release. @@ -13,7 +13,7 @@ libgtop2 (2.30.0-1) UNRELEASED; urgency=medium * Bump debhelper compatibility level to 9. * Rename library package to libgtop-2.0-10 to match the SONAME. - -- Jackson Doak Wed, 02 Jul 2014 08:45:13 +1000 + -- Michael Biebl Sun, 14 Jun 2015 13:04:40 +0200 libgtop2 (2.28.5-2) unstable; urgency=low From fc2286f56e4c769770f0d5232660c83bc7137ef4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 14 Jun 2015 11:05:52 +0000 Subject: [PATCH 08/11] Actually, release version 2.30.0-1 to experimental --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 533e9483..6f3cc0c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libgtop2 (2.30.0-1) unstable; urgency=medium +libgtop2 (2.30.0-1) experimental; urgency=medium [ Jackson Doak ] * New upstream release. From 73a3213f893eff0b2a5938f8df0967391d11cc47 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 15 Jun 2015 19:15:59 +0000 Subject: [PATCH 09/11] Fix build failure on kFreeBSD due to undeclared '__FreeBSD_version', thanks Steven Chamberlain for the patch. Closes: #788709 --- debian/changelog | 7 +++++++ debian/patches/04_kfreebsd_version.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/04_kfreebsd_version.patch diff --git a/debian/changelog b/debian/changelog index 6f3cc0c6..93c69ea9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libgtop2 (2.30.0-2) UNRELEASED; urgency=medium + + * Fix build failure on kFreeBSD due to undeclared '__FreeBSD_version', + thanks Steven Chamberlain for the patch. Closes: #788709 + + -- Michael Biebl Mon, 15 Jun 2015 21:14:43 +0200 + libgtop2 (2.30.0-1) experimental; urgency=medium [ Jackson Doak ] diff --git a/debian/patches/04_kfreebsd_version.patch b/debian/patches/04_kfreebsd_version.patch new file mode 100644 index 00000000..9d294bc5 --- /dev/null +++ b/debian/patches/04_kfreebsd_version.patch @@ -0,0 +1,21 @@ +From: Steven Chamberlain +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 + + } diff --git a/debian/patches/series b/debian/patches/series index 6560c681..7225db44 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 02_hurd_stub_backend.patch 03_kfreebsd_installdirs.patch +04_kfreebsd_version.patch From b2e9232de16c1bae2abce434edc8e2aff3551623 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 15 Jun 2015 19:16:26 +0000 Subject: [PATCH 10/11] Release version 2.30.0-2 to experimental --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93c69ea9..cba37b62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libgtop2 (2.30.0-2) UNRELEASED; urgency=medium +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 Mon, 15 Jun 2015 21:14:43 +0200 + -- Michael Biebl Mon, 15 Jun 2015 21:16:09 +0200 libgtop2 (2.30.0-1) experimental; urgency=medium From 7d51c1ec16bc12e00ca2578648146844bd8492c0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 15 Jun 2015 19:17:14 +0000 Subject: [PATCH 11/11] Refresh debian/control --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index fef41246..e8d2c1b5 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Source: libgtop2 Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Martin Pitt , Michael Biebl , Sebastian Dröge +Uploaders: Andreas Henriksson , Martin Pitt , Michael Biebl , Sebastian Dröge Build-Depends: debhelper (>= 9), gettext, pkg-config,