[Pkg-voip-commits] [twinkle] 05/73: Imported Debian patch 0.3.2-1

Peter Colberg pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:44 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 47e04e26bd6481dd84a145a55fc242ed53ab8f34
Merge: a47d4d0 c2b73bb
Author: Mark Purcell <msp at debian.org>
Date:   Sat Oct 29 16:46:40 2005 +0100

    Imported Debian patch 0.3.2-1

 AUTHORS                                     |     3 +
 ChangeLog                                   |   169 +-
 Makefile.in                                 |   115 +-
 NEWS                                        |    48 +-
 README                                      |     7 +-
 acinclude.m4                                |  5664 ++++++++++++
 aclocal.m4                                  |     1 +
 configure                                   | 12082 +++++++++++++++++++++++++-
 configure.in                                |    43 +-
 debian/changelog                            |    25 +
 debian/control                              |    13 +-
 debian/copyright                            |     4 +-
 debian/patches/configure.in.patch           |    11 +
 debian/patches/ppc-build.patch              |   115 +
 debian/patches/twinkle_thread_timings.patch |    88 +
 debian/rules                                |   121 +-
 src/Makefile.am                             |     2 +-
 src/Makefile.in                             |   119 +-
 src/audio/Makefile.am                       |     6 +-
 src/audio/Makefile.in                       |   134 +-
 src/audio/audio_device.cpp                  |   756 ++
 src/audio/audio_device.h                    |   109 +
 src/audio/audio_rx.cpp                      |   115 +-
 src/audio/audio_rx.h                        |    11 +-
 src/audio/audio_session.cpp                 |   356 +-
 src/audio/audio_session.h                   |    14 +-
 src/audio/audio_tx.cpp                      |    71 +-
 src/audio/audio_tx.h                        |    11 +-
 src/audio/gsm/Makefile.in                   |   115 +-
 src/audio/tone_gen.cpp                      |   113 +-
 src/audio/tone_gen.h                        |    22 +-
 src/audio/twinkle_rtp_session.cpp           |    33 +
 src/audio/twinkle_rtp_session.h             |    17 +
 src/audits/Makefile.in                      |   115 +-
 src/audits/memman.cpp                       |     8 +-
 src/dialog.cpp                              |    44 +-
 src/dialog.h                                |    12 +-
 src/gui/Makefile                            |    15 +-
 src/gui/gui.cpp                             |    23 +-
 src/gui/images/exit.png                     |   Bin 0 -> 777 bytes
 src/gui/images/twinkle24.png                |   Bin 0 -> 1254 bytes
 src/gui/main.cpp                            |    69 +-
 src/gui/mphoneform.ui                       |    13 +-
 src/gui/mphoneform.ui.h                     |    42 +-
 src/gui/selectprofileform.ui                |     1 +
 src/gui/selectprofileform.ui.h              |    13 +-
 src/gui/syssettingsform.ui                  |   147 +-
 src/gui/syssettingsform.ui.h                |    72 +-
 src/gui/twinkle.pro                         |     4 +-
 src/gui/userprofileform.ui                  |   425 +-
 src/gui/userprofileform.ui.h                |     2 +
 src/listener.cpp                            |    37 +-
 src/parser/Makefile.in                      |   115 +-
 src/parser/parser.cxx                       |   457 +-
 src/parser/parser.yxx                       |    65 +-
 src/parser/request.cpp                      |     3 +-
 src/parser/response.cpp                     |     9 +
 src/phone.cpp                               |    46 +-
 src/phone.h                                 |     1 +
 src/sdp/Makefile.am                         |     4 +-
 src/sdp/Makefile.in                         |   119 +-
 src/sdp/sdp_parser.cxx                      |    23 +-
 src/sdp/sdp_parser.yxx                      |     3 +
 src/sender.cpp                              |     3 +-
 src/sockets/Makefile.in                     |   115 +-
 src/sockets/socket.cpp                      |     3 +
 src/sockets/url.cpp                         |     8 +-
 src/stun/Makefile.in                        |   115 +-
 src/stun/stun.cxx                           |     6 +-
 src/stun/stun_transaction.cpp               |    38 +-
 src/sys_settings.cpp                        |   228 +-
 src/sys_settings.h                          |    42 +-
 src/threads/Makefile.in                     |   115 +-
 src/transaction.cpp                         |    16 +-
 src/twinkle_config.h.in                     |   218 +
 src/user.cpp                                |     6 +
 src/user.h                                  |    10 +
 src/util.cpp                                |     7 +
 src/util.h                                  |     3 +
 twinkle.spec.in                             |    18 +-
 80 files changed, 21722 insertions(+), 1629 deletions(-)

