SOURCES: obexftp-nostress.patch, obexftp-perl.patch - updated for 0.22

[qboosh]

Author: qboosh                       Date: Mon Sep  1 18:04:31 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.22

---- Files affected:
SOURCES:
   obexftp-nostress.patch (1.1 -> 1.2) , obexftp-perl.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/obexftp-nostress.patch
diff -u SOURCES/obexftp-nostress.patch:1.1 SOURCES/obexftp-nostress.patch:1.2
--- SOURCES/obexftp-nostress.patch:1.1	Mon May 28 13:44:12 2007
+++ SOURCES/obexftp-nostress.patch	Mon Sep  1 20:04:25 2008
@@ -1,20 +1,10 @@
---- apps/Makefile.am	2006-03-26 00:11:59.000000000 +0100
-+++ apps/Makefile.am-new	2007-05-28 13:27:40.657210186 +0200
-@@ -20,7 +20,6 @@
- 				bt_discovery.c
+--- obexftp-0.22/apps/Makefile.am.orig	2008-06-15 21:18:58.000000000 +0200
++++ obexftp-0.22/apps/Makefile.am	2008-09-01 07:59:12.471844124 +0200
+@@ -13,7 +13,6 @@
+ obexftp_SOURCES =		obexftp.c
  
- obexftpd_SOURCES =		obexftpd.c obexftp_sdp.c obexftp_sdp.h
+ obexftpd_SOURCES =		obexftpd.c
 -stress_SOURCES =		stress.c
  discovery_SOURCES =		discovery.c
  
  bin_PROGRAMS =			obexftp obexftpd
---- configure.in	2006-05-16 16:50:29.000000000 +0200
-+++ configure.in-new	2007-05-28 13:41:21.684223141 +0200
-@@ -24,7 +24,6 @@
- # Checks for libraries.
- PKG_CHECK_MODULES(OPENOBEX,openobex)
- 
--AM_ICONV
- dnl IRDA_CHECK
- BLUETOOTH_CHECK
- SDPLIB_CHECK

================================================================
Index: SOURCES/obexftp-perl.patch
diff -u SOURCES/obexftp-perl.patch:1.1 SOURCES/obexftp-perl.patch:1.2
--- SOURCES/obexftp-perl.patch:1.1	Sun Sep 10 13:13:56 2006
+++ SOURCES/obexftp-perl.patch	Mon Sep  1 20:04:25 2008
@@ -1,31 +1,30 @@
---- obexftp-0.20/swig/perl/Makefile.am.orig	2006-03-26 00:12:58.000000000 +0100
-+++ obexftp-0.20/swig/perl/Makefile.am	2006-09-10 12:42:50.225868750 +0200
-@@ -27,13 +27,13 @@
+--- obexftp-0.22/swig/perl/Makefile.am.orig	2008-06-15 21:18:58.000000000 +0200
++++ obexftp-0.22/swig/perl/Makefile.am	2008-09-01 07:51:10.659840771 +0200
+@@ -9,14 +9,14 @@
  endif
  
  Makefile.perl: Makefile.PL
--	$(PERL) $< MAKEFILE=$@
-+	$(PERL) $< MAKEFILE=$@ INSTALLDIRS=vendor
+-	$(PERL) $< PREFIX=$(prefix) MAKEFILE=$@
++	$(PERL) $< PREFIX=$(prefix) MAKEFILE=$@ INSTALLDIRS=vendor
  
  OBEXFTP.so: perl_wrap.c Makefile.perl
+ 	if test ! -f perl_wrap.c; then cp $(srcdir)/perl_wrap.c . ; fi
  	$(MAKE) -fMakefile.perl
  
- install-data-local:
--	$(MAKE) -fMakefile.perl PREFIX=$(prefix) install
-+	$(MAKE) -fMakefile.perl PREFIX=$(prefix) pure_install
+ install-data-local: Makefile.perl
+-	$(MAKE) -fMakefile.perl install
++	$(MAKE) -fMakefile.perl pure_install
  
- maintainer-clean-local:
- 	rm -f OBEXFTP.pm perl_wrap.c
---- obexftp-0.20/swig/perl/Makefile.PL.in.orig	2005-12-12 19:46:55.000000000 +0100
-+++ obexftp-0.20/swig/perl/Makefile.PL.in	2006-09-10 12:50:47.807715750 +0200
-@@ -11,8 +11,8 @@
-     'INC'       =>	q[-I at top_srcdir@/obexftp -I../.. @CPPFLAGS@],
+ # sadly there is no make uninstall for perl
+ #uninstall-local: Makefile.perl
+--- obexftp-0.22/swig/perl/Makefile.PL.in.orig	2008-06-15 21:18:58.000000000 +0200
++++ obexftp-0.22/swig/perl/Makefile.PL.in	2008-09-01 07:50:12.971839933 +0200
+@@ -11,7 +11,7 @@
+     'INC'       =>	q[-I at top_srcdir@ @CPPFLAGS@],
  # Default value for LDDLFLAGS is $Config{lddlflags}="-shared -L/usr/local/lib"
  # but we want rpath to be @libdir@ or @exec_prefix@/lib
--    'LDDLFLAGS' =>      q[-shared -Wl,-L at top_builddir@obexftp/.libs -Wl,-rpath=@prefix@/lib],
--    'LIBS'      =>	q[-L at top_builddir@obexftp/.libs -lobexftp -L at top_builddir@multicobex/.libs -lmulticobex -L at top_builddir@bfb/.libs -lbfb @OPENOBEX_LIBS@ @BLUETOOTH_LIBS@ @LIBS@],
-+    'LDDLFLAGS' =>      q[-shared -Wl,-L at top_builddir@/obexftp/.libs -Wl,-rpath=@prefix@/lib],
-+    'LIBS'      =>	q[-L at top_builddir@/obexftp/.libs -lobexftp -L at top_builddir@/multicobex/.libs -lmulticobex -L at top_builddir@/bfb/.libs -lbfb @OPENOBEX_LIBS@ @BLUETOOTH_LIBS@ @LIBS@],
-     'OBJECT'	=>	'perl_wrap.o',
-     'NAME'      =>	'OBEXFTP',
-     'FIRST_MAKEFILE'      =>	'Makefile.perl',
+-    'LDDLFLAGS' =>      q[-shared -Wl,-rpath=@prefix@/lib],
++    'LDDLFLAGS' =>      q[-shared],
+     'LIBS'      =>	q[-L at top_builddir@/obexftp/.libs -lobexftp
+     			  -L at top_builddir@/multicobex/.libs -lmulticobex
+ 			  -L at top_builddir@/bfb/.libs -lbfb
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/obexftp-nostress.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/obexftp-perl.patch?r1=1.1&r2=1.2&f=u