releasing package libgtop2 version 2.38.0-4

- Ignore snap mounts to keep them from showing in gnome-system-monitor

LP: #1749007

Gbp-Dch: Full

debian/changelog

@@ -1,3 +1,19 @@
+libgtop2 (2.38.0-4) unstable; urgency=medium
+
+  [ Andrea Azzarone ]
+  * Add mountlist-ignore-snap-squashfs.patch:
+    - Ignore snap mounts to keep them from showing in gnome-system-monitor
+      (LP: #1749007)
+
+ -- Jeremy Bicha <jbicha@debian.org>  Thu, 27 Dec 2018 22:58:54 -0500
+
+libgtop2 (2.38.0-3) unstable; urgency=medium
+
+  * Update Vcs fields for migration to https://salsa.debian.org/
+  * Bump Standards-Version to 4.3.0
+
+ -- Jeremy Bicha <jbicha@debian.org>  Thu, 27 Dec 2018 21:36:28 -0500
+
 libgtop2 (2.38.0-2) unstable; urgency=medium
 
   * Update Vcs fields for conversion to git
@@ -200,7 +216,7 @@ libgtop2 (2.28.1-1) unstable; urgency=low
 libgtop2 (2.28.0-4) unstable; urgency=low
 
   [ Josselin Mouette ]
-  * 05_kfreebsd_8.0.patch: modified patch from Petr Salinger to make 
+  * 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
@@ -208,14 +224,14 @@ libgtop2 (2.28.0-4) unstable; urgency=low
 libgtop2 (2.28.0-3) unstable; urgency=low
 
   * Switch to quilt for patch management.
-  * 02_hurd_stub_backend.patch: re-add an implementation of the stub 
+  * 02_hurd_stub_backend.patch: re-add an implementation of the stub
     backend, for the Hurd. Closes: #557446.
-  * 03_kfreebsd_installdirs.patch: patch to install binaries in 
-    libexecdir so that we can version the installation directory. Also 
+  * 03_kfreebsd_installdirs.patch: patch to install binaries in
+    libexecdir so that we can version the installation directory. Also
     use DESTDIR in the installation hooks.
-  * 04_kfreebsd_version_check.patch: drop brain-dead runtime version 
+  * 04_kfreebsd_version_check.patch: drop brain-dead runtime version
     check.
-  * Rename 90_autoconf.patch to 90_autotools.patch, re-run all the 
+  * Rename 90_autoconf.patch to 90_autotools.patch, re-run all the
     autotools on top of that.
   * Pass a versioned libexecdir to the configure arguments.
   * Install the server binary on kfreebsd.
@@ -262,7 +278,7 @@ libgtop2 (2.26.1-1) unstable; urgency=low
 
   [ Josselin Mouette ]
   * Fix incorrect Replaces:.
-  * Remove the FreeBSD-specific libraries from the -dev dependencies, 
+  * Remove the FreeBSD-specific libraries from the -dev dependencies,
     they are not needed to build libgtop2-based applications.
   * Add missing build-dependencies.
 
@@ -608,7 +624,7 @@ libgtop2 (2.5.2-1) experimental; urgency=low
       - Converted to cdbs.
       - debian/:
         + Moved .files to .install
-      - debian/control.in: 
+      - debian/control.in:
         + Removed automake and autoconf Build-Dependencies.
         + libgtop2-dev package should depend only on libglib2.0-dev instead
           of libgtk+2.0-dev
@@ -666,15 +682,15 @@ libgtop2 (2.0.8-1) unstable; urgency=low
   * debian/patches/01_kernel26-headers.dpatch:
     + removed since changes are included in the new version.
   * debian/patches/01_libgtop2-kernel2.6.dpatch:
-    + new patch to build with 2.6 headers (Closes: #223027).  
-  
+    + new patch to build with 2.6 headers (Closes: #223027).
+
  -- Sebastien Bacher <seb128@debian.org>  Sat, 20 Dec 2003 18:28:19 +0100
 
 libgtop2 (2.0.5-4) unstable; urgency=low
 
-  * Added patch from Steve Fosdick <dbugs@pelvoux.nildram.co.uk> to fix 
+  * Added patch from Steve Fosdick <dbugs@pelvoux.nildram.co.uk> to fix
     memory stats on 2.6 kernels (Closes: #137603, #201876, #216385).
-  * Removed empty libgtop2.info.gz (Closes: #213720).  
+  * Removed empty libgtop2.info.gz (Closes: #213720).
 
  -- Sebastien Bacher <seb128@debian.org>  Mon, 20 Oct 2003 02:11:48 +0200
 
@@ -687,7 +703,7 @@ libgtop2 (2.0.5-3) unstable; urgency=low
 libgtop2 (2.0.5-2) unstable; urgency=low
 
   * Upload in unstable (Closes: #211969).
-  
+
  -- Sebastien Bacher <seb128@debian.org>  Mon, 22 Sep 2003 15:19:57 +0200
 
 libgtop2 (2.0.5-1) experimental; urgency=low
@@ -714,7 +730,7 @@ libgtop2 (2.0.2.is.2.0.1-1) unstable; urgency=low
     overflow fix from 2.0.2, and made a fake 2.0.2 package. Other alternative
     would have been using an epoch, which i consider ugly. The problem with
     2.0.2 is that buggy (even if Christian thinks it is a feature) libtool
-    apparently did increase the soname, which is not needed here. Also 
+    apparently did increase the soname, which is not needed here. Also
     the libgtop2 build system is broken, probably due to libtool too, because
     it will link libraries with already installed libraries and not with the
     ones currently building. This is mostly ok, but breaks when the soname
@@ -800,5 +816,3 @@ libgtop2 (1.90.2-1) unstable; urgency=low
     (closes: Bug#133219)
 
  -- Noel Koethe <noel@debian.org>  Sat, 16 Feb 2002 13:16:00 +0100
-
-

debian/control

@@ -1,5 +1,5 @@
 # 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
@@ -22,9 +22,9 @@ Build-Depends: debhelper (>= 11),
                gtk-doc-tools (>= 1.4),
                gobject-introspection (>= 0.6.7),
                libgirepository1.0-dev (>= 0.10.7-1~)
-Standards-Version: 4.1.2
-Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/libgtop.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/libgtop.git
+Standards-Version: 4.3.0
+Vcs-Browser: https://salsa.debian.org/gnome-team/libgtop
+Vcs-Git: https://salsa.debian.org/gnome-team/libgtop.git
 
 Package: libgtop-2.0-11
 Architecture: any

debian/control.in

@@ -18,9 +18,9 @@ Build-Depends: debhelper (>= 11),
                gtk-doc-tools (>= 1.4),
                gobject-introspection (>= 0.6.7),
                libgirepository1.0-dev (>= 0.10.7-1~)
-Standards-Version: 4.1.2
-Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/libgtop.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/libgtop.git
+Standards-Version: 4.3.0
+Vcs-Browser: https://salsa.debian.org/gnome-team/libgtop
+Vcs-Git: https://salsa.debian.org/gnome-team/libgtop.git
 
 Package: libgtop-2.0-11
 Architecture: any

debian/patches/mountlist-ignore-snap-squashfs.patch

@@ -0,0 +1,50 @@
+From: Andrea Azzarone <azzaronea@gmail.com>
+Date: Thu, 19 Apr 2018 15:58:30 +0200
+Subject: mountlist: ignore snap squashfs
+
+Ignore squashfs mounted in snaps. This will make sure that snap fs
+are not listed in gnome-system-monitor.
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1749007
+Forwarded: not-needed
+---
+ sysdeps/linux/mountlist.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/sysdeps/linux/mountlist.c b/sysdeps/linux/mountlist.c
+index 7c376fd..f36fc29 100644
+--- a/sysdeps/linux/mountlist.c
++++ b/sysdeps/linux/mountlist.c
+@@ -84,7 +84,7 @@ ignore_list_has(IgnoreList* ig, const char* fs)
+ 
+ 
+ static gboolean
+-ignore_fs(const char *fstype, IgnoreList** ig)
++ignore_fs(const char* mntdir, const char *fstype, IgnoreList** ig)
+ {
+   if (!*ig) {
+     FILE* fs;
+@@ -106,10 +106,13 @@ ignore_fs(const char *fstype, IgnoreList** ig)
+     }
+   }
+ 
++  /* ignore snap squashfs */
++  if (!strcmp(fstype, "squashfs") && !strncmp(mntdir, "/snap/", 6))
++    return TRUE;
++
+   return ignore_list_has(*ig, fstype);
+ }
+ 
+-
+ glibtop_mountentry *
+ glibtop_get_mountlist_s(glibtop *server, glibtop_mountlist *buf, int all_fs)
+ {
+@@ -136,7 +139,7 @@ glibtop_get_mountlist_s(glibtop *server, glibtop_mountlist *buf, int all_fs)
+       const char *devopt;
+       gsize len;
+ 
+-      if (!all_fs && ignore_fs(mnt->mnt_type, &ig))
++      if (!all_fs && ignore_fs(mnt->mnt_dir, mnt->mnt_type, &ig))
+ 	continue;
+ 
+       len = entries->len;

debian/patches/series

@@ -1,2 +1,3 @@
 03_kfreebsd_installdirs.patch
 04_kfreebsd_version.patch
+mountlist-ignore-snap-squashfs.patch

debian/rules

@@ -1,12 +1,9 @@
 #!/usr/bin/make -f
 
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-GNOME_MODULE := libgtop
-
 SHARED_PKG := libgtop-2.0-11
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
 
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 CPPFLAGS += $(shell pkg-config --cflags libbsd-overlay)
@@ -36,4 +33,8 @@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 		--ignore=debian/$(SHARED_PKG).install \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(SHARED_PKG)/libgtop_server2
 endif
+	find debian/tmp -name '*.la' -print -delete
 	dh_install
+
+override_dh_missing:
+	dh_missing --list-missing