[Pkg-voip-commits] r3082 - srtp/trunk/debian

Mon Jan 29 19:48:09 CET 2007

Author: js
Date: 2007-01-29 19:48:09 +0100 (Mon, 29 Jan 2007)
New Revision: 3082

Removed:
   srtp/trunk/debian/dirs
   srtp/trunk/debian/docs
   srtp/trunk/debian/srtp-dev.dirs
Modified:
   srtp/trunk/debian/control
   srtp/trunk/debian/rules
Log:
Switch to using CDBS. Comment out seemingly unnecessary include/srtp symlinking.

Modified: srtp/trunk/debian/control
===================================================================

--- srtp/trunk/debian/control	2007-01-29 18:05:04 UTC (rev 3081)
+++ srtp/trunk/debian/control	2007-01-29 18:48:09 UTC (rev 3082)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mikael Magnusson <mikma at users.sourceforge.net>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, dpatch
+Build-Depends: cdbs, debhelper (>= 4.0.0), autotools-dev, dpatch
 Standards-Version: 3.7.2
 Section: libs
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/

Deleted: srtp/trunk/debian/dirs
===================================================================
--- srtp/trunk/debian/dirs	2007-01-29 18:05:04 UTC (rev 3081)
+++ srtp/trunk/debian/dirs	2007-01-29 18:48:09 UTC (rev 3082)
@@ -1 +0,0 @@
-usr/lib

Deleted: srtp/trunk/debian/docs
===================================================================
--- srtp/trunk/debian/docs	2007-01-29 18:05:04 UTC (rev 3081)
+++ srtp/trunk/debian/docs	2007-01-29 18:48:09 UTC (rev 3082)
@@ -1,2 +0,0 @@
-README
-TODO

Modified: srtp/trunk/debian/rules
===================================================================
--- srtp/trunk/debian/rules	2007-01-29 18:05:04 UTC (rev 3081)
+++ srtp/trunk/debian/rules	2007-01-29 18:48:09 UTC (rev 3082)
@@ -1,98 +1,38 @@
 #!/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.
+# -*- mode: makefile; coding: utf-8 -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-include /usr/share/dpatch/dpatch.make
-
-# 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 -D_REENTRANT
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-stdout --enable-syslog
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-debug
 else
-	CFLAGS += -O2
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-debug
 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$$//' )
+DEB_MAKE_CLEAN_TARGET = superclean
 
-FILENAME := srtp_$(UPVERSION).orig.tar.gz
-SRCDIR := srtp
-DFSGNAME := srtp_$(UPVERSION).dfsg.orig.tar.gz
-URL := http://srtp.sourceforge.net/srtp-$(UPVERSION).tgz
 
-config: patch configure-stamp
-configure-stamp:
-	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
-	ln -sfT . include/srtp
-	touch configure-stamp
+# Why this link, Mikael? Seems to build correctly without it...
 
-build: build-stamp
-build-stamp:  config
-	dh_testdir
+#common-configure-arch::
+#	ln -sfT . include/srtp
 
-	$(MAKE) libsrtp.a
+#clean::
+#	$(RM) -f include/srtp
 
-	touch build-stamp
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
+FILENAME := $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+DFSGNAME := $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).dfsg.orig.tar.gz
+URL := http://srtp.sourceforge.net/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tgz
 
-	-$(MAKE) superclean
+SRCDIR := srtp
 
-	$(RM) -f include/srtp
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_install
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
 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
@@ -112,5 +52,4 @@
 	@@rm -rf ../tarballs/dfsg
 	@@rm -f ../tarballs/$(FILENAME)
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install config print-version get-orig-source
+DEB_PHONY_RULES += print-version get-orig-source

Deleted: srtp/trunk/debian/srtp-dev.dirs
===================================================================
--- srtp/trunk/debian/srtp-dev.dirs	2007-01-29 18:05:04 UTC (rev 3081)
+++ srtp/trunk/debian/srtp-dev.dirs	2007-01-29 18:48:09 UTC (rev 3082)
@@ -1,2 +0,0 @@
-usr/lib
-usr/include


