[Pkg-voip-commits] [twinkle] 20/73: Imported Debian patch 1:0.8.1-1
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 38316bc18fa60b3c4e52535a2a204ce8b9b23510
Merge: ca52a32 7d148bc
Author: Mark Purcell <msp at debian.org>
Date: Thu Jul 20 19:33:00 2006 +0100
Imported Debian patch 1:0.8.1-1
ChangeLog | 19 +++
NEWS | 19 +++
configure | 283 +++++++++++++++++++++++++++++++++++++++++---
configure.in | 49 ++++++--
debian/changelog | 11 ++
debian/patches/libgsm.diff | 119 -------------------
debian/patches/libgsm.patch | 80 +++++++++++++
debian/rules | 4 +-
debian/sip.protocol | 12 --
debian/twinkle.desktop | 11 --
src/Makefile.am | 1 -
src/Makefile.in | 2 -
src/audio/Makefile.am | 2 +-
src/audio/Makefile.in | 2 +-
src/audio/audio_decoder.cpp | 8 +-
src/audio/audio_decoder.h | 8 +-
src/audio/audio_encoder.cpp | 8 +-
src/audio/audio_encoder.h | 8 +-
src/gui/Makefile | 4 +-
src/gui/address_finder.cpp | 16 ++-
src/gui/address_finder.h | 5 +
src/gui/gui.cpp | 6 +-
src/gui/twinkle.pro | 2 +-
src/gui/userprofileform.ui | 6 +-
src/twinkle_config.h.in | 5 +-
25 files changed, 499 insertions(+), 191 deletions(-)
diff --cc debian/changelog
index 54c9ef7,0000000..ee8479e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,183 -1,0 +1,194 @@@
++twinkle (1:0.8.1-1) unstable; urgency=low
++
++ [ Kilian Krause ]
++ * New upstream release. Ships without iLBC, therefore no need to repackage.
++
++ [ Mark Purcell ]
++ * Cleanup debian/patches/libgsm.patch
++ * Use upstream supplied sip.protocol & twinkle.desktop
++
++ -- Mark Purcell <msp at debian.org> Thu, 20 Jul 2006 19:33:00 +0100
++
+twinkle (0.8.dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * Remove non-free iLBC code from DFSG release
+
+ -- Mark Purcell <msp at debian.org> Sun, 2 Jul 2006 21:37:09 +0100
+
+twinkle (0.7.1-2) unstable; urgency=low
+
+ * Enable sip URIs: debian/sip.protocol
+ - Twinkle won't manage sip URI from Konqueror (Closes: #366975)
+
+ -- Mark Purcell <msp at debian.org> Fri, 12 May 2006 21:20:39 +0100
+
+twinkle (0.7.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 7 May 2006 23:00:03 +0100
+
+twinkle (0.7-1) unstable; urgency=low
+
+ * New upstream release
+ * Update debian/control. Fixes FTBFS on kfreebsd-amd64: unsatisfied
+ Build-Depends (Closes: #361483)
+ * Rebuild with updated libccrtp & libcommoncpp2
+ - Fixes: libccext2-1.3.so.1: cannot open shared object file (Closes: #362440)
+ * Installed debian/twinkle.desktop. Fixes: please install a .desktop
+ file (Closes: #358398)
+ * Add Build-Depends: libspeex-dev
+ * Modify debian/patches/libgsm.diff
+
+ -- Mark Purcell <msp at debian.org> Mon, 1 May 2006 12:21:03 +0100
+
+twinkle (0.6.2-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/patches/gui.cpp.diff removed as applied upstream
+
+ -- Mark Purcell <msp at debian.org> Sun, 26 Feb 2006 17:46:56 +0000
+
+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
+ * Add Build-Depends: libxpm-dev, libsndfile1-dev
+
+ -- Mark Purcell <msp at debian.org> Fri, 10 Feb 2006 10:32:07 +1100
+
+twinkle (0.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Don't ship upstream NEWS as it is a duplicate of upstream ChangeLog
+ * Remove usr/sbin from debian/dirs
+
+ -- Mark Purcell <msp at debian.org> Tue, 17 Jan 2006 16:53:16 +0000
+
+twinkle (0.4.2-1) unstable; urgency=low
+
+ * New upstream release
+ - Lines hang with "dialing" status (Closes: #340779)
+ - does not play ringtone (Closes: #340233)
+
+ -- Mark Purcell <msp at debian.org> Tue, 29 Nov 2005 20:47:21 +0000
+
+twinkle (0.4.1-3) unstable; urgency=low
+
+ * Rebuild against kdelibs 3.4.2 for unstable
+ - twinkle is not installable on sid (Closes: #340534)
+ * Suggests: kaddressbook
+
+ -- Mark Purcell <msp at debian.org> Thu, 24 Nov 2005 07:34:45 +0000
+
+twinkle (0.4.1-2) unstable; urgency=low
+
+ * Rebuild against kdelibs 3.4.2
+
+ -- Mark Purcell <msp at debian.org> Tue, 22 Nov 2005 20:16:05 +0000
+
+twinkle (0.4.1-1) unstable; urgency=low
+
+ * New upstream release
+ - FTBFS on 64 bit arches: cast from 'void*' to 'int' loses precision
+ (Closes: #324395)
+ - ftbfs [sparc] stun.cxx:680: error: 'gethrtime' was not declared in
+ this scope (Closes: #336746)
+ * Fix Build-Depends: FTBFS on GNU/kFreeBSD (Closes: #336859)
+ * Copyright audit to debian/copyright
+ * Use correct QTDIR=/usr/share/qt3, negates need for
+ DEB_AUTO_UPDATE_AUTOCONF
+ * Remove patch against configure.in
+
+ -- Mark Purcell <msp at debian.org> Sun, 20 Nov 2005 23:05:07 +0000
+
+twinkle (0.3.2-4) unstable; urgency=low
+
+ * Add Build-Depends: kdelibs4-dev kdelibs-bin, libasounds2-dev, libxml2-dev
+ - fix ppc build (Closes: #325057)
+ * Remove ppc-build patch, obsolete by upstream v 0.3
+
+ -- Mark Purcell <msp at debian.org> Sun, 30 Oct 2005 07:56:45 +0000
+
+twinkle (0.3.2-3) unstable; urgency=low
+
+ * Use DEB_AUTO_UPDATE_AUTOCONF to rebuild configure from patched
+ configure.in. Ugly..
+
+ -- Mark Purcell <msp at debian.org> Sat, 29 Oct 2005 22:54:12 +0100
+
+twinkle (0.3.2-2) unstable; urgency=low
+
+ * Add Build-Depends: cdbs
+
+ -- Mark Purcell <msp at debian.org> Sat, 29 Oct 2005 17:45:43 +0100
+
+twinkle (0.3.2-1) unstable; urgency=low
+
+ * New upstream release
+ - New upstream version available (Closes: #334615)
+ * FTBFS on 64 bit arches: cast from 'void*' to 'int' loses precision
+ (Closes: #324395)
+ * Patch from Guido Guenther
+ - fix ppc build (Closes: #325057)
+ * Patch from Mikael Magnusson
+ - Thread creation timing bug causes crashes (Closes: #329433)
+ * Fix: old-fsf-address-in-copyright-file
+
+ -- Mark Purcell <msp at debian.org> Sat, 29 Oct 2005 16:46:40 +0100
+
+twinkle (0.3-1) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * Debian VoIP upload
+
+ [ Mark Purcell ]
+ * New upstream release
+ * Switch to cdbs!
+
+ -- Mark Purcell <msp at debian.org> Thu, 13 Oct 2005 18:12:02 +0100
+
+twinkle (0.2.1-2) unstable; urgency=low
+
+ * Build-Depends: libxml2-dev
+
+ -- Mark Purcell <msp at debian.org> Sun, 21 Aug 2005 15:55:13 +0100
+
+twinkle (0.2.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Build-Depends: libccrtp-dev (>=1.3.4)
+ * Add Build-Depends: qt3-apps-dev
+ * Add Build-Depends: automake1.9
+ * Export QTDIR for build target as well :-(
+ * Update extended description
+
+ -- Mark Purcell <msp at debian.org> Sun, 21 Aug 2005 14:05:30 +0100
+
+twinkle (0.1-2) unstable; urgency=low
+
+ * C++ migration
+ * Build-Depends: libqt3-mt-dev (>= 3:3.3.4-4)
+
+ -- Mark Purcell <msp at debian.org> Thu, 18 Aug 2005 21:02:31 +0100
+
+twinkle (0.1-1) experimental; urgency=low
+
+ * Upload to experimental while c++ transition
+ * Initial release Closes: #311150
+
+ -- Mark Purcell <msp at debian.org> Thu, 11 Aug 2005 22:16:20 +0100
+
diff --cc debian/patches/libgsm.patch
index 0000000,0000000..192f218
new file mode 100644
--- /dev/null
+++ b/debian/patches/libgsm.patch
@@@ -1,0 -1,0 +1,80 @@@
++diff -Nur twinkle-0.8.1/configure.in twinkle-0.8.1.new/configure.in
++--- twinkle-0.8.1/configure.in 2006-07-19 21:53:07.000000000 +0100
+++++ twinkle-0.8.1.new/configure.in 2006-07-19 21:53:30.000000000 +0100
++@@ -135,6 +135,17 @@
++ AC_CHECK_LIB(sndfile, sf_open, [],
++ [AC_MSG_ERROR([libsndfile library is missing.])])
++
+++# Check if libgsm is available
+++AC_CHECK_LIB(gsm, sf_open, [
+++ AC_CHECK_HEADER(gsm.h, [],
+++ [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
+++ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
+++ LIBS="-lgsm $LIBS"
+++ echo "LIBS += -lgsm" >> $QT_INCL_PRO
+++ have_gsm="yes" ], [
+++ have_gsm="no"
+++ echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
+++
++ # Check if ALSA is available
++ AC_CHECK_LIB(asound, main, [
++ AC_CHECK_HEADER(alsa/asoundlib.h, [],
++diff -Nur twinkle-0.8.1/src/Makefile.am twinkle-0.8.1.new/src/Makefile.am
++--- twinkle-0.8.1/src/Makefile.am 2006-07-19 21:53:07.000000000 +0100
+++++ twinkle-0.8.1.new/src/Makefile.am 2006-07-19 21:53:45.000000000 +0100
++@@ -16,10 +16,10 @@
++ $(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)\
+++ $(LIBS)\
++ -lresolv\
++ -lsndfile\
++ -lboost_regex
++diff -Nur twinkle-0.8.1/src/audio/audio_decoder.h twinkle-0.8.1.new/src/audio/audio_decoder.h
++--- twinkle-0.8.1/src/audio/audio_decoder.h 2006-07-19 21:53:08.000000000 +0100
+++++ twinkle-0.8.1.new/src/audio/audio_decoder.h 2006-07-19 21:53:30.000000000 +0100
++@@ -25,7 +25,12 @@
++ #include "twinkle_config.h"
++ #include "audio_codecs.h"
++ #include "user.h"
+++
+++#ifdef HAVE_GSM
+++#include <gsm.h>
+++#else
++ #include "gsm/inc/gsm.h"
+++#endif
++
++ #ifdef HAVE_SPEEX
++ #include <speex/speex.h>
++diff -Nur twinkle-0.8.1/src/audio/audio_encoder.h twinkle-0.8.1.new/src/audio/audio_encoder.h
++--- twinkle-0.8.1/src/audio/audio_encoder.h 2006-07-19 21:53:08.000000000 +0100
+++++ twinkle-0.8.1.new/src/audio/audio_encoder.h 2006-07-19 21:53:30.000000000 +0100
++@@ -25,7 +25,12 @@
++ #include "twinkle_config.h"
++ #include "audio_codecs.h"
++ #include "user.h"
+++
+++#ifdef HAVE_GSM
+++#include <gsm.h>
+++#else
++ #include "gsm/inc/gsm.h"
+++#endif
++
++ #ifdef HAVE_SPEEX
++ #include <speex/speex.h>
++diff -Nur twinkle-0.8.1/src/gui/twinkle.pro twinkle-0.8.1.new/src/gui/twinkle.pro
++--- twinkle-0.8.1/src/gui/twinkle.pro 2006-07-19 21:53:08.000000000 +0100
+++++ twinkle-0.8.1.new/src/gui/twinkle.pro 2006-07-19 21:53:30.000000000 +0100
++@@ -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 -lboost_regex
+++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 -lboost_regex
++
++ DEFINES += QT_NO_STL
++
diff --cc debian/rules
index e0ee8bf,0000000..0210a70
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,36 -1,0 +1,36 @@@
+#!/usr/bin/make -f
+# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
+# This file is public domain.
+
+# Add here any variable or target overrides you need
+
+
+export QTDIR=/usr/share/qt3
+
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+ | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+
+FILENAME := twinkle_$(UPVERSION).orig.tar.gz
+URL := http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-$(UPVERSION).tar.gz
+
+-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
+
+DEB_CONFIGURE_EXTRA_FLAGS := --without-ilbc
+
+install/twinkle::
- cp debian/twinkle.desktop $(CURDIR)/debian/twinkle/usr/share/applications
- cp debian/sip.protocol $(CURDIR)/debian/twinkle/usr/share/services
++ cp twinkle.desktop $(CURDIR)/debian/twinkle/usr/share/applications
++ cp sip.protocol $(CURDIR)/debian/twinkle/usr/share/services
+
+print-version:
+ @@echo "Debian version: $(DEBVERSION)"
+ @@echo "Upstream version: $(UPVERSION)"
+
+get-orig-source:
+ @@dh_testdir
+ @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+ @@echo Downloading $(FILENAME) from $(URL) ...
+ @@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+
--
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