[Pkg-voip-commits] r4116 - libosip2/trunk/debian

msp at alioth.debian.org msp at alioth.debian.org
Sun Aug 19 09:32:44 UTC 2007


Author: msp
Date: 2007-08-19 09:32:43 +0000 (Sun, 19 Aug 2007)
New Revision: 4116

Added:
   libosip2/trunk/debian/libosip2-dev.manpages
Removed:
   libosip2/trunk/debian/libosip2-3.manpages
Modified:
   libosip2/trunk/debian/changelog
   libosip2/trunk/debian/control
   libosip2/trunk/debian/rules
Log:
* New upstream release (Closes: #421509)
* libosip2-dev Depends: pkg-config
* Switch to cdbs
* Ack NMU
  - libosip2-dev: libosip2.pc is missing (Closes: #328825)
  - libosip2-3: please provide osip.1 upstream man page (Closes:
  #366037)
  - Link in description doesn't exist (Closes: #352251)
* Add Build-Depends: docbook-utils to generate osip(1)

Modified: libosip2/trunk/debian/changelog
===================================================================
--- libosip2/trunk/debian/changelog	2007-08-19 09:20:53 UTC (rev 4115)
+++ libosip2/trunk/debian/changelog	2007-08-19 09:32:43 UTC (rev 4116)
@@ -1,15 +1,27 @@
 libosip2 (3.0.3-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-  * New upstream release.
+  * New upstream release (Closes: #421509)
+
+  [ Kilian Krause ]
   * debian/control:
     - Import into pkg-voip.
     - Use binary:Version stanza to allow clean binNMUs.
       Bump to dpkg-dev (>= 1.13.19)
   * debian/watch: Update.
 
- -- Kilian Krause <kilian at debian.org>  Sat, 18 Aug 2007 21:25:34 +0200
+  [ Mark Purcell ]
+  * libosip2-dev Depends: pkg-config
+  * Switch to cdbs
+  * Ack NMU
+    - libosip2-dev: libosip2.pc is missing (Closes: #328825)
+    - libosip2-3: please provide osip.1 upstream man page (Closes:
+    #366037)
+    - Link in description doesn&#39;t exist (Closes: #352251)
+  * Add Build-Depends: docbook-utils to generate osip(1)
 
+ -- Mark Purcell <msp at debian.org>  Sun, 19 Aug 2007 10:31:44 +0100
+
 libosip2 (2.2.2-3.1) unstable; urgency=low
 
   * Non-maintainer upload.

Modified: libosip2/trunk/debian/control
===================================================================
--- libosip2/trunk/debian/control	2007-08-19 09:20:53 UTC (rev 4115)
+++ libosip2/trunk/debian/control	2007-08-19 09:32:43 UTC (rev 4116)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian VoIP Maintainers <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Anand Kumria <wildfire at progsoc.org>, ARAKI Yasuhiro <ar at debian.org>, Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>= 4.0.0), automake1.8, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 4.0.0), automake1.8, dpkg-dev (>= 1.13.19), docbook-utils
 Standards-Version: 3.7.2
 
 Package: libosip2-dev
 Section: libdevel
 Architecture: any
-Depends: libosip2-3 (= ${binary:Version})
+Depends: libosip2-3 (= ${binary:Version}), pkg-config
 Description: development files for the SIP library
  libosip2 header files and static libraries to assist in development of
  programs wishing to use SIP. 

Deleted: libosip2/trunk/debian/libosip2-3.manpages
===================================================================
--- libosip2/trunk/debian/libosip2-3.manpages	2007-08-19 09:20:53 UTC (rev 4115)
+++ libosip2/trunk/debian/libosip2-3.manpages	2007-08-19 09:32:43 UTC (rev 4116)
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/osip.1

Copied: libosip2/trunk/debian/libosip2-dev.manpages (from rev 4114, libosip2/trunk/debian/libosip2-3.manpages)
===================================================================
--- libosip2/trunk/debian/libosip2-dev.manpages	                        (rev 0)
+++ libosip2/trunk/debian/libosip2-dev.manpages	2007-08-19 09:32:43 UTC (rev 4116)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/osip.1

Modified: libosip2/trunk/debian/rules
===================================================================
--- libosip2/trunk/debian/rules	2007-08-19 09:20:53 UTC (rev 4115)
+++ libosip2/trunk/debian/rules	2007-08-19 09:32:43 UTC (rev 4116)
@@ -1,117 +1,16 @@
 #!/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)
-
-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$$//')
-
-FILENAME := libosip2_$(UPVERSION).orig.tar.gz
-UPFILENAME := libosip2-$(UPVERSION).tar.gz
+FILENAME := libosip2_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+UPFILENAME := libosip2-$(DEB_UPSTREAM_VERSION).tar.gz
 URL := http://ftp.gnu.org/gnu/osip/$(UPFILENAME)
 
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-CFLAGS = -Wall -g
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-gperf --enable-pthread
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp --list-missing
 
-# 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)}'`
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-gperf --enable-pthread
-
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ]||$(MAKE) distclean
-	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 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 ChangeLog
-	dh_installdocs
-	dh_installexamples
-
-	dh_install --sourcedir=debian/tmp --list-missing
-#	dh_movefiles
-
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
@@ -122,5 +21,3 @@
 	@@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 




More information about the Pkg-voip-commits mailing list