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

[Mark Purcell]

Author: msp
Date: 2007-01-08 21:57:40 +0100 (Mon, 08 Jan 2007)
New Revision: 2980

Added:
   twinkle/trunk/debian/patches/extra-qualifications.patch
Modified:
   twinkle/trunk/debian/changelog
   twinkle/trunk/debian/watch
Log:
* Cleanup debian/watch
* Add extra-qualifications.patch to fix upstream g 4.1.1 build errors

Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog	2007-01-08 18:55:41 UTC (rev 2979)
+++ twinkle/trunk/debian/changelog	2007-01-08 20:57:40 UTC (rev 2980)
@@ -4,8 +4,10 @@
   * Needed for the preceeding package to get into etch
   * delete debian/patches dtmf, invite4xx and memman included upstream
   * debian/rules get-orig-source targets rewritten
+  * Cleanup debian/watch
+  * Add extra-qualifications.patch to fix upstream g 4.1.1 build errors
 
- -- Mark Purcell <msp at debian.org>  Sun,  7 Jan 2007 08:52:40 +0000
+ -- Mark Purcell <msp at debian.org>  Mon,  8 Jan 2007 20:57:22 +0000
 
 twinkle (1:0.9-6) testing-proposed-updates; urgency=medium
 

Added: twinkle/trunk/debian/patches/extra-qualifications.patch
===================================================================
--- twinkle/trunk/debian/patches/extra-qualifications.patch	2007-01-08 18:55:41 UTC (rev 2979)
+++ twinkle/trunk/debian/patches/extra-qualifications.patch	2007-01-08 20:57:40 UTC (rev 2980)
@@ -0,0 +1,24 @@
+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);
+ 

Modified: twinkle/trunk/debian/watch
===================================================================
--- twinkle/trunk/debian/watch	2007-01-08 18:55:41 UTC (rev 2979)
+++ twinkle/trunk/debian/watch	2007-01-08 20:57:40 UTC (rev 2980)
@@ -1,23 +1,8 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
 # See uscan(1) for format
 
 # Compulsory line, this is a version 3 file
 version=3
 
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php twinkle-(.*)\.tar\.gz
-http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-(.*)\.tar\.gz debian svn-upgrade
+opts=dversionmangle=s/~// \
+   http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-(.*)\.tar\.gz debian svn-upgrade
 
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/twinkle-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/twinkle-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to use Roland's hack for sourceforge based projects - YMMV!
-#http://people.debian.org/~lolando/sfdlr.php?project=twinkle twinkle-([\d.]*).tar.gz
-
-