[Pkg-voip-commits] r1318 - in twinkle/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Tue Feb 21 22:55:50 UTC 2006
Author: msp
Date: 2006-02-21 22:55:49 +0000 (Tue, 21 Feb 2006)
New Revision: 1318
Added:
twinkle/trunk/debian/patches/gui.cpp.diff
twinkle/trunk/debian/patches/libgsm.diff
Modified:
twinkle/trunk/debian/changelog
twinkle/trunk/debian/rules
Log:
releasing version 0.6.1-2
Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog 2006-02-20 18:46:03 UTC (rev 1317)
+++ twinkle/trunk/debian/changelog 2006-02-21 22:55:49 UTC (rev 1318)
@@ -1,3 +1,16 @@
+twinkle (0.6.1-2) unstable; urgency=low
+
+ * Add debian/patches/libgsm.diff to use Build-Depends: libgsm1-dev
+ * Add debian/patches/gui.cpp.diff (Closes: Bug#352534)
+
+ -- Mark Purcell <msp at debian.org> Tue, 21 Feb 2006 18:31:51 +0000
+
+twinkle (0.6.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 12 Feb 2006 08:06:44 +0000
+
twinkle (0.6-1) UNRELEASED; urgency=low
* (NOT RELEASED YET) New upstream release
Added: twinkle/trunk/debian/patches/gui.cpp.diff
===================================================================
--- twinkle/trunk/debian/patches/gui.cpp.diff 2006-02-20 18:46:03 UTC (rev 1317)
+++ twinkle/trunk/debian/patches/gui.cpp.diff 2006-02-21 22:55:49 UTC (rev 1318)
@@ -0,0 +1,11 @@
+--- gui.cpp.orig 2006-02-21 18:28:06.000000000 +0000
++++ src/gui/gui.cpp 2006-02-21 18:28:16.000000000 +0000
+@@ -987,7 +987,7 @@
+ s = user_config->get_profile_name().c_str();
+ const list<t_contact_param> &l = r->hdr_contact.contact_list;
+ if (l.size() == 0) {
+- s += ": you are nor registered";
++ s += ": you are not registered";
+ mainWindow->display(s);
+ } else {
+ s += ": you have the following registrations";
Added: twinkle/trunk/debian/patches/libgsm.diff
===================================================================
--- twinkle/trunk/debian/patches/libgsm.diff 2006-02-20 18:46:03 UTC (rev 1317)
+++ twinkle/trunk/debian/patches/libgsm.diff 2006-02-21 22:55:49 UTC (rev 1318)
@@ -0,0 +1,79 @@
+diff -ur orig/twinkle-0.6.1/configure.in twinkle-0.6.1/configure.in
+--- orig/twinkle-0.6.1/configure.in 2006-02-11 14:40:40.000000000 +0000
++++ twinkle-0.6.1/configure.in 2006-02-21 10:49:26.000000000 +0000
+@@ -133,6 +133,12 @@
+ echo "LIBS += -lasound" >> $QT_INCL_PRO
+ ])
+
++# Check if libgsm is available
++AC_CHECK_LIB(gsm, sf_open, [],
++ [AC_MSG_ERROR([libgsm library is missing.])])
++AC_CHECK_HEADER(gsm.h, [],
++ [AC_MSG_ERROR([gsm header files msiing (gsm.h)])])
++
+ $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
+ echo "distdir:" >> src/gui/Makefile
+
+diff -ur orig/twinkle-0.6.1/src/audio/audio_rx.h twinkle-0.6.1/src/audio/audio_rx.h
+--- orig/twinkle-0.6.1/src/audio/audio_rx.h 2006-01-01 15:38:04.000000000 +0000
++++ twinkle-0.6.1/src/audio/audio_rx.h 2006-02-21 10:34:57.000000000 +0000
+@@ -29,7 +29,7 @@
+ #include "user.h"
+ #include "threads/mutex.h"
+ #include "threads/sema.h"
+-#include "gsm/inc/gsm.h"
++#include <gsm.h>
+ #include "audio_device.h"
+ #include "twinkle_rtp_session.h"
+
+diff -ur orig/twinkle-0.6.1/src/audio/audio_tx.h twinkle-0.6.1/src/audio/audio_tx.h
+--- orig/twinkle-0.6.1/src/audio/audio_tx.h 2006-01-01 15:38:04.000000000 +0000
++++ twinkle-0.6.1/src/audio/audio_tx.h 2006-02-21 10:35:16.000000000 +0000
+@@ -27,7 +27,7 @@
+ #include "media_buffer.h"
+ #include "rtp_telephone_event.h"
+ #include "threads/mutex.h"
+-#include "gsm/inc/gsm.h"
++#include <gsm.h>
+ #include "audio_device.h"
+ #include "twinkle_rtp_session.h"
+
+diff -ur orig/twinkle-0.6.1/src/audio/Makefile.am twinkle-0.6.1/src/audio/Makefile.am
+--- orig/twinkle-0.6.1/src/audio/Makefile.am 2005-10-09 20:11:36.000000000 +0100
++++ twinkle-0.6.1/src/audio/Makefile.am 2006-02-21 10:35:37.000000000 +0000
+@@ -29,6 +29,4 @@
+ tone_gen.h\
+ twinkle_rtp_session.h
+
+-SUBDIRS = gsm
+-
+ EXTRA_DIST = README_G711
+diff -ur orig/twinkle-0.6.1/src/gui/twinkle.pro twinkle-0.6.1/src/gui/twinkle.pro
+--- orig/twinkle-0.6.1/src/gui/twinkle.pro 2006-02-11 08:34:27.000000000 +0000
++++ twinkle-0.6.1/src/gui/twinkle.pro 2006-02-21 11:05:20.000000000 +0000
+@@ -3,7 +3,7 @@
+
+ CONFIG += qt warn_off release thread
+
+-LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile
++LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lgsm
+
+ DEFINES += QT_NO_STL
+
+Only in twinkle-0.6.1/src/gui: .ui
+diff -ur orig/twinkle-0.6.1/src/Makefile.am twinkle-0.6.1/src/Makefile.am
+--- orig/twinkle-0.6.1/src/Makefile.am 2006-02-03 22:28:58.000000000 +0000
++++ twinkle-0.6.1/src/Makefile.am 2006-02-21 10:40:53.000000000 +0000
+@@ -16,11 +16,11 @@
+ $(top_builddir)/src/sockets/libsocket.a\
+ $(top_builddir)/src/threads/libthread.a\
+ $(top_builddir)/src/audio/libaudio.a\
+- $(top_builddir)/src/audio/gsm/libgsm.a\
+ $(top_builddir)/src/audits/libaudits.a\
+ $(top_builddir)/src/stun/libstun.a\
+ $(CCRTP_LIBS)\
+ -lresolv\
++ -lgsm\
+ -lsndfile
+
+ libtwinkle_a_SOURCES =\
Modified: twinkle/trunk/debian/rules
===================================================================
--- twinkle/trunk/debian/rules 2006-02-20 18:46:03 UTC (rev 1317)
+++ twinkle/trunk/debian/rules 2006-02-21 22:55:49 UTC (rev 1318)
@@ -10,11 +10,3 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-install/digikam::
- install -D -o root -g root -m 0644 debian/lintian $(CURDIR)/debian/digikam/usr/share/lintian/overrides/digikam
- mv $(CURDIR)/debian/digikam/usr/share/applnk/Graphics/digikam.desktop $(CURDIR)/debian/digikam/usr/share/applications/kde/
-
-install/digikam::
- mkdir -p $(CURDIR)/debian/twinkle/usr/share/applications/kde/
- mv $(CURDIR)/debian/twinkle.desktop $(CURDIR)/debian/twinkle/usr/share/applications/kde/
-
More information about the Pkg-voip-commits
mailing list