[Pkg-voip-commits] r3391 - libcommoncpp2/trunk/debian

Mark Purcell msp at alioth.debian.org
Thu Apr 12 18:01:30 UTC 2007 

Author: msp
Date: 2007-04-12 18:01:29 +0000 (Thu, 12 Apr 2007)
New Revision: 3391

Added:
   libcommoncpp2/trunk/debian/libcommoncpp2-1.5.3-0.install
   libcommoncpp2/trunk/debian/libcommoncpp2-dev.install
Removed:
   libcommoncpp2/trunk/debian/libcommoncpp2-1.5.3-0.files
   libcommoncpp2/trunk/debian/libcommoncpp2-dev.files
   libcommoncpp2/trunk/debian/libcommoncpp2-dev.manpages
   libcommoncpp2/trunk/debian/libcommoncpp2-doc.files
Modified:
   libcommoncpp2/trunk/debian/changelog
   libcommoncpp2/trunk/debian/control
   libcommoncpp2/trunk/debian/rules
Log:
* Switch to cdbs

Modified: libcommoncpp2/trunk/debian/changelog
===================================================================
--- libcommoncpp2/trunk/debian/changelog	2007-04-12 17:22:11 UTC (rev 3390)
+++ libcommoncpp2/trunk/debian/changelog	2007-04-12 18:01:29 UTC (rev 3391)
@@ -1,12 +1,12 @@
-libcommoncpp2 (1.5.6-2) UNRELEASED; urgency=low
+libcommoncpp2 (1.5.6-2) unstable; urgency=low
 