diff --cc debian/changelog
index e4ff858,0000000..9a0f6f6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,0 +1,56 @@@
++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/control
index 5c00a36,0000000..1836fab
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,41 -1,0 +1,42 @@@
 +Source: twinkle
 +Section: comm
 +Priority: optional
- Maintainer: Mark Purcell <msp at debian.org>
++Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
++Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
 +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libcommoncpp2-dev (>=1.3.10-4), libccrtp-dev (>=1.3.4), help2man, libqt3-mt-dev (>= 3:3.3.4-4), qt3-apps-dev, automake1.9, libxml2-dev
 +Standards-Version: 3.6.1
 +
 +Package: twinkle
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Description: Voice over Internet Protocol (VoIP) SIP Phone
 + Softphone for making telephone calls using SIP over an IP network.
 + .
 + Twinkle supports direct IP phone to IP phone communication or a network
 + using a SIP proxy to route your calls.
 + .
 + In addition to making basic voice calls Twinkle provides you the
 + following features regardless of the services that your VoIP service
 + provider might offer. 
 + .
 +  2 call appearances (lines)
 +  Call Waiting
 +  Call Hold
 +  3-way conference calling
 +  Mute
 +  Call redirection on demand
 +  Call redirection unconditional
 +  Call redirection when busy
 +  Call redirection no answer
 +  Reject call redirection request
-   Blind call transfer (new)
-   Reject call transfer request (new)
++  Blind call transfer
++  Reject call transfer request
 +  Call reject
 +  Do not disturb
-   Auto answer (new)
++  Auto answer 
 +  Send DTMF digits (RFC 2833) to navigate IVR systems
-   STUN support for NAT traversal (new)
-   Send NAT keep alive packets when using STUN (new)
++  STUN support for NAT traversal
++  Send NAT keep alive packets when using STUN
 +  NAT traversal through static provisioning
 + .
 + Website: http://www.twinklephone.com
diff --cc debian/copyright
index cd8437e,0000000..338d9c7
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,80 -1,0 +1,80 @@@
 +This package was debianized by Mark Purcell <msp at debian.org> on
 +Sun, 29 May 2005 09:40:22 +0100.
 +
 +It was downloaded from http://www.twinklephone.com/
 +
 +Copyright Holder: 
 + 
 +Author of Twinkle.
 +
 +Michel de Boer <michel at twinklephone.com> designed and implemented Twinkle.
 +
 +Twinkle contains the following 3rd party software packages:
 +- GSM codec from Jutta Degener and Carsten Bormann
 +Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
 +Technische Universitaet Berlin
 +
 +Any use of this software is permitted provided that this notice is not
 +removed and that neither the authors nor the Technische Universitaet Berlin
 +are deemed to have made any representations as to the suitability of this
 +software for any purpose nor are held responsible for any defects of
 +this software.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
 +
 +As a matter of courtesy, the authors request to be informed about uses
 +this software has found, about bugs in this software, and about any
 +improvements that may be of general interest.
 +
 +Berlin, 28.11.1994
 +Jutta Degener
 +Carsten Bormann
 +
 +- G.711 codec from Sun Microsystems
 +The files in this directory comprise ANSI-C language reference implementations
 +of the CCITT (International Telegraph and Telephone Consultative Committee)
 +G.711, G.721 and G.723 voice compressions.  They have been tested on Sun
 +SPARCstations and passed 82 out of 84 test vectors published by CCITT
 +(Dec. 20, 1988) for G.721 and G.723.  [The two remaining test vectors,
 +which the G.721 decoder implementation for u-law samples did not pass,
 +may be in error because they are identical to two other vectors for G.723_40.]
 +
 +This source code is released by Sun Microsystems, Inc. to the public domain.
 +Please give your acknowledgement in product literature if this code is used
 +in your product implementation.
 +
 +License:
 +
 +   This package is free software; you can redistribute it and/or modify
 +   it under the terms of the GNU General Public License as published by
 +   the Free Software Foundation; either version 2 of the License, or
 +   (at your option) any later version.
 +
 +   This package is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +   GNU General Public License for more details.
 +
 +   You should have received a copy of the GNU General Public License
 +   along with this package; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-    02111-1307, USA.
