[Pkg-voip-commits] r1815 - in openmcu/trunk/debian: . patches
Kilian Krause
kilian at costa.debian.org
Sat Jun 10 12:46:12 UTC 2006
Author: kilian
Date: 2006-06-10 12:46:11 +0000 (Sat, 10 Jun 2006)
New Revision: 1815
Removed:
openmcu/trunk/debian/patches/00list
openmcu/trunk/debian/patches/01_conference.h.dpatch
openmcu/trunk/debian/patches/05_openmcu.1.dpatch
Modified:
openmcu/trunk/debian/changelog
openmcu/trunk/debian/rules
Log:
we could actually ship the update of 2.2.0 even though upstream reckons 1.11.0 and 1.19.0 are required. Let's see what Craig'll tell. ;)
Modified: openmcu/trunk/debian/changelog
===================================================================
--- openmcu/trunk/debian/changelog 2006-06-10 12:36:14 UTC (rev 1814)
+++ openmcu/trunk/debian/changelog 2006-06-10 12:46:11 UTC (rev 1815)
@@ -1,8 +1,9 @@
-openmcu (2.1.1-4) UNRELEASED; urgency=low
+openmcu (2.2.0-1) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * New upstream release.
- -- Kilian Krause <kilian at debian.org> Sun, 16 Apr 2006 23:13:33 +0000
+ -- Kilian Krause <kilian at debian.org> Sat, 10 Jun 2006 14:33:52 +0200
openmcu (2.1.1-3) unstable; urgency=low
Deleted: openmcu/trunk/debian/patches/00list
===================================================================
--- openmcu/trunk/debian/patches/00list 2006-06-10 12:36:14 UTC (rev 1814)
+++ openmcu/trunk/debian/patches/00list 2006-06-10 12:46:11 UTC (rev 1815)
@@ -1,2 +0,0 @@
-01_conference.h.dpatch
-05_openmcu.1.dpatch
Deleted: openmcu/trunk/debian/patches/01_conference.h.dpatch
===================================================================
--- openmcu/trunk/debian/patches/01_conference.h.dpatch 2006-06-10 12:36:14 UTC (rev 1814)
+++ openmcu/trunk/debian/patches/01_conference.h.dpatch 2006-06-10 12:46:11 UTC (rev 1815)
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-## 01_conference.h.dpatch by Kilian Krause <kk at verfaction.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix compilation on amd64 with gcc-4.0
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urN ../tmp-orig/openmcu-2.0.5/conference.h ./conference.h
---- ../tmp-orig/openmcu-2.0.5/conference.h 2004-05-26 06:54:31.000000000 +0000
-+++ ./conference.h 2005-02-23 11:52:42.427787310 +0000
-@@ -164,7 +164,7 @@
- #pragma warning(disable:4311)
- #endif
- virtual PString GetName() const
-- { return PString(PString::Unsigned, (unsigned)id); }
-+ { return PString(PString::Unsigned, (unsigned long)id); }
- #ifdef _WIN32
- #pragma warning(pop)
- #endif
-@@ -250,7 +250,7 @@
- * return the name of the the conference member
- */
- virtual PString GetName() const
-- { return PString(PString::Unsigned, (unsigned)id); }
-+ { return PString(PString::Unsigned, (unsigned long)id); }
-
- #ifdef _WIN32
- #pragma warning(pop)
Deleted: openmcu/trunk/debian/patches/05_openmcu.1.dpatch
===================================================================
--- openmcu/trunk/debian/patches/05_openmcu.1.dpatch 2006-06-10 12:36:14 UTC (rev 1814)
+++ openmcu/trunk/debian/patches/05_openmcu.1.dpatch 2006-06-10 12:46:11 UTC (rev 1815)
@@ -1,197 +0,0 @@
-#! /bin/sh -e
-## 10_rollup_1.1.7+cvs04092003-1.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from openmcu 1.1.7+cvs04092003-1 diff.gz
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-
---- openmcu-1.1.7+cvs04092003.orig/ReadMe.txt
-+++ openmcu-1.1.7+cvs04092003/ReadMe.txt
-@@ -7,7 +7,7 @@
- 1. Introduction
- ---------------
-
--OpenMCU is a simple Mutli Conference Unit using the H.323 protocol. It requires
-+OpenMCU is a simple Multi Conference Unit using the H.323 protocol. It requires
- the OpenH323 library - see http://www.openh323.org for more information.
- It is known to run on Linux and FreeBSD and should run on any platform supported
- by OpenH323.
---- openmcu-1.1.7+cvs04092003.orig/openmcu.1
-+++ openmcu-1.1.7+cvs04092003/openmcu.1
-@@ -1,8 +1,8 @@
- '\" t
- .\" Man page for openmcu
--.\" SGM 16 Jul 2001
-+.\" Santiago Garcia Mantinan (manty) 18 Jul 2001
- .\"
--.TH openmcu 1 "16 Jul 2001"
-+.TH openmcu 1 "18 Jul 2001"
- .LO 1
- .SH NAME
- openmcu \- simple Multi Conference Unit using H.323
-@@ -12,12 +12,14 @@
- .SH DESCRIPTION
- .PP
- .B openmcu
--is a simple Mutli Conference Unit using the H.323 protocol. It sets up a
-+is a simple Multi Conference Unit using the H.323 protocol. It sets up a
- H.323 listener process, and then waits for incoming connections. Whenever an
- incoming connection is established, it adds that call to the specified
- conference or to the default one if none is specified. You specify one on
- your H.323 client when you call the OpenMCU server with address
- "room_name at server_name", where room_name is the conference you want to join.
-+If video is enabled and there are more than 4 people in a chat room it shows
-+the images of the last 4 people that have talked in that room.
-
- .SH OPTIONS
- .PP
-@@ -29,21 +31,32 @@
- configuration file.
-
- .TP
--\fB\-u\fR, \fB\-\-username\fR \fIstr\fR
--Set the local endpoint name to \fIstr\fR.
-+\fB\-\-defaultroom\fR \fIname\fR
-+Selects the default room \fIname\fR that will be used for connections that
-+don't specify one, default is room101.
-+
-+.TP
-+\fB\-\-disable-menu\fR
-+Disable the command line menu.
-
- .TP
- \fB\-g\fR, \fB\-\-gatekeeper\fR \fIhost\fR
--Upon startup, register with only with the specified gatekeeper rather than
-+Upon startup, register only with the specified gatekeeper rather than
- attempting to find a gatekeeper by using UDP broadcast.
-
- .TP
--\fB\-n\fR, \fB\-\-no\-gatekeeper\fR
--Do not attempt to find a gatetkeeper upon startup using UDP broadcast.
-+\fB\-\-g711frames\fR \fIcount\fR
-+Set the number of G.711 frames in capabilities to \fIcount\fR. Defaults to
-+30.
-
- .TP
--\fB\-\-require\-gatekeeper\fR
--Exit if a gatekeeper cannot be found.
-+\fB\-\-gsmframes\fR \fIcount\fR
-+Set the number of GSM frames in capabilities to \fIcount\fR. Defaults to
-+4.
-+
-+.TP
-+\fB\-h\fR, \fB\-\-help\fR
-+Display the help message.
-
- .TP
- \fB\-i\fR, \fB\-\-interface\fR \fIIP\fR
-@@ -55,24 +68,15 @@
- copies of
- .B openmcu
- on the same multi\-homed machine, or for ensuring that only calls from the
--external, or internal, network will be received on a particular handset.
--
--.TP
--\fB\-\-g711frames\fR \fIcount\fR
--Set the number of G.711 frames in capabilities to \fIcount\fR. Defaults to
--30.
-+external, or internal, network will be received on a particular mcu server.
-
- .TP
--\fB\-\-gsmframes\fR \fIcount\fR
--Set the number of GSM frames in capabilities to \fIcount\fR. Defaults to
--4.
-+\fB\-\-no\-defaultroom\fR
-+Reject connections with no room specified.
-
- .TP
--\fB\-t\fR, \fB\-\-trace\fR
--Enable debug tracing, which displays messages at run\-time to assist in
--debugging or problem identification. Specifying this option multiple times
--increases the amount of information displayed. Use the \fB\-o\fR option to
--write the trace information to a file rather than to stderr.
-+\fB\-n\fR, \fB\-\-no\-gatekeeper\fR
-+Do not attempt to find a gatekeeper upon startup using UDP broadcast.
-
- .TP
- \fB\-o\fR, \fB\-\-output\fR \fIfilename\fR
-@@ -80,10 +84,25 @@
- rather than to stderr.
-
- .TP
-+\fB\-\-require\-gatekeeper\fR
-+Exit if a gatekeeper cannot be found.
-+
-+.TP
- \fB\-\-save\fR
- Save arguments in configuration file.
-
- .TP
-+\fB\-t\fR, \fB\-\-trace\fR
-+Enable debug tracing, which displays messages at run\-time to assist in
-+debugging or problem identification. Specifying this option multiple times
-+increases the amount of information displayed. Use the \fB\-o\fR option to
-+write the trace information to a file rather than to stderr.
-+
-+.TP
-+\fB\-u\fR, \fB\-\-username\fR \fIstr\fR
-+Set the local endpoint name to \fIstr\fR.
-+
-+.TP
- \fB\-v\fR, \fB\-\-video\fR
- Enable H261 video handling.
-
-@@ -111,27 +130,10 @@
- Disable video and audio multiplexing. Only First connection is allowed to send
- data.
-
--.TP
--\fB\-\-defaultroom\fR \fIname\fR
--Selects the default room \fIname\fR that will be used for connections that
--don't specify one, default is room101.
--
--.TP
--\fB\-\-no\-defaultroom\fR
--Reject connections with no room specified.
--
--.TP
--\fB\-\-disable-menu\fR
--Disable the command line menu.
--
--.TP
--\fB\-h\fR, \fB\-\-help\fR
--Display the help message.
--
- .SH CONFIGURATION FILE
- .PP
- .B openmcu
--options can be set in the ohphone configuration file
-+options can be set in the openmcu configuration file
- .B ~/.pwlib_config/openmcu.ini
- either by edditing this file or via the \fB\-\-save\fR option.
- Options must be located in the section prefixed with [Options]. The long
-@@ -184,4 +186,4 @@
- None that I know of.
-
- .SH "SEE ALSO"
--None
-+README.txt file in the doc directory.
Modified: openmcu/trunk/debian/rules
===================================================================
--- openmcu/trunk/debian/rules 2006-06-10 12:36:14 UTC (rev 1814)
+++ openmcu/trunk/debian/rules 2006-06-10 12:46:11 UTC (rev 1815)
@@ -14,6 +14,14 @@
include /usr/share/dpatch/dpatch.make
PACKAGE=openmcu
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+ | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+URLVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//' -e 's/\./_/g')
+
+UPFILENAME := openmcu_$(UPVERSION).orig.tar.gz
+URL := http://www.voxgratia.org/releases/openmcu-v$(URLVERSION)-src-tar.gz
+
build: patch build-stamp
build-stamp:
dh_testdir
@@ -66,5 +74,15 @@
dh_md5sums
dh_builddeb
+print-version:
+ @@echo "Debian version: $(DEBVERSION)"
+ @@echo "Upstream version: $(UPVERSION)"
+
+get-orig-source:
+ @@dh_testdir
+ @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+ @@echo Downloading $(UPFILENAME) from $(URL) ...
+ @@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-voip-commits
mailing list