SOURCES: powersoftplus-make.patch, powersoftplus-system-ftd.patch ...

[qboosh]

Author: qboosh                       Date: Fri Feb  8 20:58:20 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged -lftd2xx part

---- Files affected:
SOURCES:
   powersoftplus-make.patch (1.1 -> 1.2) , powersoftplus-system-ftd.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/powersoftplus-make.patch
diff -u SOURCES/powersoftplus-make.patch:1.1 SOURCES/powersoftplus-make.patch:1.2
--- SOURCES/powersoftplus-make.patch:1.1	Mon Feb  4 15:13:24 2008
+++ SOURCES/powersoftplus-make.patch	Fri Feb  8 21:58:15 2008
@@ -41,15 +41,3 @@
  
  uninstall:
  	@/sbin/chkconfig --del powersoftplus
-diff -Nur powersoftplus-0.1.8.orig/src/Makefile.am powersoftplus-0.1.8.chng/src/Makefile.am
---- powersoftplus-0.1.8.orig/src/Makefile.am	2006-08-27 00:00:00.000000000 +0200
-+++ powersoftplus-0.1.8.chng/src/Makefile.am	2008-02-04 09:48:44.000000000 +0100
-@@ -10,7 +10,7 @@
- 		common.cpp conf.cpp cshmem.cpp csnmp.cpp duopro.cpp ecoprocds.cpp ecopro.cpp \
- 		glfunc.cpp map.cpp monitor.cpp net3000.cpp net.cpp powersoftplus.cpp sinline.cpp \
- 		sinlinexl.cpp snmp.cpp ftccomm.cpp sinline_usb.cpp sinlinexl_usb.cpp
--AM_CXXFLAGS = -pthread -lftd2xx
-+AM_CXXFLAGS = -pthread -L$(top_srcdir)/libftdi -lftd2xx
- noinst_HEADERS = AMMimeUtils.h ccomm.h cemail.h clog.h common.h conf.h cshmem.h \
- 		csnmp.h duopro.h ecoprocds.h ecopro.h gldefs.h glfunc.h ioctldef.h map.h \
- 		monitor.h net3000.h netclient.h net.h sinline.h sinlinexl.h snmp.h strings_en.h \

================================================================
Index: SOURCES/powersoftplus-system-ftd.patch
diff -u SOURCES/powersoftplus-system-ftd.patch:1.1 SOURCES/powersoftplus-system-ftd.patch:1.2
--- SOURCES/powersoftplus-system-ftd.patch:1.1	Fri Feb  8 20:24:22 2008
+++ SOURCES/powersoftplus-system-ftd.patch	Fri Feb  8 21:58:15 2008
@@ -10,7 +10,7 @@
  		common.cpp conf.cpp cshmem.cpp csnmp.cpp duopro.cpp ecoprocds.cpp ecopro.cpp \
  		glfunc.cpp map.cpp monitor.cpp net3000.cpp net.cpp powersoftplus.cpp sinline.cpp \
  		sinlinexl.cpp snmp.cpp ftccomm.cpp sinline_usb.cpp sinlinexl_usb.cpp
--AM_CXXFLAGS = -pthread -L$(top_srcdir)/libftdi -lftd2xx
+-AM_CXXFLAGS = -pthread -lftd2xx
 +AM_CXXFLAGS = -pthread
  noinst_HEADERS = AMMimeUtils.h ccomm.h cemail.h clog.h common.h conf.h cshmem.h \
  		csnmp.h duopro.h ecoprocds.h ecopro.h gldefs.h glfunc.h ioctldef.h map.h \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/powersoftplus-make.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/powersoftplus-system-ftd.patch?r1=1.1&r2=1.2&f=u