SOURCES: kiax-system_iaxclient_libs.diff - updated

[arekm]

Author: arekm                        Date: Wed Apr 12 21:00:29 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kiax-system_iaxclient_libs.diff (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kiax-system_iaxclient_libs.diff
diff -u SOURCES/kiax-system_iaxclient_libs.diff:1.1 SOURCES/kiax-system_iaxclient_libs.diff:1.2
--- SOURCES/kiax-system_iaxclient_libs.diff:1.1	Mon Jun  6 14:36:55 2005
+++ SOURCES/kiax-system_iaxclient_libs.diff	Wed Apr 12 23:00:24 2006
@@ -1,6 +1,6 @@
-diff -Naur kiax-0.8.4/qkiax.pro kiax-0.8.4.oden/qkiax.pro
---- kiax-0.8.4/qkiax.pro	2005-04-07 01:48:03.000000000 +0200
-+++ kiax-0.8.4.oden/qkiax.pro	2005-04-15 09:31:09.114764393 +0200
+diff -urN kiax-0.8.5-src.org/qkiax.pro kiax-0.8.5-src/qkiax.pro
+--- kiax-0.8.5-src.org/qkiax.pro	2005-04-08 16:29:52.000000000 +0200
++++ kiax-0.8.5-src/qkiax.pro	2006-04-12 22:52:58.866941250 +0200
 @@ -3,15 +3,14 @@
  # Subdir relative project main directory: .
  # Target is a subdirs project 
@@ -20,62 +20,54 @@
             src  \
  	   bin
 +LIBS += -liaxclient
-diff -Naur kiax-0.8.4/src/src.pro kiax-0.8.4.oden/src/src.pro
---- kiax-0.8.4/src/src.pro	2005-04-13 16:22:46.000000000 +0200
-+++ kiax-0.8.4.oden/src/src.pro	2005-04-15 09:34:29.139705198 +0200
+diff -urN kiax-0.8.5-src.org/src/src.pro kiax-0.8.5-src/src/src.pro
+--- kiax-0.8.5-src.org/src/src.pro	2006-03-26 00:21:25.000000000 +0100
++++ kiax-0.8.5-src/src/src.pro	2006-04-12 22:55:46.869440750 +0200
 @@ -7,11 +7,11 @@
              icons \
              translations 
  translations.files += ../i18n/*.qm 
--translations.path = /usr/local/share/kiax/i18n/
-+translations.path = /usr/share/kiax/i18n/
+-translations.path = /usr/local/share/kiax/i18n/ 
++translations.path = /usr/share/kiax/i18n/ 
  icons.files += ../icons/*.png 
--icons.path = /usr/local/share/kiax/icons/
-+icons.path = /usr/share/kiax/icons/
+-icons.path = /usr/local/share/kiax/icons/ 
++icons.path = /usr/share/kiax/icons/ 
  binary.files += ../bin/kiax 
--binary.path = /usr/local/bin/
-+binary.path = /usr/bin/
+-binary.path = /usr/local/bin/ 
++binary.path = /usr/bin/ 
  FORMS += aboutbox.ui \
           logwindow.ui \
           mainwindow.ui \
-@@ -64,12 +64,10 @@
-            kiaxcallrecord.cpp \
-            kiaxcallregister.cpp \
-            kiaxlogwindow.cpp 
--TARGETDEPS += ../lib/libiaxclient.a 
--LIBS += ../lib/libiaxclient.a 
+@@ -86,12 +86,10 @@
+            kiaxcontactlistitem.cpp \
+            kiaxiconfactory.cpp \
+            kiaxkeyfilter.cpp 
+-TARGETDEPS += ../lib/libiaxclient.a
+-LIBS += ../lib/libiaxclient.a ${LIBOSSAUDIO}
 -INCLUDEPATH = ../src \
--              ../lib 
+-../lib
 -DEFINES = ICONS_PATH=\"/usr/local/share/kiax/icons/\" \
--          I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\" 
-+LIBS += -liaxclient
-+INCLUDEPATH = ../src /usr/include/iaxclient 
+-I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\"
++LIBS += -liaxclient ${LIBOSSAUDIO}
++INCLUDEPATH = ../src /usr/include/iaxclient
 +DEFINES = ICONS_PATH=\"/usr/share/kiax/icons/\" \
-+          I18N_DIRECTORY=\"/usr/share/kiax/i18n/\" 
- TARGET = ../bin/kiax 
++I18N_DIRECTORY=\"/usr/share/kiax/i18n/\"
+ TARGET = ../bin/kiax
  CONFIG += release \
-           warn_on \
-diff -Naur kiax-0.8.4/src/src.pro.or kiax-0.8.4.oden/src/src.pro.or
---- kiax-0.8.4/src/src.pro.or	2005-04-07 00:31:02.000000000 +0200
-+++ kiax-0.8.4.oden/src/src.pro.or	2005-04-15 09:34:45.012865146 +0200
-@@ -64,10 +64,8 @@
-            kiaxcallrecord.cpp \
-            kiaxcallregister.cpp \
-            kiaxlogwindow.cpp 
--TARGETDEPS += ../lib/libiaxclient.a 
--LIBS += ../lib/libiaxclient.a 
+ warn_on \
+diff -urN kiax-0.8.5-src.org/src/src.pro.or kiax-0.8.5-src/src/src.pro.or
+--- kiax-0.8.5-src.org/src/src.pro.or	2006-03-26 00:21:46.000000000 +0100
++++ kiax-0.8.5-src/src/src.pro.or	2006-04-12 22:54:18.523919500 +0200
+@@ -86,10 +86,8 @@
+            kiaxcontactlistitem.cpp \
+            kiaxiconfactory.cpp \
+            kiaxkeyfilter.cpp 
+-TARGETDEPS += ../lib/libiaxclient.a
+-LIBS += ../lib/libiaxclient.a ${LIBOSSAUDIO}
 -INCLUDEPATH = ../src \
--              ../lib 
-+LIBS += -liaxclient
+-../lib
++LIBS += -liaxclient ${LIBOSSAUDIO}
 +INCLUDEPATH = ../src /usr/include/iaxclient
- DEFINES = ICONS_PATH=\"./icons/\" \
-           I18N_DIRECTORY=\"./i18n/\" 
- TARGET = ../bin/kiax 
-@@ -76,6 +74,7 @@
-           qt \
-           thread \
-           x11 
-+
- prefswindow.ui.commands = $$IDL_COMPILER $$IDL_OPTIONS $$prefswindow.ui.target 
- prefswindow.ui.target = prefswindow.ui 
- calltab.ui.commands = $$IDL_COMPILER $$IDL_OPTIONS $$calltab.ui.target 
+ DEFINES = ICONS_PATH=\"/usr/local/share/kiax/icons/\" \
+ I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\"
+ TARGET = ../bin/kiax
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kiax-system_iaxclient_libs.diff?r1=1.1&r2=1.2&f=u