diff --git a/debian/changelog b/debian/changelog index cba37b62..bd393157 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,46 @@ +libgtop2 (2.34.2-1) unstable; urgency=medium + + * New upstream release. + + -- Emilio Pozuelo Monfort Mon, 16 Jan 2017 20:09:58 +0100 + +libgtop2 (2.34.1-2) unstable; urgency=medium + + * Also use dh gir addon to properly generate dependencies. + + -- Andreas Henriksson Wed, 31 Aug 2016 13:41:37 +0200 + +libgtop2 (2.34.1-1) unstable; urgency=medium + + * New upstream release. + * Update build-dependencies according to configure.ac changes: + - drop intltool + * Convert from cdbs to dh + * Add debian/docs to install AUTHORS NEWS README + + -- Andreas Henriksson Wed, 31 Aug 2016 10:20:31 +0200 + +libgtop2 (2.34.0-1) unstable; urgency=medium + + * New upstream release. + * Bump Standards-Version to 3.9.8. + + -- Michael Biebl Fri, 15 Apr 2016 00:51:56 +0200 + +libgtop2 (2.32.0-1) unstable; urgency=medium + + * New upstream release. + * Update symbols file and bump shlibs version to 2.32.0. + * Update patches, drop 02_hurd_stub_backend.patch, fixed upstream. + + -- Michael Biebl Thu, 08 Oct 2015 00:12:49 +0200 + +libgtop2 (2.30.0-3) unstable; urgency=medium + + * Upload to unstable. + + -- Michael Biebl Tue, 16 Jun 2015 00:10:47 +0200 + libgtop2 (2.30.0-2) experimental; urgency=medium * Fix build failure on kFreeBSD due to undeclared '__FreeBSD_version', diff --git a/debian/control b/debian/control index e8d2c1b5..a352c9ad 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Source: libgtop2 Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Martin Pitt , Michael Biebl , Sebastian Dröge +Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Michael Biebl Build-Depends: debhelper (>= 9), gettext, pkg-config, @@ -14,9 +14,7 @@ Build-Depends: debhelper (>= 9), libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), dh-autoreconf, - cdbs (>= 0.4.93), texinfo, - intltool (>= 0.35.0), libxt-dev, libgeom-dev [kfreebsd-any], libdevstat-dev [kfreebsd-any], @@ -25,9 +23,9 @@ 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.6 +Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtop2 -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2 +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2 Package: libgtop-2.0-10 Architecture: any diff --git a/debian/control.in b/debian/control.in index 0feb0b6f..2ee53c85 100644 --- a/debian/control.in +++ b/debian/control.in @@ -10,9 +10,7 @@ Build-Depends: debhelper (>= 9), libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), dh-autoreconf, - cdbs (>= 0.4.93), texinfo, - intltool (>= 0.35.0), libxt-dev, libgeom-dev [kfreebsd-any], libdevstat-dev [kfreebsd-any], @@ -21,9 +19,9 @@ 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.6 +Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtop2 -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2 +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2 Package: libgtop-2.0-10 Architecture: any diff --git a/debian/copyright b/debian/copyright index 88d726ec..d75c1a1d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ then Martin Schulze in October 1998 then Ian Lynagh in November 1998 then Noel Koethe in December 2001 -It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libgtop/ +It was downloaded from https://download.gnome.org/sources/libgtop/ Upstream Authors: Martin Baulig (martin@home-of-linux.org) diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..6f83607c --- /dev/null +++ b/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/debian/libgtop-2.0-10.symbols b/debian/libgtop-2.0-10.symbols index 7ba9be71..8db1c642 100644 --- a/debian/libgtop-2.0-10.symbols +++ b/debian/libgtop-2.0-10.symbols @@ -58,6 +58,7 @@ libgtop-2.0.so.10 libgtop-2.0-10 #MINVER# glibtop_get_sysdeps@Base 2.22.3 glibtop_get_sysdeps_r@Base 2.22.3 glibtop_get_sysinfo@Base 2.22.3 + glibtop_get_type@Base 2.32.0 glibtop_get_uptime@Base 2.22.3 glibtop_get_uptime_l@Base 2.22.3 glibtop_global_server@Base 2.22.3 @@ -65,7 +66,13 @@ libgtop-2.0.so.10 libgtop-2.0-10 #MINVER# glibtop_init_r@Base 2.22.3 glibtop_internet_addr@Base 2.22.3 glibtop_make_connection@Base 2.22.3 + glibtop_map_entry_get_type@Base 2.32.0 + glibtop_mountentry_get_type@Base 2.32.0 + glibtop_mountlist_get_type@Base 2.32.0 + glibtop_open_files_entry_get_type@Base 2.32.0 glibtop_open_l@Base 2.22.3 + glibtop_proc_map_get_type@Base 2.32.0 + glibtop_proc_open_files_get_type@Base 2.32.0 glibtop_server_features@Base 2.22.3 glibtop_set_parameter_l@Base 2.22.3 glibtop_sys_siglist@Base 2.22.3 diff --git a/debian/patches/03_kfreebsd_installdirs.patch b/debian/patches/03_kfreebsd_installdirs.patch index c14a7a73..b71f9017 100644 --- a/debian/patches/03_kfreebsd_installdirs.patch +++ b/debian/patches/03_kfreebsd_installdirs.patch @@ -7,20 +7,27 @@ 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 +Index: libgtop-2.32.0/libgtop-sysdeps.m4 =================================================================== ---- 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-2.32.0.orig/libgtop-sysdeps.m4 2015-10-07 23:46:35.738589058 +0200 ++++ libgtop-2.32.0/libgtop-sysdeps.m4 2015-10-07 23:51:51.006990769 +0200 +@@ -40,38 +40,38 @@ + netbsd*|bsdi*) 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' ;; openbsd*) libgtop_sysdeps_dir=openbsd -@@ -87,27 +87,27 @@ + libgtop_need_server=yes + libgtop_sysdeps_private_mountlist=yes + libgtop_sysdeps_private_fsusage=yes +- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2555 $(bindir)/libgtop_server2' ++ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2' + ;; + freebsd*|kfreebsd*) + libgtop_sysdeps_dir=freebsd libgtop_need_server=yes libgtop_sysdeps_private_mountlist=yes libgtop_sysdeps_private_fsusage=yes @@ -29,14 +36,12 @@ Index: libgtop2/libgtop-sysdeps.m4 ;; solaris*) libgtop_sysdeps_dir=solaris - libgtop_use_machine_h=yes libgtop_need_server=yes - libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server' + libgtop_postinstall='chgrp sys $(DESTDIR)$(libexecdir)/libgtop_server && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server' ;; aix*) libgtop_sysdeps_dir=aix - libgtop_use_machine_h=yes libgtop_need_server=yes libgtop_have_sysinfo=yes - libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2' @@ -44,7 +49,6 @@ Index: libgtop2/libgtop-sysdeps.m4 ;; darwin*) libgtop_sysdeps_dir=darwin - libgtop_use_machine_h=yes libgtop_need_server=yes libgtop_have_sysinfo=yes - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2' @@ -52,11 +56,11 @@ Index: libgtop2/libgtop-sysdeps.m4 ;; cygwin*) libgtop_sysdeps_dir=cygwin -Index: libgtop2/src/daemon/Makefile.am +Index: libgtop-2.32.0/src/daemon/Makefile.am =================================================================== ---- 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 @@ +--- libgtop-2.32.0.orig/src/daemon/Makefile.am 2015-10-07 23:46:35.738589058 +0200 ++++ libgtop-2.32.0/src/daemon/Makefile.am 2015-10-07 23:46:35.734589003 +0200 +@@ -26,7 +26,7 @@ suid_common = endif @@ -65,11 +69,11 @@ Index: libgtop2/src/daemon/Makefile.am EXTRA_PROGRAMS = libgtop_server2 -Index: libgtop2/configure.in +Index: libgtop-2.32.0/configure.ac =================================================================== ---- 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-2.32.0.orig/configure.ac 2015-10-07 23:46:35.738589058 +0200 ++++ libgtop-2.32.0/configure.ac 2015-10-07 23:46:35.734589003 +0200 +@@ -285,8 +285,8 @@ libgtop_save_exec_prefix="$exec_prefix" test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=$prefix diff --git a/debian/patches/series b/debian/patches/series index 7225db44..211be6ae 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -02_hurd_stub_backend.patch 03_kfreebsd_installdirs.patch 04_kfreebsd_version.patch diff --git a/debian/rules b/debian/rules index e5fa4242..259d1a95 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,6 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.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 @@ -17,19 +12,28 @@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) CPPFLAGS += $(shell pkg-config --cflags libbsd-overlay) endif -DEB_DH_AUTORECONF_ARGS = --as-needed +%: + dh $@ --with gnome,gir,autoreconf -DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.24.0)' +override_dh_autoreconf: + dh_autoreconf --as-needed -DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ - --libexecdir=\$${libdir}/$(SHARED_PKG) +override_dh_auto_configure: + dh_auto_configure -- \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --libexecdir=\$${libdir}/$(SHARED_PKG) -DEB_FIXPERMS_EXCLUDE += libgtop_server2 +override_dh_makeshlibs: + dh_makeshlibs -V '$(SHARED_PKG) (>= 2.32.0)' +override_dh_fixperms: + dh_fixperms -X libgtop_server2 + +override_dh_install: ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) -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/$(DEB_HOST_MULTIARCH)/$(SHARED_PKG)/libgtop_server2 endif + dh_install diff --git a/debian/watch b/debian/watch index 987ca2a5..93cfd16e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 -http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+[02468])/ \ - libgtop-(.*)\.tar\.xz +version=4 +https://download.gnome.org/sources/libgtop/([\d\.]+[02468])/ \ + libgtop@ANY_VERSION@\.tar\.xz