[Pkg-voip-commits] r5354 - in /rtpproxy/trunk/debian: changelog control rules

[marcusb-guest at alioth.debian.org]

Author: marcusb-guest
Date: Sun Mar 23 14:43:08 2008
New Revision: 5354

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5354
Log:
* Run autotools during build.

Modified:
    rtpproxy/trunk/debian/changelog
    rtpproxy/trunk/debian/control
    rtpproxy/trunk/debian/rules

Modified: rtpproxy/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/changelog?rev=5354&op=diff
==============================================================================
--- rtpproxy/trunk/debian/changelog (original)
+++ rtpproxy/trunk/debian/changelog Sun Mar 23 14:43:08 2008
@@ -9,6 +9,7 @@
   * debian/control: Bump Standards-Version to 3.7.3 and compat version to 5.
   * debian/rules: Clean up.
   * debian/watch: Removed outdated file.
+  * Run autotools during build.
   
   [ Kilian Krause ]
   * Don't ignore make clean error.

Modified: rtpproxy/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/control?rev=5354&op=diff
==============================================================================
--- rtpproxy/trunk/debian/control (original)
+++ rtpproxy/trunk/debian/control Sun Mar 23 14:43:08 2008
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Jan Janak <jan at iptel.org>, Kilian Krause <kilian at debian.org>, Marcus Better <marcus at better.se>
-Build-Depends: debhelper (>= 5), autotools-dev, xsltproc, docbook-xsl
+Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake1.10, xsltproc, docbook-xsl
+Build-Conflicts: autoconf2.13, automake1.4
 Standards-Version: 3.7.3
 Homepage: http://www.rtpproxy.org
 Vcs-Svn: svn://svn.debian.org/pkg-voip/rtpproxy/trunk/

Modified: rtpproxy/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/rules?rev=5354&op=diff
==============================================================================
--- rtpproxy/trunk/debian/rules (original)
+++ rtpproxy/trunk/debian/rules Sun Mar 23 14:43:08 2008
@@ -1,8 +1,13 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
+else
+	CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
 
 CFLAGS = -Wall -g
 
@@ -22,15 +27,23 @@
 
 MANPAGE := debian/$(PKGNAME).8
 
-config.status: configure
+configure:
+	autoreconf --force --install
+
+configure-stamp: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc 
+	rm -f config.sub config.guess
+	ln -sf /usr/share/misc/config.sub .
+	ln -sf /usr/share/misc/config.guess .
+	rm -f config.cache
+	./configure CFLAGS="$(CFLAGS)" --prefix=/usr --sysconfdir=/etc
+	touch configure-stamp
 
 $(MANPAGE): debian/manpage.xml
 	xsltproc -nonet -o $@ /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl $<
 
 build: build-stamp
-build-stamp:  config.status $(MANPAGE)
+build-stamp: configure-stamp $(MANPAGE)
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
@@ -38,11 +51,12 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp debian/rtpproxy.8 
-	[ ! -f Makefile ]||$(MAKE) distclean
-	cp -f /usr/share/misc/config.sub config.sub
-	cp -f /usr/share/misc/config.guess config.guess
-	dh_clean 
+	-rm -f build-stamp configure-stamp
+	-rm -f debian/rtpproxy.8 
+	[ ! -f Makefile ] || $(MAKE) distclean
+	-rm -f Makefile.in aclocal.m4 config.sub config.guess config.h.in \
+		configure depcomp install-sh ltmain.sh missing mkinstalldirs
+	dh_clean
 
 install: build
 	dh_testdir
@@ -82,4 +96,4 @@
 	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install print-version get-orig-source
+.PHONY: build clean binary-indep binary-arch binary install configure-stamp print-version get-orig-source