[Pkg-voip-commits] r3602 - speex/trunk/debian
msp at alioth.debian.org
msp at alioth.debian.org
Fri May 25 09:20:32 UTC 2007
Author: msp
Date: 2007-05-25 09:20:32 +0000 (Fri, 25 May 2007)
New Revision: 3602
Added:
speex/trunk/debian/compat
speex/trunk/debian/libspeex-dev.install
speex/trunk/debian/libspeex1.install
speex/trunk/debian/speex-doc.docs
speex/trunk/debian/speex-doc.manpages
speex/trunk/debian/speex.install
Removed:
speex/trunk/debian/libspeex-dev.dirs
speex/trunk/debian/libspeex-dev.files
speex/trunk/debian/libspeex1.dirs
speex/trunk/debian/libspeex1.files
speex/trunk/debian/speex-doc.dirs
speex/trunk/debian/speex.dirs
speex/trunk/debian/speex.files
speex/trunk/debian/testenc.1
speex/trunk/debian/testenc_wb.1
Modified:
speex/trunk/debian/changelog
speex/trunk/debian/control
speex/trunk/debian/docs
speex/trunk/debian/doxyfile
speex/trunk/debian/rules
speex/trunk/debian/speex.manpages
Log:
* (NOT RELEASED YET) New upstream release
* Switch to cdbs
- Provide debian/compat. lintian : debian-rules-sets-DH_COMPAT
- Rework debian/*.install
- Add debian/speex-doc.manpages debian/speex-doc.docs
- change doxyfile OUTPUT_DIRECTORY = doc
* Add libspeex-dev Depends: pkg-config
* TeTeX transition: Add Build-Depends-Indep: texlive-extra-utils
* Add Depends: ${shlibs:Depends} to speex package
Modified: speex/trunk/debian/changelog
===================================================================
--- speex/trunk/debian/changelog 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/changelog 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1,8 +1,15 @@
-speex (1.1.12-4) UNRELEASED; urgency=low
+speex (1.2~beta2-1) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * (NOT RELEASED YET) New upstream release
+ * Switch to cdbs
+ - Provide debian/compat. lintian : debian-rules-sets-DH_COMPAT
+ - Rework debian/*.install
+ - Add debian/speex-doc.manpages debian/speex-doc.docs
+ - change doxyfile OUTPUT_DIRECTORY = doc
+ * Add libspeex-dev Depends: pkg-config
+ * TeTeX transition: Add Build-Depends-Indep: texlive-extra-utils
- -- Kilian Krause <kilian at debian.org> Wed, 27 Dec 2006 23:23:01 +0100
+ -- Mark Purcell <msp at debian.org> Fri, 25 May 2007 10:02:26 +0100
speex (1.1.12-3) unstable; urgency=low
@@ -13,7 +20,7 @@
speex (1.1.12-2) unstable; urgency=low
* Update debian/watch for numeric upstream
- * Add Depends: ${shlibs:Depends} to speex pacakge
+ * Add Depends: ${shlibs:Depends} to speex package
- Fixes: Missing dependency on libogg0 (Closes: #372844)
* debian/rules export DH_COMPAT=4
* Ensure speex depends on exact version of libspeex1
Added: speex/trunk/debian/compat
===================================================================
--- speex/trunk/debian/compat (rev 0)
+++ speex/trunk/debian/compat 2007-05-25 09:20:32 UTC (rev 3602)
@@ -0,0 +1 @@
+4
Modified: speex/trunk/debian/control
===================================================================
--- speex/trunk/debian/control 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/control 2007-05-25 09:20:32 UTC (rev 3602)
@@ -3,8 +3,8 @@
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 (>> 3.0.0), libogg-dev
-Build-Depends-Indep: doxygen, tetex-bin, gs-gpl, graphviz (>=2.2-1)
+Build-Depends: debhelper (>> 3.0.0), libogg-dev, cdbs
+Build-Depends-Indep: doxygen, gs-gpl, graphviz (>=2.2-1), texlive-extra-utils
Standards-Version: 3.6.2.0
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
@@ -39,7 +39,7 @@
Package: libspeex-dev
Architecture: any
Section: libdevel
-Depends: libspeex1 (= ${Source-Version}), ${shlibs:Depends}
+Depends: libspeex1 (= ${Source-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
Modified: speex/trunk/debian/docs
===================================================================
--- speex/trunk/debian/docs 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/docs 2007-05-25 09:20:32 UTC (rev 3602)
@@ -2,4 +2,3 @@
NEWS
README
TODO
-ChangeLog
Modified: speex/trunk/debian/doxyfile
===================================================================
--- speex/trunk/debian/doxyfile 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/doxyfile 2007-05-25 09:20:32 UTC (rev 3602)
@@ -23,14 +23,14 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 1.1.10
+PROJECT_NUMBER = 1.2~beta2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = debian/speex-doc/usr/share/doc/speex-doc/
+OUTPUT_DIRECTORY = doc
# The OUTPUT_LANGUAGE tag is used to specify the language in which all
# documentation generated by doxygen is written. Doxygen will use this
@@ -544,7 +544,7 @@
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
-GENERATE_LATEX = YES
+GENERATE_LATEX = NO
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
Deleted: speex/trunk/debian/libspeex-dev.dirs
===================================================================
--- speex/trunk/debian/libspeex-dev.dirs 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/libspeex-dev.dirs 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1,3 +0,0 @@
-usr/include
-usr/lib
-usr/lib/pkgconfig
Deleted: speex/trunk/debian/libspeex-dev.files
===================================================================
--- speex/trunk/debian/libspeex-dev.files 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/libspeex-dev.files 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1,5 +0,0 @@
-usr/include
-usr/lib/libspeex.la
-usr/lib/libspeex.a
-usr/lib/libspeex.so
-usr/lib/pkgconfig
Copied: speex/trunk/debian/libspeex-dev.install (from rev 3582, speex/trunk/debian/libspeex-dev.files)
===================================================================
--- speex/trunk/debian/libspeex-dev.install (rev 0)
+++ speex/trunk/debian/libspeex-dev.install 2007-05-25 09:20:32 UTC (rev 3602)
@@ -0,0 +1,6 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
+usr/lib/*.la
+usr/share/pkgconfig/*
Deleted: speex/trunk/debian/libspeex1.dirs
===================================================================
--- speex/trunk/debian/libspeex1.dirs 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/libspeex1.dirs 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1 +0,0 @@
-usr/lib
Deleted: speex/trunk/debian/libspeex1.files
===================================================================
--- speex/trunk/debian/libspeex1.files 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/libspeex1.files 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1,2 +0,0 @@
-/usr/lib/libspeex.so.1
-/usr/lib/libspeex.so.1.2.0
Copied: speex/trunk/debian/libspeex1.install (from rev 3582, speex/trunk/debian/libspeex1.files)
===================================================================
--- speex/trunk/debian/libspeex1.install (rev 0)
+++ speex/trunk/debian/libspeex1.install 2007-05-25 09:20:32 UTC (rev 3602)
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
Modified: speex/trunk/debian/rules
===================================================================
--- speex/trunk/debian/rules 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/rules 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1,172 +1,26 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 by Joey Hess.
-#
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
+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
-# 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)
+DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
+clean::
+ rm -f config.log
+ rm -fR doc/html doc/man doc/latex
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-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$$//')
-
-FILENAME := speex_$(UPVERSION).orig.tar.gz
-URL := http://downloads.us.xiph.org/releases/speex/speex-$(UPVERSION).tar.gz
-
-maintainer-automake:
- # Add here commands to configure the package.
- libtoolize --force --copy
- aclocal
- automake
- autoconf
-
-config.status:
- dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-shared --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-build-arch: config.status build-arch-stamp
-build-arch-stamp:
- dh_testdir
-
- # Add here command to compile/build the package.
- $(MAKE)
-
- touch build-arch-stamp
-
-build-indep: config.status build-indep-stamp
-build-indep-stamp:
- dh_testdir
-
- # Add here command to compile/build the arch indep package.
- # It's ok not to do anything here, if you don't need to build
- # anything for this package.
- #/usr/bin/docbook-to-man debian/speex.sgml > speex.1
-
- touch build-indep-stamp
-
-build: build-arch build-indep
-
-clean: clean-patched
-clean-patched:
- dh_testdir
- dh_testroot
-
- # Add here commands to clean up after the build process.
- -cd src && make clean
- -$(MAKE) distclean
- -rm -f config.log
-
- dh_clean
-
-automakeclean:
- rm -f libspeex/Makefile.in src/Makefile.in
- rm -f Makefile.in config.guess config.sub
- rm -rf $(CURDIR)/debian/tmp
- rm -f config.status build-arch-stamp build-indep-stamp
-
-install: DH_OPTIONS=
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/speex.
- mkdir $(CURDIR)/debian/tmp
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- cp -p speex.pc debian/tmp/usr/lib/pkgconfig/
-
- dh_movefiles
-
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: build install
- cp -p doc/manual.pdf debian/speex-doc/usr/share/doc/speex-doc/
+build/speex-doc::
doxygen debian/doxyfile
- dh_testdir -i
- dh_testroot -i
-# dh_installdebconf -i
- dh_installdocs -i
- dh_installexamples -i
- dh_installmenu -i
-# dh_installlogrotate -i
-# dh_installemacsen -i
-# dh_installpam -i
-# dh_installmime -i
-# dh_installinit -i
- dh_installcron -i
- dh_installman -i
- dh_installinfo -i
-# dh_undocumented -i
- dh_installchangelogs ChangeLog -i
- dh_link -i
- dh_compress --exclude=.pdf -i
- dh_fixperms -i
- dh_installdeb -i
-# dh_perl -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
-# dh_installdebconf -a
- dh_installdocs -a
- dh_installexamples -a
- dh_installmenu -a
-# dh_installlogrotate -a
-# dh_installemacsen -a
-# dh_installpam -a
-# dh_installmime -a
-# dh_installinit -a
- dh_installcron -a
- dh_installman -a
- dh_installinfo -a
-# dh_undocumented -a
- dh_installchangelogs ChangeLog -a
- dh_strip -a
- dh_link -a
- dh_compress -a
- gzip -v9 debian/speex/usr/share/doc/speex/ChangeLog
- dh_fixperms -a
- dh_makeshlibs -a -V "libspeex1 (>= 1.1.8)"
- dh_installdeb -a
-# dh_perl -a
- dh_shlibdeps -ldebian/libspeex1/usr/lib -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
print-version:
- @@echo "Debian version: $(DEBVERSION)"
- @@echo "Upstream version: $(UPVERSION)"
+ @@echo "Debian version: $(DEB_VERSION)"
+ @@echo "Upstream version: $(DEB_UPSTREAM_VERSION)"
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@echo Downloading $(FILENAME) from $(URL) ...
@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
Deleted: speex/trunk/debian/speex-doc.dirs
===================================================================
--- speex/trunk/debian/speex-doc.dirs 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/speex-doc.dirs 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1 +0,0 @@
-/usr/share/doc/speex-doc
Added: speex/trunk/debian/speex-doc.docs
===================================================================
--- speex/trunk/debian/speex-doc.docs (rev 0)
+++ speex/trunk/debian/speex-doc.docs 2007-05-25 09:20:32 UTC (rev 3602)
@@ -0,0 +1,2 @@
+doc/*.pdf
+doc/html
Added: speex/trunk/debian/speex-doc.manpages
===================================================================
--- speex/trunk/debian/speex-doc.manpages (rev 0)
+++ speex/trunk/debian/speex-doc.manpages 2007-05-25 09:20:32 UTC (rev 3602)
@@ -0,0 +1 @@
+doc/man/man3/*
Deleted: speex/trunk/debian/speex.dirs
===================================================================
--- speex/trunk/debian/speex.dirs 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/speex.dirs 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1 +0,0 @@
-usr/bin
Deleted: speex/trunk/debian/speex.files
===================================================================
--- speex/trunk/debian/speex.files 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/speex.files 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1 +0,0 @@
-usr/bin
Copied: speex/trunk/debian/speex.install (from rev 3582, speex/trunk/debian/speex.files)
===================================================================
--- speex/trunk/debian/speex.install (rev 0)
+++ speex/trunk/debian/speex.install 2007-05-25 09:20:32 UTC (rev 3602)
@@ -0,0 +1 @@
+usr/bin
Modified: speex/trunk/debian/speex.manpages
===================================================================
--- speex/trunk/debian/speex.manpages 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/speex.manpages 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1,3 +1 @@
src/*.1
-debian/testenc.1
-debian/testenc_wb.1
Deleted: speex/trunk/debian/testenc.1
===================================================================
--- speex/trunk/debian/testenc.1 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/testenc.1 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1,41 +0,0 @@
-.TH "testenc.c" 3 "9 Sep 2002" "speex" \" -*- nroff -*-
-.ad l
-.nh
-.SH NAME
-testenc.c \-
-.SH SYNOPSIS
-.br
-.PP
-\fC#include 'speex.h'\fP
-.br
-\fC#include <stdio.h>\fP
-.br
-\fC#include <stdlib.h>\fP
-.br
-\fC#include <math.h>\fP
-.br
-.SS "Defines"
-
-.in +1c
-.ti -1c
-.RI "#define \fBFRAME_SIZE\fP 160"
-.br
-.in -1c
-.SS "Functions"
-
-.in +1c
-.ti -1c
-.RI "int \fBmain\fP (int argc, char **\fBargv\fP)"
-.br
-.in -1c
-.SH "DEFINE DOCUMENTATION"
-.PP
-.SS "#define FRAME_SIZE 160"
-.PP
-.SH "FUNCTION DOCUMENTATION"
-.PP
-.SS "int main (int argc, char ** argv)"
-.PP
-.SH "AUTHOR"
-.PP
-Generated automatically by Doxygen for speex from the source code.
Deleted: speex/trunk/debian/testenc_wb.1
===================================================================
--- speex/trunk/debian/testenc_wb.1 2007-05-24 13:58:33 UTC (rev 3601)
+++ speex/trunk/debian/testenc_wb.1 2007-05-25 09:20:32 UTC (rev 3602)
@@ -1,41 +0,0 @@
-.TH "testenc_wb.c" 3 "9 Sep 2002" "speex" \" -*- nroff -*-
-.ad l
-.nh
-.SH NAME
-testenc_wb.c \-
-.SH SYNOPSIS
-.br
-.PP
-\fC#include 'speex.h'\fP
-.br
-\fC#include <stdio.h>\fP
-.br
-\fC#include <stdlib.h>\fP
-.br
-\fC#include <math.h>\fP
-.br
-.SS "Defines"
-
-.in +1c
-.ti -1c
-.RI "#define \fBFRAME_SIZE\fP 320"
-.br
-.in -1c
-.SS "Functions"
-
-.in +1c
-.ti -1c
-.RI "int \fBmain\fP (int argc, char **\fBargv\fP)"
-.br
-.in -1c
-.SH "DEFINE DOCUMENTATION"
-.PP
-.SS "#define FRAME_SIZE 320"
-.PP
-.SH "FUNCTION DOCUMENTATION"
-.PP
-.SS "int main (int argc, char ** argv)"
-.PP
-.SH "AUTHOR"
-.PP
-Generated automatically by Doxygen for speex from the source code.
More information about the Pkg-voip-commits
mailing list