[Pkg-voip-commits] [twinkle] 14/73: Imported Debian patch 0.6.1-2
Peter Colberg
pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
pc-guest pushed a commit to branch master
in repository twinkle.
commit 807b0cb11799884be156c3360a64b13209a9d0a0
Author: Mark Purcell <msp at debian.org>
Date: Tue Feb 21 18:31:51 2006 +0000
Imported Debian patch 0.6.1-2
---
debian/changelog | 7 ++++
debian/patches/gui.cpp.diff | 11 +++++++
debian/patches/libgsm.diff | 79 +++++++++++++++++++++++++++++++++++++++++++++
debian/rules | 8 -----
4 files changed, 97 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2e9ef1f..cb73644 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
diff --git a/debian/patches/gui.cpp.diff b/debian/patches/gui.cpp.diff
new file mode 100644
index 0000000..0928478
--- /dev/null
+++ b/debian/patches/gui.cpp.diff
@@ -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";
diff --git a/debian/patches/libgsm.diff b/debian/patches/libgsm.diff
new file mode 100644
index 0000000..2bb5eb7
--- /dev/null
+++ b/debian/patches/libgsm.diff
@@ -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 =\
diff --git a/debian/rules b/debian/rules
index f971295..5185fd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,3 @@ include /usr/share/cdbs/1/class/autotools.mk
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/
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/twinkle.git
More information about the Pkg-voip-commits
mailing list