r29595 - in /desktop/unstable/libgtop2/debian: changelog patches/03_kfreebsd_installdirs.patch patches/99_ltmain_as-needed.patch
mpitt at users.alioth.debian.org
mpitt at users.alioth.debian.org
Tue Sep 6 12:13:46 UTC 2011
Author: mpitt
Date: Tue Sep 6 12:13:46 2011
New Revision: 29595
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29595
Log:
unfuzz the other patches
Modified:
desktop/unstable/libgtop2/debian/changelog
desktop/unstable/libgtop2/debian/patches/03_kfreebsd_installdirs.patch
desktop/unstable/libgtop2/debian/patches/99_ltmain_as-needed.patch
Modified: desktop/unstable/libgtop2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/changelog?rev=29595&op=diff
==============================================================================
--- desktop/unstable/libgtop2/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgtop2/debian/changelog [utf-8] Tue Sep 6 12:13:46 2011
@@ -2,7 +2,8 @@
[ Martin Pitt ]
* New upstream bug fix release.
- * 05_kfreebsd_8.0.patch: Update for new version.
+ * 03_kfreebsd_installdirs.patch, 05_kfreebsd_8.0.patch,
+ 99_ltmain_as-needed.patch: Update for new version.
* debian/control.in: Fix section of gir1.2-gtop-2.0, should be "libs" (and
was set like that by ftpmasters).
* debian/watch: Fix regexp syntax, and watch for *.tar.bz2.
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=29595&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] Tue Sep 6 12:13:46 2011
@@ -7,20 +7,20 @@
The patch also adds some missing $(DESTDIR) references in the installation
hooks.
-Index: libgtop-2.28.0/libgtop-sysdeps.m4
+Index: libgtop2/libgtop-sysdeps.m4
===================================================================
---- libgtop-2.28.0.orig/libgtop-sysdeps.m4 2009-11-22 17:31:01.861694527 +0100
-+++ libgtop-2.28.0/libgtop-sysdeps.m4 2009-11-22 17:33:11.877189288 +0100
-@@ -73,7 +73,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
+--- 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_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'
;;
- freebsd*|kfreebsd*)
- libgtop_sysdeps_dir=freebsd
-@@ -81,27 +81,27 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
+ openbsd*)
+ libgtop_sysdeps_dir=openbsd
+@@ -87,27 +87,27 @@
libgtop_need_server=yes
libgtop_sysdeps_private_mountlist=yes
libgtop_sysdeps_private_fsusage=yes
@@ -52,11 +52,11 @@
;;
cygwin*)
libgtop_sysdeps_dir=cygwin
-Index: libgtop-2.28.0/src/daemon/Makefile.am
+Index: libgtop2/src/daemon/Makefile.am
===================================================================
---- libgtop-2.28.0.orig/src/daemon/Makefile.am 2009-11-22 17:29:07.097688961 +0100
-+++ libgtop-2.28.0/src/daemon/Makefile.am 2009-11-22 17:29:46.589689603 +0100
-@@ -28,7 +28,7 @@ suid_sysdeps =
+--- 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 @@
suid_common =
endif
@@ -65,11 +65,11 @@
EXTRA_PROGRAMS = libgtop_server2
-Index: libgtop-2.28.0/configure.in
+Index: libgtop2/configure.in
===================================================================
---- libgtop-2.28.0.orig/configure.in 2009-11-22 17:36:21.481188616 +0100
-+++ libgtop-2.28.0/configure.in 2009-11-22 17:36:35.733188858 +0100
-@@ -287,8 +287,8 @@ libgtop_save_prefix="$prefix"
+--- 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_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/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/patches/99_ltmain_as-needed.patch?rev=29595&op=diff
==============================================================================
--- desktop/unstable/libgtop2/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/libgtop2/debian/patches/99_ltmain_as-needed.patch [utf-8] Tue Sep 6 12:13:46 2011
@@ -1,8 +1,8 @@
-Index: libgtop-2.28.0/ltmain.sh
+Index: libgtop2/ltmain.sh
===================================================================
---- libgtop-2.28.0.orig/ltmain.sh 2009-09-21 09:54:29.000000000 +0200
-+++ libgtop-2.28.0/ltmain.sh 2009-11-22 17:17:07.677688108 +0100
-@@ -4716,6 +4716,11 @@ func_mode_link ()
+--- libgtop2.orig/ltmain.sh 2011-08-30 13:25:39.000000000 +0200
++++ libgtop2/ltmain.sh 2011-09-06 14:12:45.695875002 +0200
+@@ -5787,6 +5787,11 @@
arg=$func_stripname_result
;;
@@ -14,7 +14,7 @@
-Wl,*)
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
-@@ -5070,6 +5075,15 @@ func_mode_link ()
+@@ -6150,6 +6155,15 @@
lib=
found=no
case $deplib in
More information about the pkg-gnome-commits
mailing list