[Pkg-voip-commits] r8449 - in /t38modem/trunk/debian: changelog compat control docs patches/ patches/series patches/simplify-makefile rules source/ source/format watch
msp at alioth.debian.org
msp at alioth.debian.org
Fri Jun 4 12:54:09 UTC 2010
Author: msp
Date: Fri Jun 4 12:54:01 2010
New Revision: 8449
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8449
Log:
* New upstream release (Closes: #541333, #549365, #512106)
* Add Build-Depends: libopal-dev (Closes: #577869)
* Update debian/watch -> t38modem.sf.net
* Switch to dh 7
* Added simplify-makefile (Thks mvanderkolff)
Added:
t38modem/trunk/debian/patches/
t38modem/trunk/debian/patches/series
t38modem/trunk/debian/patches/simplify-makefile
t38modem/trunk/debian/source/
t38modem/trunk/debian/source/format
Removed:
t38modem/trunk/debian/docs
Modified:
t38modem/trunk/debian/changelog
t38modem/trunk/debian/compat
t38modem/trunk/debian/control
t38modem/trunk/debian/rules
t38modem/trunk/debian/watch
Modified: t38modem/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/t38modem/trunk/debian/changelog?rev=8449&op=diff
==============================================================================
--- t38modem/trunk/debian/changelog (original)
+++ t38modem/trunk/debian/changelog Fri Jun 4 12:54:01 2010
@@ -1,6 +1,6 @@
-t38modem (1.0.0-1) UNRELEASED; urgency=low
+t38modem (1.2.0-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release (Closes: #541333, #549365, #512106)
[ Patrick Matthäi ]
* Remove dpatch and debian/patches - there are no available patches.
@@ -9,7 +9,13 @@
[ Kilian Krause ]
* Fix debian/watch
- -- Kilian Krause <kilian at debian.org> Sat, 09 May 2009 20:24:59 +0200
+ [ Mark Purcell ]
+ * Add Build-Depends: libopal-dev (Closes: #577869)
+ * Update debian/watch -> t38modem.sf.net
+ * Switch to dh 7
+ * Added simplify-makefile (Thks mvanderkolff)
+
+ -- Mark Purcell <msp at debian.org> Fri, 04 Jun 2010 21:17:03 +1000
t38modem (0.8.4-2) unstable; urgency=low
Modified: t38modem/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/t38modem/trunk/debian/compat?rev=8449&op=diff
==============================================================================
--- t38modem/trunk/debian/compat (original)
+++ t38modem/trunk/debian/compat Fri Jun 4 12:54:01 2010
@@ -1,1 +1,1 @@
-4
+7
Modified: t38modem/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/t38modem/trunk/debian/control?rev=8449&op=diff
==============================================================================
--- t38modem/trunk/debian/control (original)
+++ t38modem/trunk/debian/control Fri Jun 4 12:54:01 2010
@@ -3,7 +3,7 @@
Priority: optional
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), help2man, libopenh323-1.19.1-dev (>= 1.19.1~), libexpat1-dev
+Build-Depends: debhelper (>= 7), help2man, libopal-dev, libexpat1-dev
Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14)
Standards-Version: 3.7.2
Homepage: http://openh323.sf.net/
@@ -12,7 +12,7 @@
Package: t38modem
Architecture: any
-Depends: ${shlibs:Depends} ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: hylafax-server
Description: T.38 Fax over IP pseudo modem
From your fax application view point it's a fax modem pool.
Added: t38modem/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/t38modem/trunk/debian/patches/series?rev=8449&op=file
==============================================================================
--- t38modem/trunk/debian/patches/series (added)
+++ t38modem/trunk/debian/patches/series Fri Jun 4 12:54:01 2010
@@ -1,0 +1,1 @@
+simplify-makefile
Added: t38modem/trunk/debian/patches/simplify-makefile
URL: http://svn.debian.org/wsvn/pkg-voip/t38modem/trunk/debian/patches/simplify-makefile?rev=8449&op=file
==============================================================================
--- t38modem/trunk/debian/patches/simplify-makefile (added)
+++ t38modem/trunk/debian/patches/simplify-makefile Fri Jun 4 12:54:01 2010
@@ -1,0 +1,146 @@
+Description: Simplify upstream Makefile (Thks mvanderkolff)
+Author: Mark Purcell <msp at debian.org>
+Bug-Debian: http://bugs.debian.org/584501
+
+--- t38modem-1.2.0.orig/Makefile
++++ t38modem-1.2.0/Makefile
+@@ -97,59 +97,29 @@
+ #
+ #
+
+-PROG = t38modem
+-SOURCES := pmutils.cxx dle.cxx pmodem.cxx pmodemi.cxx drivers.cxx \
+- t30tone.cxx hdlc.cxx t30.cxx fcs.cxx \
+- pmodeme.cxx enginebase.cxx t38engine.cxx audio.cxx \
+- drv_pty.cxx \
+- main_process.cxx
+-
+-#
+-# Build t38modem for
+-# - Open Phone Abstraction Library if defined USE_OPAL
+-# - Open H323 Library or H323 Plus Library if not defined USE_OPAL
+-# (NOTE: define NO_PBOOLEAN for Open H323 Library)
+-#
+-ifdef USE_OPAL
+- VPATH_CXX := opal
+-
+- SOURCES += \
+- opalutils.cxx \
+- modemep.cxx modemstrm.cxx \
+- h323ep.cxx \
+- sipep.cxx \
+- manager.cxx
+-
+- ifndef OPALDIR
+- OPALDIR=$(HOME)/opal
+- endif
+-
+- OBJDIR_SUFFIX = _opal$(OBJ_SUFFIX)
+- STDCCFLAGS += -DUSE_OPAL
+-
+- include $(OPALDIR)/opal_inc.mak
+-else
+- VPATH_CXX := h323lib
+-
+- SOURCES += t38protocol.cxx g7231_fake.cxx h323ep.cxx
++%.o: %.cxx
++ $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
+
+- ifndef OPENH323DIR
+- OPENH323DIR=$(HOME)/openh323
+- endif
+-
+- include $(OPENH323DIR)/openh323u.mak
+-
+- ifdef NO_PBOOLEAN
+- STDCCFLAGS += -DPBoolean=BOOL
+- endif
+-endif
++PROG = t38modem
++OBJECTS := pmutils.o dle.o pmodem.o pmodemi.o drivers.o t30tone.o hdlc.o t30.o fcs.o pmodeme.o enginebase.o t38engine.o audio.o drv_pty.o main_process.o \
++ opal/opalutils.o opal/modemep.o opal/modemstrm.o opal/h323ep.o opal/sipep.o opal/manager.o
++#SOURCES renamed - but don't have explicit rules.
++#SOURCES := pmutils.cxx dle.cxx pmodem.cxx pmodemi.cxx drivers.cxx \
++# t30tone.cxx hdlc.cxx t30.cxx fcs.cxx \
++# pmodeme.cxx enginebase.cxx t38engine.cxx audio.cxx \
++# drv_pty.cxx \
++# main_process.cxx
++
++USE_UNIX98_PTY := 1
++CPPFLAGS += `pkg-config --libs --cflags opal`
++CPPFLAGS += -DUSE_OPAL
+
+ #
+ # If defined COUT_TRACE then enable duplicate the
+ # output of myPTRACE() to cout
+ #
+ ifdef COUT_TRACE
+-STDCCFLAGS += -DCOUT_TRACE
++CPPFLAGS += -DCOUT_TRACE
+ endif
+
+ #
+@@ -161,7 +131,7 @@ endif
+ # do not use --old-asn option).
+ #
+ ifdef OPTIMIZE_CORRIGENDUM_IFP
+-STDCCFLAGS += -DOPTIMIZE_CORRIGENDUM_IFP
++CPPFLAGS += -DOPTIMIZE_CORRIGENDUM_IFP
+ endif
+
+ #
+@@ -169,7 +139,7 @@ endif
+ # output the trace with level N
+ #
+ ifdef MYPTRACE_LEVEL
+-STDCCFLAGS += -DMYPTRACE_LEVEL=$(MYPTRACE_LEVEL)
++CPPFLAGS += -DMYPTRACE_LEVEL=$(MYPTRACE_LEVEL)
+ endif
+
+ #
+@@ -177,7 +147,7 @@ endif
+ # output the warnings on level N for big file descriptors
+ #
+ ifdef FD_TRACE_LEVEL
+-STDCCFLAGS += -DFD_TRACE_LEVEL=$(FD_TRACE_LEVEL)
++CPPFLAGS += -DFD_TRACE_LEVEL=$(FD_TRACE_LEVEL)
+ endif
+
+ #
+@@ -186,7 +156,7 @@ endif
+ # - CPU usage will be traced
+ #
+ ifdef PROCESS_PER_THREAD
+-STDCCFLAGS += -DPROCESS_PER_THREAD
++CPPFLAGS += -DPROCESS_PER_THREAD
+ endif
+
+ #
+@@ -194,7 +164,7 @@ endif
+ # will repeat indicator sending on idle
+ #
+ ifdef REPEAT_INDICATOR_SENDING
+-STDCCFLAGS += -DREPEAT_INDICATOR_SENDING
++CPPFLAGS += -DREPEAT_INDICATOR_SENDING
+ endif
+
+ #
+@@ -205,12 +175,15 @@ endif
+ # Both schemes cen be used simultaneously.
+ #
+ ifdef USE_UNIX98_PTY
+- STDCCFLAGS += -DUSE_UNIX98_PTY
++ CPPFLAGS += -DUSE_UNIX98_PTY
+
+ ifdef USE_LEGACY_PTY
+- STDCCFLAGS += -DUSE_LEGACY_PTY
++ CPPFLAGS += -DUSE_LEGACY_PTY
+ endif
+ else
+- STDCCFLAGS += -DUSE_LEGACY_PTY
++ CPPFLAGS += -DUSE_LEGACY_PTY
+ endif
+
++
++$(PROG) : $(OBJECTS)
++ $(CC) $(CPPFLAGS) -o $(PROG) $(OBJECTS)
Modified: t38modem/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/t38modem/trunk/debian/rules?rev=8449&op=diff
==============================================================================
--- t38modem/trunk/debian/rules (original)
+++ t38modem/trunk/debian/rules Fri Jun 4 12:54:01 2010
@@ -1,89 +1,10 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+#export OPALDIR=/usr/include/opal
+export PTLIBDIR=/usr/share/ptlib
+export USE_OPAL=1
+export USE_UNIX98_PTY=1
-export OPENH323DIR=/usr/share/openh323
-export PWLIBDIR=/usr/share/pwlib
-export PREFIX=/usr
-export RELATED_PKG_MAKEFILE=1
+%:
+ dh $@
-URL := http://headnet.downloads.sourceforge.net/t38modem/t38modem-0.8.4.tar.gz
-
-CFLAGS= -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-export CFLAGS
-
-PACKAGE=t38modem
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE) opt
- /usr/bin/help2man obj*/t38modem -N -n 'T.38 modem emulator' -o t38modem.1
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- [ ! -f Makefile -o ! -f /usr/share/openh323/openh323u.mak ]||$(MAKE) clean
- rm -f t38modem.1
- rm -rf obj_*
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into tmp/t38modem.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/t38modem \
- INSTALLBIN_DIR=$(CURDIR)/debian/t38modem/usr/sbin
-
-
-# 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
- dh_installdocs
- dh_installexamples HylaFAX/config.ttyx
- dh_installman t38modem.1
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
Added: t38modem/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/t38modem/trunk/debian/source/format?rev=8449&op=file
==============================================================================
--- t38modem/trunk/debian/source/format (added)
+++ t38modem/trunk/debian/source/format Fri Jun 4 12:54:01 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: t38modem/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/t38modem/trunk/debian/watch?rev=8449&op=diff
==============================================================================
--- t38modem/trunk/debian/watch (original)
+++ t38modem/trunk/debian/watch Fri Jun 4 12:54:01 2010
@@ -1,7 +1,3 @@
-# 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.
-# Site Directory Pattern Version Script
-version=2
-http://sf.net/t38modem/ t38modem-(.*)\.tar\.gz debian uupdate
-
+version=3
+http://sf.net/t38modem/t38modem-(.*)\.tgz debian svn-upgrade
+
More information about the Pkg-voip-commits
mailing list