[Pkg-voip-commits] r9178 - in /yate/trunk/debian: changelog control rules

[kilian at alioth.debian.org]

Author: kilian
Date: Tue Jul 26 21:43:45 2011
New Revision: 9178

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9178
Log:
Cleanup debian/rules - partially convert to dh v7 style

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

Modified: yate/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/changelog?rev=9178&op=diff
==============================================================================
--- yate/trunk/debian/changelog (original)
+++ yate/trunk/debian/changelog Tue Jul 26 21:43:45 2011
@@ -3,8 +3,9 @@
   * New upstream version 3.3.2-1
   * Fix debian/watch to pull YATE3 versions
   * Bump to latest h323plus version
-
- -- Kilian Krause <kilian at debian.org>  Tue, 26 Jul 2011 23:26:30 +0200
+  * Cleanup debian/rules - partially convert to dh v7 style
+
+ -- Kilian Krause <kilian at debian.org>  Tue, 26 Jul 2011 23:41:29 +0200
 
 yate (2.2.0-1~dfsg-1) experimental; urgency=low
 

Modified: yate/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/control?rev=9178&op=diff
==============================================================================
--- yate/trunk/debian/control (original)
+++ yate/trunk/debian/control Tue Jul 26 21:43:45 2011
@@ -5,7 +5,7 @@
 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>, Mikael Magnusson <mikma at users.sourceforge.net>, Faidon Liambotis <paravoid at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Build-Depends: debhelper (>= 7),
  autotools-dev,
- autoconf,
+ dh-autoreconf,
  libh323-dev (>= 1.22.0),
  libgsm1-dev,
  dahdi-source,

Modified: yate/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/rules?rev=9178&op=diff
==============================================================================
--- yate/trunk/debian/rules (original)
+++ yate/trunk/debian/rules Tue Jul 26 21:43:45 2011
@@ -1,34 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# 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)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-# FOR AUTOCONF 2.52 AND NEWER ONLY
-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
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
@@ -48,20 +18,17 @@
 endif
 	touch $@
 
-configure:
-	if [ -f configure ]; then cp -a configure configure.sav; fi
-	autoconf
+%:
+	dh $@ --with autotools_dev --with autoreconf --parallel
 
-config.status: check-ilbc configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr \
-	       --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-	       --sysconfdir=/etc --disable-ilbc --without-amrnb \
-	       --without-coredumper
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
+override_dh_auto_configure: check-ilbc 
+	dh_auto_configure --\
+		--disable-ilbc --without-amrnb --without-coredumper
 		#--prefix=/ --exec-prefix=/usr \
 		#--datarootdir=/usr/share --docdir=/usr/share/doc/yate-doc \
-		#--mandir=/usr/share/man --includedir=/usr/include \
 		#--with-openssl --with-libgsm --with-libqt4
 
 build: build-arch build-indep
@@ -78,29 +45,6 @@
 build-indep-stamp: config.status
 	cd share/scripts/yaypm ; python2.5 ./setup.py build
 	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ]||$(MAKE) clean distclean
-	rm -f config.status
-	rm -f config.sub config.guess
-	cp /usr/share/misc/config.sub config.sub
-	cp /usr/share/misc/config.guess config.guess
-	if [ -f configure.sav ]; then mv configure.sav configure; fi
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	# Add here commands to install the package into debian/yate.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	# remove extra files
-	rm -f $(CURDIR)/debian/tmp/usr/share/doc/yate*/COPYING
-	rm -f $(CURDIR)/debian/tmp/usr/share/doc/yate*/ChangeLog
 
 
 # Build architecture-independent files here.