[Pkg-voip-commits] r8113 - in /portaudio19/trunk/debian: changelog compat control libportaudio2.dirs portaudio19-dev.dirs portaudio19-dev.install portaudio19-doc.install rules

bdrung-guest at alioth.debian.org bdrung-guest at alioth.debian.org
Sun Feb 21 21:20:39 UTC 2010 

Author: bdrung-guest
Date: Sun Feb 21 21:20:39 2010
New Revision: 8113

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8113
Log:
* Switch to debhelper 7 and use dh.
* Build agains libjack on all architectures.

Removed:
    portaudio19/trunk/debian/libportaudio2.dirs
    portaudio19/trunk/debian/portaudio19-dev.dirs
Modified:
    portaudio19/trunk/debian/changelog
    portaudio19/trunk/debian/compat
    portaudio19/trunk/debian/control
    portaudio19/trunk/debian/portaudio19-dev.install
    portaudio19/trunk/debian/portaudio19-doc.install
    portaudio19/trunk/debian/rules

Modified: portaudio19/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/portaudio19/trunk/debian/changelog?rev=8113&op=diff
==============================================================================
--- portaudio19/trunk/debian/changelog (original)
+++ portaudio19/trunk/debian/changelog Sun Feb 21 21:20:39 2010
@@ -8,8 +8,10 @@
   * Add myself to Uploaders.
   * Refresh get-orig-source rule.
   * Drop unrequired 01_config.dpatch and dpatch.
+  * Switch to debhelper 7 and use dh.
+  * Build agains libjack on all architectures.
 
- -- Benjamin Drung <bdrung at ubuntu.com>  Sun, 21 Feb 2010 18:30:04 +0100
+ -- Benjamin Drung <bdrung at ubuntu.com>  Sun, 21 Feb 2010 22:12:18 +0100
 
 portaudio19 (19+svn20071022-3) unstable; urgency=low
 

Modified: portaudio19/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/portaudio19/trunk/debian/compat?rev=8113&op=diff
==============================================================================
--- portaudio19/trunk/debian/compat (original)
+++ portaudio19/trunk/debian/compat Sun Feb 21 21:20:39 2010
@@ -1,1 +1,1 @@
-4
+7

Modified: portaudio19/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/portaudio19/trunk/debian/control?rev=8113&op=diff
==============================================================================
--- portaudio19/trunk/debian/control (original)
+++ portaudio19/trunk/debian/control Sun Feb 21 21:20:39 2010
@@ -7,9 +7,11 @@
            Mark Purcell <msp at debian.org>,
            Mikael Magnusson <mikma at users.sourceforge.net>,
            Benjamin Drung <bdrung at ubuntu.com>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev,
- libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 
- libjack-dev, doxygen, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 7.0.50~),
+               doxygen,
+               dpkg-dev (>= 1.13.19),
+               libasound2-dev [linux-any],
+               libjack-dev
 Standards-Version: 3.7.2
 Homepage: http://www.portaudio.com/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/portaudio19/trunk/
@@ -31,7 +33,9 @@
 Package: portaudio19-dev
 Section: devel
 Architecture: any
-Depends: libportaudio2 (= ${binary:Version}), ${alsa-dev}, ${jack-dev}
+Depends: libasound2-dev [linux-any],
+         libjack-dev,
+         libportaudio2 (= ${binary:Version})
 Conflicts: libportaudio-dev, libportaudio19-dev, libportaudio-19-dev
 Replaces: libportaudio19-dev, libportaudio-19-dev
 Description: Portable audio I/O - development files

Modified: portaudio19/trunk/debian/portaudio19-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/portaudio19/trunk/debian/portaudio19-dev.install?rev=8113&op=diff
==============================================================================
--- portaudio19/trunk/debian/portaudio19-dev.install (original)
+++ portaudio19/trunk/debian/portaudio19-dev.install Sun Feb 21 21:20:39 2010
@@ -2,4 +2,4 @@
 usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
