[Pkg-voip-commits] r1506 - in kiax/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Wed Mar 29 20:34:44 UTC 2006
Author: msp
Date: 2006-03-29 20:34:34 +0000 (Wed, 29 Mar 2006)
New Revision: 1506
Modified:
kiax/trunk/debian/changelog
kiax/trunk/debian/patches/01_debian-patch.dpatch
Log:
* Build without /lib, Build-Depend on libiaxclient-dev
Modified: kiax/trunk/debian/changelog
===================================================================
--- kiax/trunk/debian/changelog 2006-03-29 20:21:24 UTC (rev 1505)
+++ kiax/trunk/debian/changelog 2006-03-29 20:34:34 UTC (rev 1506)
@@ -3,8 +3,9 @@
* (NOT RELEASED YET) New upstream release
* Update Debian/watch & get-orig-source targets
* Copyright audit to debian/copyright
+ * Build without /lib, Build-Depend on libiaxclient-dev
- -- Mark Purcell <mark at dell.purcell.id.au> Wed, 29 Mar 2006 21:20:56 +0100
+ -- Mark Purcell <msp at debian.org> Wed, 29 Mar 2006 21:33:15 +0100
kiax (0.8.5-pre-1) UNRELEASED; urgency=low
Modified: kiax/trunk/debian/patches/01_debian-patch.dpatch
===================================================================
--- kiax/trunk/debian/patches/01_debian-patch.dpatch 2006-03-29 20:21:24 UTC (rev 1505)
+++ kiax/trunk/debian/patches/01_debian-patch.dpatch 2006-03-29 20:34:34 UTC (rev 1506)
@@ -5,40 +5,49 @@
## DP: New patch generated from kiax 0.8.4-4 diff.gz
@DPATCH@
-
---- kiax-0.8.4.orig/bin/Makefile
-+++ kiax-0.8.4/bin/Makefile
+diff -urNad kiax-0.8.5~/bin/Makefile kiax-0.8.5/bin/Makefile
+--- kiax-0.8.5~/bin/Makefile 2006-02-06 16:02:48.000000000 +0000
++++ kiax-0.8.5/bin/Makefile 2006-03-29 21:21:49.000000000 +0100
@@ -1,4 +1,4 @@
-DEST_PATH=/usr/local/bin/
+DEST_PATH=/usr/bin/
all:
echo 'none'
install:
---- kiax-0.8.4.orig/src/src.pro
-+++ kiax-0.8.4/src/src.pro
-@@ -7,11 +7,11 @@
- icons \
- translations
- translations.files += ../i18n/*.qm
--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/
- binary.files += ../bin/kiax
--binary.path = /usr/local/bin/
-+binary.path = /usr/bin/
- FORMS += aboutbox.ui \
- logwindow.ui \
- mainwindow.ui \
-@@ -68,8 +68,8 @@
- LIBS += ../lib/libiaxclient.a
- INCLUDEPATH = ../src \
- ../lib
--DEFINES = ICONS_PATH=\"/usr/local/share/kiax/icons/\" \
-- I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\"
-+DEFINES = ICONS_PATH=\"/usr/share/kiax/icons/\" \
-+ I18N_DIRECTORY=\"/usr/share/kiax/i18n/\"
- TARGET = ../bin/kiax
+diff -urNad kiax-0.8.5~/qkiax.pro kiax-0.8.5/qkiax.pro
+--- kiax-0.8.5~/qkiax.pro 2005-04-08 15:29:52.000000000 +0100
++++ kiax-0.8.5/qkiax.pro 2006-03-29 21:23:45.000000000 +0100
+@@ -3,15 +3,13 @@
+ # Subdir relative project main directory: .
+ # Target is a subdirs project
+
+-TARGETDEPS += lib/libiaxclient.a \
+- src/../bin/kiax
++TARGETDEPS += src/../bin/kiax
CONFIG += release \
warn_on \
+ qt \
+ thread \
+ x11
+ TEMPLATE = subdirs
+-SUBDIRS += lib \
+- i18n \
++SUBDIRS += i18n \
+ src \
+ bin
+diff -urNad kiax-0.8.5~/src/src.pro.or kiax-0.8.5/src/src.pro.or
+--- kiax-0.8.5~/src/src.pro.or 2006-03-25 23:21:46.000000000 +0000
++++ kiax-0.8.5/src/src.pro.or 2006-03-29 21:23:58.000000000 +0100
+@@ -86,10 +86,8 @@
+ kiaxcontactlistitem.cpp \
+ kiaxiconfactory.cpp \
+ kiaxkeyfilter.cpp
+-TARGETDEPS += ../lib/libiaxclient.a
+-LIBS += ../lib/libiaxclient.a ${LIBOSSAUDIO}
+-INCLUDEPATH = ../src \
+-../lib
++LIBS += -lportaudio -lgsm -lspeex -liaxclient ${LIBOSSAUDIO}
++INCLUDEPATH = ../src /usr/include
+ DEFINES = ICONS_PATH=\"/usr/local/share/kiax/icons/\" \
+ I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\"
+ TARGET = ../bin/kiax
More information about the Pkg-voip-commits
mailing list