[Pkg-voip-commits] [twinkle] 53/73: Migrate from cdbs to dh
Peter Colberg
pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:53 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 66ad8a6f666022e123862ff42c13f95897d50c0a
Author: Peter Colberg <peter at colberg.org>
Date: Tue Dec 29 00:58:54 2015 -0500
Migrate from cdbs to dh
---
debian/dirs | 4 -
debian/docs | 2 -
debian/rules | 27 ++++---
debian/twinkle.1 | 118 ----------------------------
debian/{bug/presubj => twinkle.bug-presubj} | 8 +-
debian/twinkle.dirs | 1 +
debian/twinkle.docs | 2 +
debian/twinkle.install | 2 -
8 files changed, 20 insertions(+), 144 deletions(-)
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 533a62d..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/applications
-usr/share/bug/twinkle
-usr/share/services
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e4cf55f..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-THANKS
diff --git a/debian/rules b/debian/rules
index 73ab1c4..6c850f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,20 @@
#!/usr/bin/make -f
-URL = http://www.xs4all.nl/~mfnboer/twinkle/download/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
-FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+CONFIGURE_FLAGS = -DWITH_QT5=ON -DWITH_ALSA=ON -DWITH_ZRTP=ON -DWITH_SPEEX=ON -DWITH_GSM=ON
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+ dh $@
-DEB_CONFIGURE_EXTRA_FLAGS := --without-ilbc --without-kde
+override_dh_clean:
+ rm -f debian/twinkle.1
+ dh_clean
-get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@echo Downloading $(FILENAME) from $(URL) ...
- @@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+override_dh_auto_configure:
+ dh_auto_configure -- $(CONFIGURE_FLAGS)
-help2man:
- help2man twinkle -N -n 'Voice over Internet Protocol (VoIP) SIP Phone' -o debian/twinkle.1
+override_dh_installman:
+ help2man debian/twinkle/usr/bin/twinkle -N -n 'Voice over Internet Protocol (VoIP) SIP Phone' -o debian/twinkle.1
+ dh_installman
+
+override_dh_installchangelogs:
+ dh_installchangelogs NEWS
diff --git a/debian/twinkle.1 b/debian/twinkle.1
deleted file mode 100644
index 0b4a7f6..0000000
--- a/debian/twinkle.1
+++ /dev/null
@@ -1,118 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH TWINKLE "1" "January 2009" "Twinkle 1.4beta - 04 January 2009" "User Commands"
-.SH NAME
-Twinkle \- Voice over Internet Protocol (VoIP) SIP Phone
-.SH SYNOPSIS
-.B twinkle
-[\fIoptions\fR]
-.SH OPTIONS
-.TP
-\fB\-c\fR
-Run in command line interface (CLI) mode
-.TP
-\fB\-\-share\fR <dir>
-Set the share directory.
-.TP
-\fB\-f\fR <profile>
-Startup with a specific profile. You will not be requested
-to choose a profile at startup. The profiles that you created
-are the .cfg files in your .twinkle directory.
-You may specify multiple profiles separated by spaces.
-.TP
-\fB\-\-force\fR
-If a lock file is detected at startup, then override it
-and startup.
-.HP
-\fB\-\-sip\-port\fR <port>
-.IP
-Port for SIP signalling.
-This port overrides the port from the system settings.
-.HP
-\fB\-\-rtp\-port\fR <port>
-.IP
-Port for RTP.
-This port overrides the port from the system settings.
-.HP
-\fB\-\-call\fR <address>
-.IP
-Instruct Twinkle to call the address.
-When Twinkle is already running, this will instruct the running
-process to call the address.
-The address may be a full or partial SIP URI. A partial SIP URI
-will be completed with the information from the user profile.
-.IP
-A subject may be passed by appending '?subject=<subject>'
-to the address.
-.IP
-Examples:
-twinkle \fB\-\-call\fR 123456
-twinkle \fB\-\-call\fR sip:example at example.com?subject=hello
-.HP
-\fB\-\-cmd\fR <cli command>
-.IP
-Instruct Twinkle to execute the CLI command. You can run
-all commands from the command line interface mode.
-When Twinkle is already running, this will instruct the running
-process to execute the CLI command.
-.IP
-Examples:
-twinkle \fB\-\-cmd\fR answer
-twinkle \fB\-\-cmd\fR mute
-twinkle \fB\-\-cmd\fR 'transfer 12345'
-.TP
-\fB\-\-immediate\fR
-This option can be used in conjunction with \fB\-\-call\fR or \fB\-\-cmd\fR
-It indicates the the command or call is to be performed
-immediately without asking the user for any confirmation.
-.HP
-\fB\-\-set\-profile\fR <profile>
-.IP
-Make <profile> the active profile.
-When using this option in conjuction with \fB\-\-call\fR and \fB\-\-cmd\fR,
-then the profile is activated before executing \fB\-\-call\fR or
-\fB\-\-cmd\fR.
-.TP
-\fB\-\-show\fR
-Instruct a running instance of Twinkle to show the main window
-and take focus.
-.TP
-\fB\-\-hide\fR
-Instruct a running instance of Twinkle to hide in the sytem tray.
-If no system tray is used, then Twinkle will minimize.
-.HP
-\fB\-\-help\-cli\fR [cli command]
-.IP
-Without a cli command this option lists all available CLI
-commands. With a CLI command this option prints help on
-the CLI command.
-.TP
-\fB\-\-version\fR
-Get version information.
-.SH COPYRIGHT
-Copyright \(co 2005-2009 Michel de Boer
-http://www.twinklephone.com
-.PP
-Built with support for: ALSA, KDE, Speex, ZRTP
-.PP
-Contributions:
-* Werner Dittmann (ZRTP/SRTP)
-* Bogdan Harjoc (AKAv1\-MD5, Service\-Route)
-* Roman Imankulov (command line editing)
-* Ondrej Moris (codec preprocessing)
-* Rickard Petzall (ALSA)
-.PP
-This software contains the following software from 3rd parties:
-* GSM codec from Jutta Degener and Carsten Bormann, University of Berlin
-* G.711/G.726 codecs from Sun Microsystems (public domain)
-* Parts of the STUN project at http://sourceforge.net/projects/stun
-* Parts of libsrv at http://libsrv.sourceforge.net/
-.PP
-For RTP the following dynamic libraries are linked:
-* GNU ccRTP \- http://www.gnu.org/software/ccrtp
-* GNU CommonC++ \- http://www.gnu.org/software/commoncpp
-.PP
-Twinkle comes with ABSOLUTELY NO WARRANTY.
-This program 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.
diff --git a/debian/bug/presubj b/debian/twinkle.bug-presubj
similarity index 54%
rename from debian/bug/presubj
rename to debian/twinkle.bug-presubj
index 3e02ee8..7f3befe 100644
--- a/debian/bug/presubj
+++ b/debian/twinkle.bug-presubj
@@ -1,11 +1,9 @@
If you know that the bug you want to report is in the "upstream"
-code then please file directly with the twinkle users group:
- http://groups.yahoo.com/group/twinklephone/
+code then please file directly with the github issue tracker:
+
+https://github.com/LubosD/twinkle/issues
If you feel that the bug is one that other Debian users should
know about then you are welcome to file a report in the Debian BTS
as well. Please keep in mind, however, that managing bug reports
is part of the maintainers' workload.
-
-As a minimum could I ask you to Cc: the usergroup twinklephone at yahoogroups.com
-for upstream issues so they are aware of any issues we have.
diff --git a/debian/twinkle.dirs b/debian/twinkle.dirs
new file mode 100644
index 0000000..fc7a457
--- /dev/null
+++ b/debian/twinkle.dirs
@@ -0,0 +1 @@
+usr/share/services
diff --git a/debian/twinkle.docs b/debian/twinkle.docs
new file mode 100644
index 0000000..3f77203
--- /dev/null
+++ b/debian/twinkle.docs
@@ -0,0 +1,2 @@
+README.md
+THANKS
diff --git a/debian/twinkle.install b/debian/twinkle.install
index 3f746b2..400e78a 100644
--- a/debian/twinkle.install
+++ b/debian/twinkle.install
@@ -1,3 +1 @@
-debian/bug/* usr/share/bug/twinkle/
sip.protocol usr/share/services
-twinkle.desktop usr/share/applications
--
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