[Pkg-voip-commits] r1223 - in kphone/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Fri Feb 3 22:27:26 UTC 2006
Author: msp
Date: 2006-02-03 22:27:25 +0000 (Fri, 03 Feb 2006)
New Revision: 1223
Added:
kphone/trunk/debian/patches/bug_309638_message_2.mbox
Removed:
kphone/trunk/debian/patches/00list
Modified:
kphone/trunk/debian/changelog
kphone/trunk/debian/control
kphone/trunk/debian/patches/01_debian-patch.dpatch
kphone/trunk/debian/patches/01_index.html.dpatch
kphone/trunk/debian/patches/02_dspoutoss.cpp.dpatch
kphone/trunk/debian/rules
Log:
* KPhone: crash after doubleclick (Closes: #309638)
* Switch to cdbs
Modified: kphone/trunk/debian/changelog
===================================================================
--- kphone/trunk/debian/changelog 2006-02-03 21:57:19 UTC (rev 1222)
+++ kphone/trunk/debian/changelog 2006-02-03 22:27:25 UTC (rev 1223)
@@ -1,8 +1,10 @@
kphone (1:4.2-5) unstable; urgency=low
* Makefile should not strip binaries [patch] (Closes: #322451)
+ * KPhone: crash after doubleclick (Closes: #309638)
+ * Switch to cdbs
- -- Mark Purcell <msp at debian.org> Sat, 4 Feb 2006 08:46:03 +1100
+ -- Mark Purcell <msp at debian.org> Sat, 4 Feb 2006 09:25:47 +1100
kphone (1:4.2-4) unstable; urgency=low
Modified: kphone/trunk/debian/control
===================================================================
--- kphone/trunk/debian/control 2006-02-03 21:57:19 UTC (rev 1222)
+++ kphone/trunk/debian/control 2006-02-03 22:27:25 UTC (rev 1223)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libssl-dev, autotools-dev, dpatch, libqt3-mt-dev (>= 3:3.3.4-4), libasound2-dev
+Build-Depends: debhelper (>> 4.0.0), libssl-dev, autotools-dev, dpatch, libqt3-mt-dev (>= 3:3.3.4-4), libasound2-dev, cdbs
Standards-Version: 3.5.8
Package: kphone
Deleted: kphone/trunk/debian/patches/00list
===================================================================
--- kphone/trunk/debian/patches/00list 2006-02-03 21:57:19 UTC (rev 1222)
+++ kphone/trunk/debian/patches/00list 2006-02-03 22:27:25 UTC (rev 1223)
@@ -1,2 +0,0 @@
-01_debian-patch
-Makefile-nostrip.diff
Modified: kphone/trunk/debian/patches/01_debian-patch.dpatch
===================================================================
--- kphone/trunk/debian/patches/01_debian-patch.dpatch 2006-02-03 21:57:19 UTC (rev 1222)
+++ kphone/trunk/debian/patches/01_debian-patch.dpatch 2006-02-03 22:27:25 UTC (rev 1223)
@@ -1,11 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_debian-patch.dpatch by <msp at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from kphone 4.1.0-2 diff.gz
-
- at DPATCH@
-
--- kphone-4.1.0.orig/kphone/dspoutoss.cpp
+++ kphone-4.1.0/kphone/dspoutoss.cpp
@@ -110,6 +110,11 @@
Modified: kphone/trunk/debian/patches/01_index.html.dpatch
===================================================================
--- kphone/trunk/debian/patches/01_index.html.dpatch 2006-02-03 21:57:19 UTC (rev 1222)
+++ kphone/trunk/debian/patches/01_index.html.dpatch 2006-02-03 22:27:25 UTC (rev 1223)
@@ -1,26 +1,3 @@
-#! /bin/sh -e
-## 01_index.html.dpatch by Mark <msp at debian.org>
-##
-## DP: Add missing index.html documentation
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
- at DPATCH@
diff -urN kphone_orig/index.html kphone-4.0.3.deb/index.html
--- kphone_orig/index.html 1970-01-01 01:00:00.000000000 +0100
+++ kphone-4.0.3.deb/index.html 2004-07-17 18:55:59.000000000 +0200
Modified: kphone/trunk/debian/patches/02_dspoutoss.cpp.dpatch
===================================================================
--- kphone/trunk/debian/patches/02_dspoutoss.cpp.dpatch 2006-02-03 21:57:19 UTC (rev 1222)
+++ kphone/trunk/debian/patches/02_dspoutoss.cpp.dpatch 2006-02-03 22:27:25 UTC (rev 1223)
@@ -1,26 +1,3 @@
-#! /bin/sh -e
-## 02_dspoutoss.cpp.dpatch by Mark <msp at debian.org>
-##
-## DP: Add rounding warning.
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
- at DPATCH@
diff -urN kphone_orig/kphone/dspoutoss.cpp kphone-4.0.3.deb/kphone/dspoutoss.cpp
--- kphone_orig/kphone/dspoutoss.cpp 2004-03-29 16:59:45.000000000 +0200
+++ kphone-4.0.3.deb/kphone/dspoutoss.cpp 2004-07-17 18:55:59.000000000 +0200
Added: kphone/trunk/debian/patches/bug_309638_message_2.mbox
===================================================================
--- kphone/trunk/debian/patches/bug_309638_message_2.mbox 2006-02-03 21:57:19 UTC (rev 1222)
+++ kphone/trunk/debian/patches/bug_309638_message_2.mbox 2006-02-03 22:27:25 UTC (rev 1223)
@@ -0,0 +1,114 @@
+From unknown Fri Feb 03 21:56:26 2006
+X-Loop: owner at bugs.debian.org
+Subject: Bug#309638: KPhone: crash after doubleclick
+Reply-To: "D. Winkler" <winkler at eios.de>, 309638 at bugs.debian.org
+Resent-From: "D. Winkler" <winkler at eios.de>
+Resent-To: debian-bugs-dist at lists.debian.org
+Resent-CC: Mark Purcell <msp at debian.org>
+Resent-Date: Wed, 18 May 2005 13:48:03 UTC
+Resent-Message-ID: <handler.309638.B.11164235562789 at bugs.debian.org>
+Resent-Sender: owner at bugs.debian.org
+X-Debian-PR-Message: report 309638
+X-Debian-PR-Package: kphone
+X-Debian-PR-Keywords:
+Received: via spool by submit at bugs.debian.org id=B.11164235562789
+ (code B ref -1); Wed, 18 May 2005 13:48:03 UTC
+Received: (at submit) by bugs.debian.org; 18 May 2005 13:39:16 +0000
+Received: from eios.de (m24s17.vlinux.de) [83.151.29.243]
+ by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
+ id 1DYOlY-0000eL-00; Wed, 18 May 2005 06:39:16 -0700
+Received: from alpha.castle.home (p54AC22ED.dip0.t-ipconnect.de [84.172.34.237])
+ (using SSLv3 with cipher RC4-MD5 (128/128 bits))
+ (No client certificate requested)
+ by m24s17.vlinux.de (Postfix) with ESMTP id 2525423469
+ for <submit at bugs.debian.org>; Wed, 18 May 2005 13:39:11 +0000 (UTC)
+From: "D. Winkler" <winkler at eios.de>
+To: submit at bugs.debian.org
+Content-Type: text/plain
+Date: Wed, 18 May 2005 15:38:46 +0200
+Message-Id: <1116423526.3020.4.camel at alpha>
+Mime-Version: 1.0
+X-Mailer: Evolution 2.2.2
+Content-Transfer-Encoding: 7bit
+Delivered-To: submit at bugs.debian.org
+X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
+ (1.212-2003-09-23-exp) on spohr.debian.org
+X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
+ autolearn=no version=2.60-bugs.debian.org_2005_01_02
+X-Spam-Level:
+
+Package: kphone
+Version: 1:4.1.1-1
+Severity: normal
+
+KPhone crashes when I doubleclick on an entry in the contact list
+immediately after the program start.
+
+The following fix did it for me, but I don't know if it causes problems
+somewhere else...
+
+
+
+diff -c -p -r1.1.1.1 kphoneview.cpp
+*** kphone/kphoneview.cpp 18 Apr 2005 13:04:40 -0000 1.1.1.1
+--- kphone/kphoneview.cpp 12 May 2005 13:37:47 -0000
+*************** void KPhoneView::contactDoubleClicked( Q
+*** 389,394 ****
+--- 389,397 ----
+ QString subject = ( (ContactsListViewItem *)
+i )->getCall()->getSubject();
+ SipCall *newcall = new SipCall( user, QString::null,
+SipCall::StandardCall );
+ newcall->setSubject( user->getUri().uri() );
++ callAudio = new CallAudio( this );
++ callAudio->readAudioSettings();
++ callAudio->readVideoSettings();
+ KCallWidget *widget = new KCallWidget( sipauthentication,
+callAudio, newcall, this );
+ cwList.append( widget );
+ connect( widget, SIGNAL( redirectCall( const SipUri &, const
+QString & ) ),
+
+
+(line numbers may slightly differ)
+
+-- System Information:
+Debian Release: 3.1
+ APT prefers unstable
+ APT policy: (500, 'unstable'), (500, 'testing')
+Architecture: i386 (i686)
+Kernel: Linux 2.6.11.7
+Locale: LANG=de_DE at euro, LC_CTYPE=de_DE at euro (charmap=ISO-8859-15)
+
+Versions of packages kphone depends on:
+ii libasound2 1.0.8-3 ALSA library
+ii libc6 2.3.2.ds1-22 GNU C Library: Shared
+libraries an
+ii libgcc1 1:3.4.3-13 GCC support library
+ii libice6 4.3.0.dfsg.1-12.0.1 Inter-Client Exchange
+library
+ii libjack0.80.0-0 0.99.0-6 JACK Audio Connection Kit
+(librari
+ii libpng12-0 1.2.8rel-1 PNG library - runtime
+ii libqt3c102-mt 3:3.3.4-3 Qt GUI Library (Threaded
+runtime v
+ii libsm6 4.3.0.dfsg.1-12.0.1 X Window System Session
+Management
+ii libssl0.9.7 0.9.7e-3 SSL shared libraries
+ii libstdc++5 1:3.3.6-4 The GNU Standard C++
+Library v3
+ii libx11-6 4.3.0.dfsg.1-12.0.1 X Window System protocol
+client li
+ii libxext6 4.3.0.dfsg.1-12.0.1 X Window System
+miscellaneous exte
+ii libxt6 4.3.0.dfsg.1-12.0.1 X Toolkit Intrinsics
+ii xlibs 4.3.0.dfsg.1-12 X Keyboard Extension (XKB)
+configu
+
+-- no debconf information
+
+
+
+
+
+
Modified: kphone/trunk/debian/rules
===================================================================
--- kphone/trunk/debian/rules 2006-02-03 21:57:19 UTC (rev 1222)
+++ kphone/trunk/debian/rules 2006-02-03 22:27:25 UTC (rev 1223)
@@ -1,103 +1,11 @@
#!/usr/bin/make -f
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Modified for kphone by Mark Purcell <msp at debian.org>
+# 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
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=4
-
-# This is all that is needed to build KDE packages, seems simpler than
-# the admin/debiandirs approach
-export kde_htmldir="\$${prefix}/share/doc/kde/HTML"
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-include /usr/share/dpatch/dpatch.make
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --with-qt-dir=/usr/share/qt3 \
- --enable-mt --disable-rpath
-
-
-build: patch build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #/usr/bin/docbook-to-man debian/kphone.sgml > kphone.1
- #/usr/bin/help2man -N -h -help-all -n 'kphone - KDE IP Phone' -S 'Debian GNU/Linux' kphone/kphone -o kphone.1
-
- touch build-stamp
-
-clean: clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
- rm -f config.h config.cache config.status config.log
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/kphone.
- $(MAKE) install prefix=$(CURDIR)/debian/kphone/usr
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
-# dh_installman kphone.1
- dh_installmenu
- dh_installchangelogs CHANGES
- dh_link
- dh_strip
- dh_compress --exclude=.pdf
- dh_fixperms
- dh_installdeb
- dh_makeshlibs
- dh_shlibdeps -L kphone -l debian/kphone/usr/lib
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+export QTDIR=/usr/share/qt3
+
+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
More information about the Pkg-voip-commits
mailing list