[Pkg-voip-commits] r3059 - in twinkle/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2007-01-25 22:41:00 +0100 (Thu, 25 Jan 2007)
New Revision: 3059

Removed:
   twinkle/trunk/debian/patches/extra-qualifications.patch
Modified:
   twinkle/trunk/debian/changelog
Log:
* delete debian/patches/extra-qualifications.patch included upstream

Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog	2007-01-25 21:35:04 UTC (rev 3058)
+++ twinkle/trunk/debian/changelog	2007-01-25 21:41:00 UTC (rev 3059)
@@ -4,8 +4,9 @@
     - binNMU required (Closes: #402509)
     - Via headers containing ipv6 addresses are dropped (Closes: #398849)
   * Update debian/rules URL location
+  * delete debian/patches/extra-qualifications.patch included upstream
 
- -- Mark Purcell <msp at debian.org>  Thu, 25 Jan 2007 21:33:25 +0000
+ -- Mark Purcell <msp at debian.org>  Thu, 25 Jan 2007 21:40:52 +0000
 
 twinkle (1:1.0~beta-1) unstable; urgency=low
 

Deleted: twinkle/trunk/debian/patches/extra-qualifications.patch
===================================================================
--- twinkle/trunk/debian/patches/extra-qualifications.patch	2007-01-25 21:35:04 UTC (rev 3058)
+++ twinkle/trunk/debian/patches/extra-qualifications.patch	2007-01-25 21:41:00 UTC (rev 3059)
@@ -1,24 +0,0 @@
-diff -Nur twinkle-1.0~beta/src/gui/gui.h twinkle-1.0~beta.new/src/gui/gui.h
---- twinkle-1.0~beta/src/gui/gui.h	2006-12-28 16:22:32.000000000 +0000
-+++ twinkle-1.0~beta.new/src/gui/gui.h	2007-01-08 20:44:44.000000000 +0000
-@@ -214,7 +214,7 @@
- 	void cb_retrieve_referrer(t_user *user_config, int line);
- 	
- 	// A consulation call for a call transfer is being setup.
--	void t_gui::cb_consultation_call_setup(t_user *user_config, int line);
-+	void cb_consultation_call_setup(t_user *user_config, int line);
- 	
- 	// STUN errors
- 	void cb_stun_failed(t_user *user_config, int err_code, const string &err_reason);
-diff -Nur twinkle-1.0~beta/src/line.h twinkle-1.0~beta.new/src/line.h
---- twinkle-1.0~beta/src/line.h	2006-12-27 09:33:52.000000000 +0000
-+++ twinkle-1.0~beta.new/src/line.h	2007-01-08 20:44:30.000000000 +0000
-@@ -254,7 +254,7 @@
- 	// permission. This response is received on the dialog that received
- 	// the REFER before.
- 	// The request (r) is the REFER request that was received.
--	void t_line::recvd_refer_permission(bool permission, t_request *r);
-+	void recvd_refer_permission(bool permission, t_request *r);
- 	
- 	void recvd_stun_resp(StunMessage *r, t_tuid tuid, t_tid tid);
-