[Pkg-voip-commits] r5468 - in /speex/trunk/debian: changelog control copyright doxyfile libspeex-dev.install libspeex1.install libspeex2.install libspeexdsp-dev.install libspeexdsp1.install patches/ rules speex-doc.doc-base
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Thu Apr 3 13:49:10 UTC 2008
Author: paravoid
Date: Thu Apr 3 13:49:10 2008
New Revision: 5468
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5468
Log:
Importing ron's package:
* Include .pc fixes accepted upstream and the upstream doxygen config
from their git repo source.
* Try to convince cdbs not to build the docs for arch specific builds...
* That apparently cannot be done, so it's off to the bit bucket for this
vile opiate of the clueless. My patience with its stupidity is ended.
Closes: #474017
* New upstream snapshot. Includes the API support required for mumble.
Closes: #467361
* Add a Homepage field and make the Vcs- fields less XS-ive.
Thanks to Patrick Matthai for spotting this.
* New upstream release. Splits the unstable API functions into their own
library. Apps which used them previously now need to link to libspeexdsp
as well.
* Fixes "Inconsistency in preprocessor API". Closes: #439516
* Add myself to uploaders, with the blessing of #debian-voip
Added:
speex/trunk/debian/libspeex1.install
speex/trunk/debian/libspeexdsp-dev.install
speex/trunk/debian/libspeexdsp1.install
Removed:
speex/trunk/debian/doxyfile
speex/trunk/debian/libspeex2.install
speex/trunk/debian/patches/
Modified:
speex/trunk/debian/changelog
speex/trunk/debian/control
speex/trunk/debian/copyright
speex/trunk/debian/libspeex-dev.install
speex/trunk/debian/rules
speex/trunk/debian/speex-doc.doc-base
Modified: speex/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/speex/trunk/debian/changelog?rev=5468&op=diff
==============================================================================
--- speex/trunk/debian/changelog (original)
+++ speex/trunk/debian/changelog Thu Apr 3 13:49:10 2008
@@ -1,13 +1,38 @@
-speex (1.2~beta2-4) UNRELEASED; urgency=low
-
- [ Kilian Krause ]
- * NOT RELEASED YET
-
- [ Mark Purcell ]
- * TODO: Need to update soname to libspeex.so.0deb if they are ABI
- incompatable
-
- -- Kilian Krause <kilian at debian.org> Sat, 22 Sep 2007 13:10:30 +0200
+speex (1.2~beta3.1.ds-1) unstable; urgency=low
+
+ * Include .pc fixes accepted upstream and the upstream doxygen config
+ from their git repo source.
+ * Try to convince cdbs not to build the docs for arch specific builds...
+ * That apparently cannot be done, so it's off to the bit bucket for this
+ vile opiate of the clueless. My patience with its stupidity is ended.
+ Closes: #474017
+
+ -- Ron Lee <ron at debian.org> Thu, 03 Apr 2008 09:21:42 +0930
+
+speex (1.2~beta3.1-1) experimental; urgency=low
+
+ * New upstream snapshot. Includes the API support required for mumble.
+ Closes: #467361
+ * Add a Homepage field and make the Vcs- fields less XS-ive.
+ Thanks to Patrick Matthäi for spotting this.
+
+ -- Ron Lee <ron at debian.org> Fri, 21 Mar 2008 08:19:59 +1030
+
+speex (1.2~beta3-1) unstable; urgency=low
+
+ * New upstream release. Splits the unstable API functions into their own
+ library. Apps which used them previously now need to link to libspeexdsp
+ as well.
+ * Fixes "Inconsistency in preprocessor API". Closes: #439516
+ * Add myself to uploaders, with the blessing of #debian-voip
+
+ -- Ron Lee <ron at debian.org> Wed, 19 Mar 2008 05:49:20 +1030
+
+speex (1.2~beta2-3.1) experimental; urgency=low
+
+ * Local backport. no texlive build dep
+
+ -- Ron Lee <ron at debian.org> Wed, 28 Nov 2007 01:11:57 +1030
speex (1.2~beta2-3) experimental; urgency=low
Modified: speex/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/speex/trunk/debian/control?rev=5468&op=diff
==============================================================================
--- speex/trunk/debian/control (original)
+++ speex/trunk/debian/control Thu Apr 3 13:49:10 2008
@@ -2,10 +2,14 @@
Section: sound
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: A. Maitland Bottoms <bottoms at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>> 4.1.0), libogg-dev, cdbs, doxygen, dpkg-dev (>= 1.13.19)
-Build-Depends-Indep: doxygen, gs-gpl, graphviz (>=2.2-1), texlive-extra-utils
-Standards-Version: 3.6.2
+Uploaders: A. Maitland Bottoms <bottoms at debian.org>,
+ Jose Carlos Garcia Sogo <jsogo at debian.org>,
+ Mark Purcell <msp at debian.org>,
+ Kilian Krause <kilian at debian.org>,
+ Ron Lee <ron at debian.org>
+Build-Depends: debhelper (>> 4.1.0), libogg-dev, dpkg-dev (>= 1.13.19)
+Build-Depends-Indep: doxygen, graphviz
+Standards-Version: 3.7.3
Homepage: http://www.speex.org/
Vcs-Svn: svn://svn.debian.org/pkg-voip/speex/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/speex/?op=log
@@ -13,50 +17,74 @@
Package: speex
Architecture: any
Depends: ${shlibs:Depends}
-Description: The Speex Speech Codec
- Unlike other codecs like MP3 and Ogg Vorbis, Speex is specially
- designed for compressing voice at low bit-rates for applications
- such as voice over IP (VoIP). In some sense, it is meant to be
- complementary to the Ogg Vorbis codec.
+Description: The Speex codec command line tools
+ Speex is an audio codec especially designed for compressing voice at low
+ bit-rates for applications such as voice over IP (VoIP). In some senses,
+ it is meant to be complementary to the Vorbis codec which places a greater
+ emphasis on high-quality music reproduction.
.
- This package contains the encoder and decoder command-line
- applications.
+ This package contains the encoder and decoder command-line applications.
-Package: libspeex2
+Package: libspeex1
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
-Conflicts: libspeex1
-Replaces: libspeex1
Suggests: speex
-Description: The Speex Speech Codec
- Unlike other codecs like MP3 and Ogg Vorbis, Speex is specially
- designed for compressing voice at low bit-rates for applications
- such as voice over IP (VoIP). In some sense, it is meant to be
- complementary to the Ogg Vorbis codec.
+Description: The Speex codec runtime library
+ Speex is an audio codec especially designed for compressing voice at low
+ bit-rates for applications such as voice over IP (VoIP). In some senses,
+ it is meant to be complementary to the Vorbis codec which places a greater
+ emphasis on high-quality music reproduction.
.
- This package is only the library.
+ This package provides the speex runtime library.
Package: libspeex-dev
Architecture: any
Section: libdevel
-Depends: libspeex2 (= ${binary:Version}), ${shlibs:Depends}, pkg-config
-Description: The Speex Speech Codec
- Unlike other codecs like MP3 and Ogg Vorbis, Speex is specially
- designed for compressing voice at low bit-rates for applications
- such as voice over IP (VoIP). In some sense, it is meant to be
- complementary to the Ogg Vorbis codec.
+Depends: libspeex1 (= ${binary:Version})
+Suggests: pkg-config
+Description: The Speex codec library development files
+ Speex is an audio codec especially designed for compressing voice at low
+ bit-rates for applications such as voice over IP (VoIP). In some senses,
+ it is meant to be complementary to the Vorbis codec which places a greater
+ emphasis on high-quality music reproduction.
.
- This package is only the library development files.
+ This package provides the speex library headers and development files.
+
+Package: libspeexdsp1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: The Speex extended runtime library
+ Speex is an audio codec especially designed for compressing voice at low
+ bit-rates for applications such as voice over IP (VoIP). In some senses,
+ it is meant to be complementary to the Vorbis codec which places a greater
+ emphasis on high-quality music reproduction.
+ .
+ This package provides the runtime library of additional functions that
+ are part of the Speex distribution.
+
+Package: libspeexdsp-dev
+Architecture: any
+Section: libdevel
+Depends: libspeexdsp1 (= ${binary:Version}), libspeex-dev (= ${binary:Version})
+Suggests: pkg-config
+Description: The Speex extended library development files
+ Speex is an audio codec especially designed for compressing voice at low
+ bit-rates for applications such as voice over IP (VoIP). In some senses,
+ it is meant to be complementary to the Vorbis codec which places a greater
+ emphasis on high-quality music reproduction.
+ .
+ This package provides the speex extended library headers and development files.
Package: speex-doc
Architecture: all
Section: doc
Suggests: speex
Description: Documentation for speex
- Unlike other codecs like MP3 and Ogg Vorbis, Speex is specially
- designed for compressing voice at low bit-rates for applications
- such as voice over IP (VoIP). In some sense, it is meant to be
- complementary to the Ogg Vorbis codec.
+ Speex is an audio codec especially designed for compressing voice at low
+ bit-rates for applications such as voice over IP (VoIP). In some senses,
+ it is meant to be complementary to the Vorbis codec which places a greater
+ emphasis on high-quality music reproduction.
.
- This package contains Speex's documentation.
+ This package contains the Speex documentation.
Modified: speex/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/speex/trunk/debian/copyright?rev=5468&op=diff
==============================================================================
--- speex/trunk/debian/copyright (original)
+++ speex/trunk/debian/copyright Thu Apr 3 13:49:10 2008
@@ -7,12 +7,14 @@
Jean-Marc Valin <jean-marc.valin at hermes.usherb.ca>
David Rowe <david at voicetronix.com.au>
-Copyright: 2002-2005
- Xiph.org Foundation
- Jean-Marc Valin
- David Rowe
- EpicGames
- Analog Devices
+Copyright 2002-2007 Xiph.org Foundation
+Copyright 2002-2007 Jean-Marc Valin
+Copyright 2005-2007 Analog Devices Inc.
+Copyright 2005-2007 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO)
+Copyright 1993, 2002, 2006 David Rowe
+Copyright 2003 EpicGames
+Copyright 1992-1994 Jutta Degener, Carsten Bormann
License:
Modified: speex/trunk/debian/libspeex-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/speex/trunk/debian/libspeex-dev.install?rev=5468&op=diff
==============================================================================
--- speex/trunk/debian/libspeex-dev.install (original)
+++ speex/trunk/debian/libspeex-dev.install Thu Apr 3 13:49:10 2008
@@ -1,6 +1,10 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
-usr/share/pkgconfig/*
+usr/include/speex/speex.h
+usr/include/speex/speex_bits.h
+usr/include/speex/speex_callbacks.h
+usr/include/speex/speex_config_types.h
+usr/include/speex/speex_header.h
+usr/include/speex/speex_stereo.h
+usr/include/speex/speex_types.h
+usr/lib/libspeex.a
+usr/lib/libspeex.so
+usr/lib/pkgconfig/speex.pc
Added: speex/trunk/debian/libspeex1.install
URL: http://svn.debian.org/wsvn/pkg-voip/speex/trunk/debian/libspeex1.install?rev=5468&op=file
==============================================================================
--- speex/trunk/debian/libspeex1.install (added)
+++ speex/trunk/debian/libspeex1.install Thu Apr 3 13:49:10 2008
@@ -1,0 +1,1 @@
+usr/lib/libspeex.so.*
Added: speex/trunk/debian/libspeexdsp-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/speex/trunk/debian/libspeexdsp-dev.install?rev=5468&op=file
==============================================================================
--- speex/trunk/debian/libspeexdsp-dev.install (added)
+++ speex/trunk/debian/libspeexdsp-dev.install Thu Apr 3 13:49:10 2008
@@ -1,0 +1,8 @@
+usr/include/speex/speex_buffer.h
+usr/include/speex/speex_echo.h
+usr/include/speex/speex_jitter.h
+usr/include/speex/speex_preprocess.h
+usr/include/speex/speex_resampler.h
+usr/lib/libspeexdsp.a
+usr/lib/libspeexdsp.so
+usr/lib/pkgconfig/speexdsp.pc
Added: speex/trunk/debian/libspeexdsp1.install
URL: http://svn.debian.org/wsvn/pkg-voip/speex/trunk/debian/libspeexdsp1.install?rev=5468&op=file
==============================================================================
--- speex/trunk/debian/libspeexdsp1.install (added)
+++ speex/trunk/debian/libspeexdsp1.install Thu Apr 3 13:49:10 2008
@@ -1,0 +1,2 @@
+usr/lib/libspeexdsp.so.*
+
Modified: speex/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/speex/trunk/debian/rules?rev=5468&op=diff
==============================================================================
--- speex/trunk/debian/rules (original)
+++ speex/trunk/debian/rules Thu Apr 3 13:49:10 2008
@@ -1,30 +1,101 @@
#!/usr/bin/make -f
+# Derived from:
+# Sample debian/rules that uses debhelper,
+# GNU copyright 1997 by Joey Hess.
+# Copyright Ron Lee 2003, 2004, 2007, 2008
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+SHELL = /bin/bash
-FILENAME := $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-URL := http://downloads.us.xiph.org/releases/$(DEB_SOURCE_PACKAGE)/$(DEB_SOURCE_PACKAGE)-$(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~//').tar.gz
+#export DH_VERBOSE=1
+export DH_OPTIONS
-DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_DH_MAKESHLIBS_ARGS_libspeex2 := -V"libspeex2 (>= 1.2~beta2-1)"
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
-clean::
- rm -f config.log
- rm -fR doc/html doc/man doc/latex
+# 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)
-build/speex-doc::
- doxygen debian/doxyfile
-binary-install/speex-doc::
- rm -f debian/speex-doc/usr/share/man/man3/misc.h.3
+objdir := objs
-print-version:
- @@echo "Debian version: $(DEB_VERSION)"
- @@echo "Upstream version: $(DEB_UPSTREAM_VERSION)"
+clean:
+ dh_testdir
+ dh_testroot
+ $(RM) *-stamp
+ $(RM) -r $(objdir) doc/{html,man,latex}
+ dh_clean
-get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@echo Downloading $(FILENAME) from $(URL) ...
- @@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+
+$(objdir)/config.status: configure
+ dh_testdir
+ mkdir -p $(objdir)
+ cd $(objdir) && ../configure --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr
+
+build: build-arch
+
+build-arch: build-arch-stamp
+build-arch-stamp: $(objdir)/config.status
+ dh_testdir
+ cd $(objdir) && $(MAKE)
+ touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp:
+ dh_testdir
+ doxygen Doxyfile
+ touch $@
+
+
+install: install-arch install-indep
+
+install-arch: install-arch-stamp
+install-arch-stamp:
+ dh_testdir
+ cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ touch $@
+
+install-indep:
+
+
+binary: binary-indep binary-arch
+
+binary-indep: DH_OPTIONS = -i
+binary-indep: build-indep install-indep
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installchangelogs
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch: build-arch install-arch
+ dh_testdir
+ dh_testroot
+ dh_install -a --sourcedir=debian/tmp
+ dh_installdocs -a
+ dh_installman -a
+ dh_installchangelogs -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -plibspeex1 -V"libspeex1 (>= 1.2~beta3-1)"
+ dh_makeshlibs -plibspeexdsp1 -V"libspeexdsp1 (>= 1.2~beta3.1-1)"
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+
+.PHONY: clean build build-arch build-indep install install-arch install-indep \
+ binary binary-arch binary-indep
+
Modified: speex/trunk/debian/speex-doc.doc-base
URL: http://svn.debian.org/wsvn/pkg-voip/speex/trunk/debian/speex-doc.doc-base?rev=5468&op=diff
==============================================================================
--- speex/trunk/debian/speex-doc.doc-base (original)
+++ speex/trunk/debian/speex-doc.doc-base Thu Apr 3 13:49:10 2008
@@ -1,10 +1,14 @@
-Document: speex-doxygen-docs
-Title: Speex API Doxygen documentation
+Document: speex-docs
+Title: Speex codec and API documentation
Author: Jean-Marc Valin, David Rowe
-Abstract: Speex API Doxygen documentation
- The Speex library API, and associated source file
- descriptions parsed by Doxygen.
-Section: Apps/Programming
+Abstract: The PDF documentation describes the Speex codec and the command line
+ and C interfaces provided by the reference implementation. The HTML docs are
+ generated by parsing the source with doxygen, to generate the most current API
+ reference documentation from it.
+Section: Programming/C
+
+Format: PDF
+Files: /usr/share/doc/speex-doc/manual.pdf.gz
Format: HTML
Index: /usr/share/doc/speex-doc/html/index.html
More information about the Pkg-voip-commits
mailing list