r46351 - in /desktop/unstable/libgtop2/debian: changelog patches/02_hurd_stub_backend.patch patches/03_kfreebsd_installdirs.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Oct  7 22:08:18 2015
New Revision: 46351

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46351
Log:
Update patches, drop 02_hurd_stub_backend.patch, fixed upstream.

Removed:
    desktop/unstable/libgtop2/debian/patches/02_hurd_stub_backend.patch
Modified:
    desktop/unstable/libgtop2/debian/changelog
    desktop/unstable/libgtop2/debian/patches/03_kfreebsd_installdirs.patch
    desktop/unstable/libgtop2/debian/patches/series

Modified: desktop/unstable/libgtop2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/changelog?rev=46351&op=diff
==============================================================================
--- desktop/unstable/libgtop2/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libgtop2/debian/changelog	[utf-8] Wed Oct  7 22:08:18 2015
@@ -2,6 +2,7 @@
 
   * 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 <biebl at debian.org>  Wed, 07 Oct 2015 23:41:43 +0200
 

Modified: desktop/unstable/libgtop2/debian/patches/03_kfreebsd_installdirs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/patches/03_kfreebsd_installdirs.patch?rev=46351&op=diff
==============================================================================
--- desktop/unstable/libgtop2/debian/patches/03_kfreebsd_installdirs.patch	[utf-8] (original)
+++ desktop/unstable/libgtop2/debian/patches/03_kfreebsd_installdirs.patch	[utf-8] Wed Oct  7 22:08:18 2015
@@ -7,20 +7,27 @@
 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 @@
  	  ;;
  	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 @@
  	  ;;
  	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 @@
  	  ;;
  	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 @@
  
  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

Modified: desktop/unstable/libgtop2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/patches/series?rev=46351&op=diff
==============================================================================
--- desktop/unstable/libgtop2/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/libgtop2/debian/patches/series	[utf-8] Wed Oct  7 22:08:18 2015
@@ -1,3 +1,2 @@
-02_hurd_stub_backend.patch
 03_kfreebsd_installdirs.patch
 04_kfreebsd_version.patch