-  * NOT RELEASED YET
   * Patch from Stephan Suerken fixes
     - threads: isRunning() always returns true (Closes: #410219)
   * Patch from Martin Michlmayr fixes:
     - FTBFS with GCC 4.3: missing #includes (Closes: #417329)
+  * Switch to cdbs
 
- -- Mark Purcell <msp at debian.org>  Thu, 12 Apr 2007 18:18:23 +0100
+ -- Mark Purcell <msp at debian.org>  Thu, 12 Apr 2007 19:01:19 +0100
 
 libcommoncpp2 (1.5.6-1) unstable; urgency=low
 

Modified: libcommoncpp2/trunk/debian/control
===================================================================
--- libcommoncpp2/trunk/debian/control	2007-04-12 17:22:11 UTC (rev 3390)
+++ libcommoncpp2/trunk/debian/control	2007-04-12 18:01:29 UTC (rev 3391)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libxml2-dev, zlib1g-dev, help2man, doxygen, dpatch, libgnutls-dev, libgcrypt11-dev | libgcrypt-dev, autotools-dev
+Build-Depends: debhelper (>> 4.0.0), libxml2-dev, zlib1g-dev, help2man, doxygen, dpatch, libgnutls-dev, libgcrypt11-dev | libgcrypt-dev, autotools-dev, cdbs
 Standards-Version: 3.5.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/

Deleted: libcommoncpp2/trunk/debian/libcommoncpp2-1.5.3-0.files
===================================================================
--- libcommoncpp2/trunk/debian/libcommoncpp2-1.5.3-0.files	2007-04-12 17:22:11 UTC (rev 3390)
+++ libcommoncpp2/trunk/debian/libcommoncpp2-1.5.3-0.files	2007-04-12 18:01:29 UTC (rev 3391)
@@ -1 +0,0 @@
-usr/lib/lib*.so.*

Copied: libcommoncpp2/trunk/debian/libcommoncpp2-1.5.3-0.install (from rev 3378, libcommoncpp2/trunk/debian/libcommoncpp2-1.5.3-0.files)

Deleted: libcommoncpp2/trunk/debian/libcommoncpp2-dev.files
===================================================================
--- libcommoncpp2/trunk/debian/libcommoncpp2-dev.files	2007-04-12 17:22:11 UTC (rev 3390)
+++ libcommoncpp2/trunk/debian/libcommoncpp2-dev.files	2007-04-12 18:01:29 UTC (rev 3391)
@@ -1,7 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/lib*.la
-usr/bin
-usr/share/aclocal
-usr/lib/pkgconfig

Copied: libcommoncpp2/trunk/debian/libcommoncpp2-dev.install (from rev 3378, libcommoncpp2/trunk/debian/libcommoncpp2-dev.files)
===================================================================
--- libcommoncpp2/trunk/debian/libcommoncpp2-dev.files	2007-04-10 13:02:14 UTC (rev 3378)
+++ libcommoncpp2/trunk/debian/libcommoncpp2-dev.install	2007-04-12 18:01:29 UTC (rev 3391)
@@ -0,0 +1,7 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/lib*.la
+usr/bin/*
+usr/share/aclocal/*
+usr/lib/pkgconfig/*

Deleted: libcommoncpp2/trunk/debian/libcommoncpp2-dev.manpages
===================================================================
--- libcommoncpp2/trunk/debian/libcommoncpp2-dev.manpages	2007-04-12 17:22:11 UTC (rev 3390)
+++ libcommoncpp2/trunk/debian/libcommoncpp2-dev.manpages	2007-04-12 18:01:29 UTC (rev 3391)
@@ -1 +0,0 @@
-ccgnu2-config.8

Deleted: libcommoncpp2/trunk/debian/libcommoncpp2-doc.files
===================================================================
--- libcommoncpp2/trunk/debian/libcommoncpp2-doc.files	2007-04-12 17:22:11 UTC (rev 3390)
+++ libcommoncpp2/trunk/debian/libcommoncpp2-doc.files	2007-04-12 18:01:29 UTC (rev 3391)
@@ -1 +0,0 @@
-usr/share/info

Modified: libcommoncpp2/trunk/debian/rules
===================================================================
--- libcommoncpp2/trunk/debian/rules	2007-04-12 17:22:11 UTC (rev 3390)
+++ libcommoncpp2/trunk/debian/rules	2007-04-12 18:01:29 UTC (rev 3391)
@@ -1,33 +1,4 @@
 #!/usr/bin/make -f
-# 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)
-
-include /usr/share/dpatch/dpatch.make
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
 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$$//')
@@ -35,98 +6,12 @@
 FILENAME := libcommoncpp2_$(UPVERSION).orig.tar.gz
 URL := http://ftp.gnu.org/pub/gnu/commoncpp/commoncpp2-$(UPVERSION).tar.gz
 
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-	-test -r /usr/share/misc/config.sub && \
-	  cp -f /usr/share/misc/config.sub autoconf/config.sub
-	-test -r /usr/share/misc/config.guess && \
-	  cp -f /usr/share/misc/config.guess autoconf/config.guess
+DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
 
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr --mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info CFLAGS="" CXXFLAGS=""
-
-
-build: patch build-stamp
-build-stamp: config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	chmod +x src/ccgnu2-config
-	/usr/bin/help2man -N -S 'Debian GNU/Linux' -o ccgnu2-config.8 src/ccgnu2-config \
-	 -n 'script to get information about the installed version of libcommoncpp2'
-
-	touch build-stamp
-
-clean: clean-patched unpatch
-
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-
-	# Cleanup what distclean doesn't :-)
-	rm -f Makefile */Makefile freebsd/pkg-plist include/cc++/config.tmp \
-		include/cc++/config.h ccgnu-config.8
-	rm -f doc/html/* doc/man/man3/* doc/latex/*
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) install info prefix=$(CURDIR)/debian/tmp/usr
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_movefiles -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installman -i
-	dh_installinfo -i
-	dh_installchangelogs -i ChangeLog
-	dh_link -i
-	dh_compress -i -Xexamples/
-	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
-	dh_testroot
-	dh_movefiles -s
-	dh_installdocs -s
-	dh_installexamples -s
-	dh_installman -s
-	dh_installinfo -s
-	dh_installchangelogs -s ChangeLog
-	dh_link -s
-	dh_strip -s
-	dh_compress -s -Xexamples/
-	dh_fixperms -s
-	dh_makeshlibs -s
-	dh_installdeb -s
-	dh_shlibdeps -s
-	dh_gencontrol -s
-	dh_md5sums -s
-	dh_builddeb -s
-
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
@@ -137,5 +22,7 @@
 	@@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 
+help2man:
+	chmod +x src/ccgnu2-config
+	/usr/bin/help2man -N -S 'Debian GNU/Linux' -o ccgnu2-config.8 src/ccgnu2-config \
+	    -n 'script to get information about the installed version of libcommoncpp2'

More information about the Pkg-voip-commits mailing list