-/usr/lib/*.la
+usr/lib/*.la

Modified: portaudio19/trunk/debian/portaudio19-doc.install
URL: http://svn.debian.org/wsvn/pkg-voip/portaudio19/trunk/debian/portaudio19-doc.install?rev=8113&op=diff
==============================================================================
--- portaudio19/trunk/debian/portaudio19-doc.install (original)
+++ portaudio19/trunk/debian/portaudio19-doc.install Sun Feb 21 21:20:39 2010
@@ -1,1 +1,1 @@
-../../doc/html/ /usr/share/doc/portaudio19-doc/doc
+doc/html/ usr/share/doc/portaudio19-doc/doc

Modified: portaudio19/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/portaudio19/trunk/debian/rules?rev=8113&op=diff
==============================================================================
--- portaudio19/trunk/debian/rules (original)
+++ portaudio19/trunk/debian/rules Sun Feb 21 21:20:39 2010
@@ -1,18 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# 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
 
 # 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_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CFLAGS = -Wall -g -D_REENTRANT
 
@@ -21,35 +12,17 @@
 else
 	CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
 
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-	CONFIGURE_SOUND_ARGS = --with-oss=yes --with-alsa=yes
-	DH_GENCONTROL_ARGS = -Valsa-dev="libasound2-dev"
-else
-	CONFIGURE_SOUND_ARGS = --with-oss=yes --with-alsa=no
-endif
+%:
+	dh $@
 
-#
-# pa_ringbuffer required for jack support is only guaranteed
-# SMP safe on i386 and powerpc
-#
-ENABLE_JACK = no
-ifeq (i386,$(DEB_HOST_ARCH))
-	ENABLE_JACK = yes
-else
-ifeq (powerpc,$(DEB_HOST_ARCH))
-	ENABLE_JACK = yes
-endif
-endif
+override_dh_auto_configure:
+	CFLAGS="$(CFLAGS)" ./configure --enable-cxx --prefix=/usr \
+		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
 
-ifeq (yes,$(ENABLE_JACK))
-	DH_GENCONTROL_ARGS += -Vjack-dev="libjack0.100.0-dev"
-endif
-
-CONFIGURE_SOUND_ARGS += --with-jack=$(ENABLE_JACK)
+override_dh_auto_build:
+	$(MAKE)
+	doxygen
 
 DEBVERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
@@ -58,83 +31,6 @@
 FILENAME := portaudio19_$(UPVERSION).orig.tar.gz
 URL := https://www.portaudio.com/repos/portaudio/trunk
 SRCDIR := portaudio19-$(UPVERSION)
-
-autoreconf:
-	aclocal
-	autoconf
-	libtoolize -c
-	$(RM) -r autom4te.cache
-
-config: patch config.status
-config.status:
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-cxx $(CONFIGURE_SOUND_ARGS)
-
-build: config build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE) lib/libportaudio.la
-	$(MAKE) -C bindings/cpp
-	doxygen
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	[ ! -f bindings/cpp/doc/Makefile ]||$(MAKE) -C bindings/cpp/doc distclean
-	[ ! -f bindings/cpp/Makefile ]||$(MAKE) -C bindings/cpp distclean
-	[ ! -f Makefile ]||$(MAKE) distclean
-	$(RM) -r lib/.libs
-	$(RM) doc/html/*
-	$(MAKE) -f $(CURDIR)/debian/rules unpatch
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	
-	install -d $(CURDIR)/debian/tmp/usr/lib
-	install -d $(CURDIR)/debian/tmp/usr/include
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_install -i --sourcedir=debian/tmp
-	dh_compress -i --exclude=usr/share/doc/portaudio19-doc/docs
-	dh_fixperms -i
-	dh_installdeb -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_installchangelogs -a
-	dh_installdocs -a
-	dh_install -a --sourcedir=debian/tmp --list-missing
-	dh_strip -a
-	dh_compress -a --exclude=usr/share/doc/portaudio19-doc/docs
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a -- $(DH_GENCONTROL_ARGS)
-	dh_md5sums -a
-	dh_builddeb -a
-
-print-version:
-	@@echo "Debian version:          $(DEBVERSION)"
-	@@echo "Upstream version:        $(UPVERSION)"
 
 get-orig-source:
 	@dh_testdir
@@ -145,6 +41,3 @@
 	@GZIP=-9 tar -caf ../tarballs/$(FILENAME) -C ../tarballs $(SRCDIR)
 	@echo Cleaning up
 	@rm -rf ../tarballs/$(SRCDIR)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch config autoreconf print-version get-orig-source

More information about the Pkg-voip-commits mailing list