++   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++   MA 02110-1301, USA.
 +
 +On Debian systems, the complete text of the GNU General
 +Public License can be found in `/usr/share/common-licenses/GPL'.
 +
 +
 +Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
 +Technische Universitaet Berlin
 +
 +Any use of this software is permitted provided that this notice is not
 +removed and that neither the authors nor the Technische Universitaet Berlin
 +are deemed to have made any representations as to the suitability of this
 +software for any purpose nor are held responsible for any defects of
 +this software.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
 +
 +As a matter of courtesy, the authors request to be informed about uses
 +this software has found, about bugs in this software, and about any
 +improvements that may be of general interest.
 +
 +Berlin, 28.11.1994
 +Jutta Degener
 +Carsten Bormann
diff --cc debian/patches/configure.in.patch
index 0000000,0000000..da4c33b
new file mode 100644
--- /dev/null
+++ b/debian/patches/configure.in.patch
@@@ -1,0 -1,0 +1,11 @@@
++--- configure.in.orig	2005-10-29 15:15:22.000000000 +0100
+++++ configure.in	2005-10-29 15:04:32.000000000 +0100
++@@ -92,7 +92,7 @@
++ 	echo "LIBS += -lasound" >> $QT_INCL_PRO
++ 	])
++ 
++-$QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
+++/usr/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
++ echo "distdir:" >> src/gui/Makefile
++ 
++ # Strip the -O2 flag from CXXFLAGS for building the SIP parser.
diff --cc debian/patches/ppc-build.patch
index 0000000,0000000..b22db6b
new file mode 100644
--- /dev/null
+++ b/debian/patches/ppc-build.patch
@@@ -1,0 -1,0 +1,115 @@@
++From agx at sigxcpu.org Thu Aug 25 20:51:21 2005
++Return-path: <debbugs at bugs.debian.org>
++Envelope-to: debian at purcell.id.au
++Delivery-date: Thu, 25 Aug 2005 21:39:04 +0100
++Received: from spohr.debian.org ([140.211.166.43] ident=mail)
++	by bristol.purcell.id.au with esmtp (Exim 4.52)
++	id 1E8OUV-0003nS-49
++	for debian at purcell.id.au; Thu, 25 Aug 2005 21:39:01 +0100
++Received: from debbugs by spohr.debian.org with local (Exim 3.36 1 (Debian))
++	id 1E8OPH-00058X-00; Thu, 25 Aug 2005 13:33:03 -0700
++X-Loop: owner at bugs.debian.org
++Reply-To: Guido Guenther <agx at sigxcpu.org>,
++ 325057 at bugs.debian.org
++Resent-From: Guido Guenther <agx at sigxcpu.org>
++Resent-To: debian-bugs-dist at lists.debian.org
++Resent-CC: Mark Purcell <msp at debian.org>
++Resent-Date: Thu, 25 Aug 2005 20:33:02 UTC
++Resent-Message-ID: <handler.325057.B.1125000999855 at bugs.debian.org>
++X-Debian-PR-Message: report 325057
++X-Debian-PR-Package: twinkle
++X-Debian-PR-Keywords: patch
++Received: via spool by submit at bugs.debian.org id=B.1125000999855
++          (code B ref -1); Thu, 25 Aug 2005 20:33:02 UTC
++Received: (at submit) by bugs.debian.org; 25 Aug 2005 20:16:39 +0000
++Received: from honk1.physik.uni-konstanz.de [134.34.140.224] 
++	by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
++	id 1E8O9P-0000De-00; Thu, 25 Aug 2005 13:16:39 -0700
++Received: from localhost (localhost.localnet [127.0.0.1])
++	by honk1.physik.uni-konstanz.de (Postfix) with ESMTP id F005C2BBE3;
++	Thu, 25 Aug 2005 22:16:36 +0200 (CEST)
++Received: from honk1.physik.uni-konstanz.de ([127.0.0.1])
++	by localhost (honk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
++	id 24613-13; Thu, 25 Aug 2005 22:16:32 +0200 (CEST)
++Received: from bogon.sigxcpu.org (xdsl-213-168-120-51.netcologne.de [213.168.120.51])
++	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
++	(No client certificate requested)
++	by honk1.physik.uni-konstanz.de (Postfix) with ESMTP id DB9C42BBE2;
++	Thu, 25 Aug 2005 22:16:31 +0200 (CEST)
++Received: by bogon.sigxcpu.org (Postfix, from userid 1000)
++	id D08C811E5F8; Thu, 25 Aug 2005 21:51:22 +0200 (CEST)
++Date: Thu, 25 Aug 2005 21:51:21 +0200
++From: Guido Guenther <agx at sigxcpu.org>
++To: Debian Bug Tracking System <submit at bugs.debian.org>
++Message-ID: <20050825195121.GA27379 at bogon.ms20.nix>
++Mime-Version: 1.0
++Content-Type: text/plain;
++  charset=us-ascii
++Content-Disposition: inline
++X-Reportbug-Version: 3.16
++User-Agent: Mutt/1.5.10i
++X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at honk.physik.uni-konstanz.de
++Delivered-To: submit at bugs.debian.org
++Resent-Sender: Debian BTS <debbugs at bugs.debian.org>
++X-SA-Exim-Connect-IP: 140.211.166.43
++X-SA-Exim-Rcpt-To: debian at purcell.id.au
++X-SA-Exim-Mail-From: debbugs at bugs.debian.org
++Subject: Bug#325057: twinkle: fix ppc build
++X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on debian
++X-Spam-Level: 
++X-Spam-Status: No, score=-2.6 required=0.0 tests=BAYES_00 autolearn=ham 
++	version=3.0.4
++X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100)
++X-SA-Exim-Scanned: Yes (on bristol.purcell.id.au)
++X-Length: 4477
++X-KMail-EncryptionState:  
++X-KMail-SignatureState:  
++X-KMail-MDN-Sent:  
++Status: RO
++Content-Length: 1185
++X-UID: 72
++X-Keywords:                                                                                                    
++X-Status: OC
++
++Package: twinkle
++Version: fix build on 32 bit arches
++Severity: wishlist
++Tags: patch
++
++Hi,
++this patch fixes the ppc build...
++
++--- tmp/twinkle-0.2.1/src/stun/stun.cxx	2005-07-28 22:46:57.000000000 +0200
+++++ twinkle-0.2.1/src/stun/stun.cxx	2005-08-25 21:42:52.000000000 +0200
++@@ -676,10 +676,14 @@
++       asm("rdtsc" : "=A" (tick));
++ #elif defined (__SUNPRO_CC) || defined( __sparc__ )	
++       tick = gethrtime();
++-#elif defined(__MACH__) 
+++#elif defined(__MACH__)
++       int fd=open("/dev/random",O_RDONLY);
++       read(fd,&tick,sizeof(tick));
++       closesocket(fd);
+++#elif defined (__linux__)
+++      int fd=open("/dev/urandom",O_RDONLY);
+++      read(fd,&tick,sizeof(tick));
+++      close(fd);
++ #else
++ #     error Need some way to seed the random number generator 
++ #endif 
++
++...it should also fix the build for other 32bit linux architectures.
++Please enable these for future builds.
++Cheers,
++ -- Guido
++
++-- System Information:
++Debian Release: testing/unstable
++  APT prefers unstable
++  APT policy: (500, 'unstable'), (500, 'stable')
++Architecture: powerpc (ppc)
++Shell:  /bin/sh linked to /bin/bash
++Kernel: Linux 2.6.13-rc3-agx0
++Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
++
++
diff --cc debian/patches/twinkle_thread_timings.patch
index 0000000,0000000..c2d7f37
new file mode 100644
--- /dev/null
+++ b/debian/patches/twinkle_thread_timings.patch
@@@ -1,0 -1,0 +1,88 @@@
++only in patch2:
++unchanged:
++--- twinkle-0.2.1.orig/src/audio/audio_session.cpp
+++++ twinkle-0.2.1/src/audio/audio_session.cpp
++@@ -672,11 +672,13 @@
++ 
++ 	if (audio_rx) {
++ 		try {
+++			audio_rx->set_running(true);
++ 			thr_audio_rx = new t_thread(main_audio_rx, NULL);
++ 			MEMMAN_NEW(thr_audio_rx);
++ 			// thr_audio_rx->set_sched_fifo(90);
++ 			thr_audio_rx->detach();
++ 		} catch (int) {
+++			audio_rx->set_running(false);
++ 			string msg("Failed to create audio_rx thread.");
++ 			log_file->write_report(msg, "t_audio_session::run",
++ 				LOG_NORMAL, LOG_CRITICAL);
++@@ -688,11 +690,13 @@
++ 
++ 	if (audio_tx) {
++ 		try {
+++			audio_tx->set_running(true);
++ 			thr_audio_tx = new t_thread(main_audio_tx, NULL);
++ 			MEMMAN_NEW(thr_audio_tx);
++ 			// thr_audio_tx->set_sched_fifo(90);
++ 			thr_audio_tx->detach();
++ 		} catch (int) {
+++			audio_tx->set_running(false);
++ 			string msg("Failed to create audio_tx thread.");
++ 			log_file->write_report(msg, "t_audio_session::run",
++ 				LOG_NORMAL, LOG_CRITICAL);
++only in patch2:
++unchanged:
++--- twinkle-0.2.1.orig/src/audio/audio_rx.cpp
+++++ twinkle-0.2.1/src/audio/audio_rx.cpp
++@@ -397,6 +397,10 @@
++ 	}
++ }
++ 
+++void t_audio_rx::set_running(bool _is_running) {
+++	is_running = _is_running;
+++}
+++
++ void t_audio_rx::run(void) {
++ 	int status;
++ 	audio_buf_info dsp_info;
++only in patch2:
++unchanged:
++--- twinkle-0.2.1.orig/src/audio/audio_rx.h
+++++ twinkle-0.2.1/src/audio/audio_rx.h
++@@ -156,6 +156,8 @@
++ 
++ 	~t_audio_rx();
++ 
+++	void set_running(bool is_running);
+++
++ 	void run(void);
++ 
++ 	// Set the dynamic payload type for telephone events
++only in patch2:
++unchanged:
++--- twinkle-0.2.1.orig/src/audio/audio_tx.h
+++++ twinkle-0.2.1/src/audio/audio_tx.h
++@@ -148,6 +148,8 @@
++ 
++ 	~t_audio_tx();
++ 
+++	void set_running(bool is_running);
+++
++ 	void run(void);
++ 	
++ 	// Set the dynamic payload type for telephone events
++only in patch2:
++unchanged:
++--- twinkle-0.2.1.orig/src/audio/audio_tx.cpp
+++++ twinkle-0.2.1/src/audio/audio_tx.cpp
++@@ -330,6 +330,10 @@
++ 	}
++ }
++ 
+++void t_audio_tx::set_running(bool _is_running) {
+++	is_running = _is_running;
+++}
+++
++ void t_audio_tx::run(void) {
++ 	const AppDataUnit* adu;
++ 	struct timespec sleeptimer;
diff --cc debian/rules
index 306c31d,0000000..938a31c
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,112 -1,0 +1,11 @@@
 +#!/usr/bin/make -f
- # -*- makefile -*-
- # Sample debian/rules that uses debhelper.
- # This file was originally written by Joey Hess and Craig Small.
- # As a special exception, when this file is copied by dh-make into a
- # dh-make output file, you may use that output file without restriction.
- # This special exception was added by Craig Small in version 0.37 of dh-make.
- 
- # Uncomment this to turn on verbose mode.
- #export DH_VERBOSE=1
- 
- 
- # 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
- 
- config.status: configure
- 	dh_testdir
- 	# Add here commands to configure the package.
- 	QTDIR=/usr/lib/qt3 CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
- 
- 
- build: build-stamp
- 
- build-stamp:  config.status
- 	dh_testdir
- 
- 	# Add here commands to compile the package.
- 	QTDIR=/usr/lib/qt3 $(MAKE)
- 	#docbook-to-man debian/twinkle.sgml > twinkle.1
- 	/usr/bin/help2man -N -S 'Debian GNU/Linux' src/twinkle -o twinkle.1
- 
- 	touch build-stamp
- 
- clean:
- 	dh_testdir
- 	dh_testroot
- 	rm -f build-stamp 
- 
- 	# Add here commands to clean up after the build process.
- 	-$(MAKE) distclean
- 	
- 	# Cleanup what make distclean doesn't
- 	rm -f twinkle.1 qtccxxincl.pro 
- 	
- #ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- #	cp -f /usr/share/misc/config.sub config.sub
- #endif
- #ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- #	cp -f /usr/share/misc/config.guess config.guess
- #endif
- 
- 
- 	dh_clean 
- 
- install: build
- 	dh_testdir
- 	dh_testroot
- 	dh_clean -k 
- 	dh_installdirs
- 
- 	# Add here commands to install the package into debian/twinkle.
- 	$(MAKE) install DESTDIR=$(CURDIR)/debian/twinkle
- 
- 
- # 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_installchangelogs ChangeLog
- 	dh_installdocs
- 	dh_installexamples
- #	dh_install
- 	dh_installmenu
- #	dh_installdebconf	
- #	dh_installlogrotate
- #	dh_installemacsen
- #	dh_installpam
- #	dh_installmime
- #	dh_installinit
- #	dh_installcron
- #	dh_installinfo
- 	dh_installman twinkle.1
- 	dh_link
- 	dh_strip
- 	dh_compress
- 	dh_fixperms
- #	dh_perl
- #	dh_python
- 	dh_makeshlibs
- 	dh_installdeb
- 	dh_shlibdeps
- 	dh_gencontrol
- 	dh_md5sums
- 	dh_builddeb
- 
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install 
++# 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/lib/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

-- 
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