[Pkg-voip-commits] r9344 - in /libccrtp/trunk/debian: changelog compat control libccrtp-dev.install libccrtp0.install libccrtp1-1.8-0.install patches/ patches/series patches/without-demo rules source/ source/format

msp at alioth.debian.org msp at alioth.debian.org
Sat Oct 29 01:50:29 UTC 2011 

Author: msp
Date: Sat Oct 29 01:50:29 2011
New Revision: 9344

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9344
Log:
* NEW package libccrtp0 - match-soname
* Switch to dpkg-source 3.0 (quilt) format
  - Drop cdbs 
* demo/ FTBFS: include debian/patches/without-demo
* *.install usr/lib/* -> usr/lib/*/*
* Added 9 package-needs-versioned-debhelper-build-depends
* Pre-Depend: multiarch-support - missing-pre-dependency-on-multiarch-
  support

Added:
    libccrtp/trunk/debian/libccrtp0.install
      - copied, changed from r9343, libccrtp/trunk/debian/libccrtp1-1.8-0.install
    libccrtp/trunk/debian/patches/
    libccrtp/trunk/debian/patches/series
    libccrtp/trunk/debian/patches/without-demo
    libccrtp/trunk/debian/source/
    libccrtp/trunk/debian/source/format
Removed:
    libccrtp/trunk/debian/libccrtp1-1.8-0.install
Modified:
    libccrtp/trunk/debian/changelog
    libccrtp/trunk/debian/compat
    libccrtp/trunk/debian/control
    libccrtp/trunk/debian/libccrtp-dev.install
    libccrtp/trunk/debian/rules

Modified: libccrtp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/changelog?rev=9344&op=diff
==============================================================================
--- libccrtp/trunk/debian/changelog (original)
+++ libccrtp/trunk/debian/changelog Sat Oct 29 01:50:29 2011
@@ -1,8 +1,16 @@
-libccrtp (2.0.0-1) UNRELEASED; urgency=low
-
-  * New upstream release
-
- -- Mark Purcell <msp at debian.org>  Sat, 11 Jun 2011 08:54:40 +1000
+libccrtp (2.0.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * NEW package libccrtp0 - match-soname
+  * Switch to dpkg-source 3.0 (quilt) format
+    - Drop cdbs 
+  * demo/ FTBFS: include debian/patches/without-demo
+  * *.install usr/lib/* -> usr/lib/*/*
+  * Added 9 package-needs-versioned-debhelper-build-depends
+  * Pre-Depend: multiarch-support - missing-pre-dependency-on-multiarch-
+    support
+
+ -- Mark Purcell <msp at debian.org>  Sat, 29 Oct 2011 12:50:11 +1100
 
 libccrtp (1.8.0-1) unstable; urgency=low
 

Modified: libccrtp/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/compat?rev=9344&op=diff
==============================================================================
--- libccrtp/trunk/debian/compat (original)
+++ libccrtp/trunk/debian/compat Sat Oct 29 01:50:29 2011
@@ -1,1 +1,1 @@
-7
+9

Modified: libccrtp/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/control?rev=9344&op=diff
==============================================================================
--- libccrtp/trunk/debian/control (original)
+++ libccrtp/trunk/debian/control Sat Oct 29 01:50:29 2011
@@ -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>, Mikael Magnusson <mikma at users.sourceforge.net>, Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>= 7), libcommoncpp2-dev (>= 1.3.21-2), libxml2-dev, doxygen, cdbs, libgcrypt11-dev | libgcrypt-dev, pkg-config, autotools-dev, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 9), libcommoncpp2-dev (>= 1.3.21-2), libxml2-dev, doxygen, libgcrypt11-dev | libgcrypt-dev, pkg-config, autotools-dev, dpkg-dev (>= 1.13.19)
 Standards-Version: 3.8.0
 Homepage: http://www.gnu.org/software/ccrtp/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/libccrtp/trunk/
@@ -12,7 +12,7 @@
 Package: libccrtp-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libccrtp1-1.8-0 (= ${binary:Version}),
+Depends: ${misc:Depends}, libccrtp0 (= ${binary:Version}),
  libc6-dev, libcommoncpp2-dev (>= 1.3.21-2), pkg-config
 Description: Common C++ class framework for RTP packets
  GNU ccRTP is a GNU Common C++ based high performance RTP stack. RTP is
@@ -41,7 +41,7 @@
  streaming with different underlying transport protocols, not just
  with IPV4 UDP sockets. 
 
-Package: libccrtp1-1.8-0
+Package: libccrtp0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -56,6 +56,7 @@
 Package: libccrtp-doc
 Replaces: libccrtp-dev (<= 1.6.1-1)
 Section: doc
+Pre-Depend: multiarch-support
 Architecture: all
 Depends: ${misc:Depends}
 Description: Documentation files for  GNU ccRTPp library

Modified: libccrtp/trunk/debian/libccrtp-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/libccrtp-dev.install?rev=9344&op=diff
==============================================================================
--- libccrtp/trunk/debian/libccrtp-dev.install (original)
+++ libccrtp/trunk/debian/libccrtp-dev.install Sat Oct 29 01:50:29 2011
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
+usr/lib/*/*.la

Copied: libccrtp/trunk/debian/libccrtp0.install (from r9343, libccrtp/trunk/debian/libccrtp1-1.8-0.install)
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/libccrtp0.install?rev=9344&op=diff
==============================================================================
--- libccrtp/trunk/debian/libccrtp1-1.8-0.install (original)
+++ libccrtp/trunk/debian/libccrtp0.install Sat Oct 29 01:50:29 2011
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Added: libccrtp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/patches/series?rev=9344&op=file
==============================================================================
--- libccrtp/trunk/debian/patches/series (added)
+++ libccrtp/trunk/debian/patches/series Sat Oct 29 01:50:29 2011
@@ -1,0 +1,1 @@
+without-demo

Added: libccrtp/trunk/debian/patches/without-demo
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/patches/without-demo?rev=9344&op=file
==============================================================================
--- libccrtp/trunk/debian/patches/without-demo (added)
+++ libccrtp/trunk/debian/patches/without-demo Sat Oct 29 01:50:29 2011
@@ -1,0 +1,62 @@
+Index: libccrtp-2.0.1/Makefile.am
+===================================================================
+--- libccrtp-2.0.1.orig/Makefile.am	2011-05-29 07:47:59.000000000 +1000
++++ libccrtp-2.0.1/Makefile.am	2011-10-29 12:32:50.000000000 +1100
+@@ -14,8 +14,8 @@
+ EXTRA_DIST = autogen.sh ccrtp.spec ccrtp.spec.in COPYING.addendum \
+     ccrtp.list ccrtp.list.in libccrtp.pc libccrtp.pc.in autoconf/*
+ 
+-SUBDIRS = src demo doc
+-DIST_SUBDIRS = m4 src phone doc demo w32
++SUBDIRS = src doc
++DIST_SUBDIRS = m4 src phone doc w32
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libccrtp.pc
+Index: libccrtp-2.0.1/Makefile.in
+===================================================================
+--- libccrtp-2.0.1.orig/Makefile.in	2011-07-10 22:14:55.000000000 +1000
++++ libccrtp-2.0.1/Makefile.in	2011-10-29 12:32:50.000000000 +1100
+@@ -291,8 +291,8 @@
+ EXTRA_DIST = autogen.sh ccrtp.spec ccrtp.spec.in COPYING.addendum \
+     ccrtp.list ccrtp.list.in libccrtp.pc libccrtp.pc.in autoconf/*
+ 
+-SUBDIRS = src demo doc
+-DIST_SUBDIRS = m4 src phone doc demo w32
++SUBDIRS = src doc
++DIST_SUBDIRS = m4 src phone doc w32
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libccrtp.pc
+ all: all-recursive
+Index: libccrtp-2.0.1/configure.ac
+===================================================================
+--- libccrtp-2.0.1.orig/configure.ac	2011-07-10 22:14:17.000000000 +1000
++++ libccrtp-2.0.1/configure.ac	2011-10-29 12:32:50.000000000 +1100
+@@ -147,5 +147,5 @@
+ AM_CONDITIONAL(DOXY, test "$DOXYGEN" != "no")
+ 
+ AC_OUTPUT(Makefile m4/Makefile src/Makefile src/ccrtp/Makefile
+-doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec
++doc/Makefile phone/Makefile w32/Makefile ccrtp.spec
+ libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile)
+Index: libccrtp-2.0.1/configure
+===================================================================
+--- libccrtp-2.0.1.orig/configure	2011-07-10 22:14:56.000000000 +1000
++++ libccrtp-2.0.1/configure	2011-10-29 12:33:08.000000000 +1100
+@@ -15628,7 +15628,7 @@
+ fi
+ 
+ 
+-ac_config_files="$ac_config_files Makefile m4/Makefile src/Makefile src/ccrtp/Makefile doc/Makefile demo/Makefile phone/Makefile w32/Makefile ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile"
++ac_config_files="$ac_config_files Makefile m4/Makefile src/Makefile src/ccrtp/Makefile doc/Makefile phone/Makefile w32/Makefile ccrtp.spec libccrtp.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -16726,7 +16726,6 @@
+     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+     "src/ccrtp/Makefile") CONFIG_FILES="$CONFIG_FILES src/ccrtp/Makefile" ;;
+     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+-    "demo/Makefile") CONFIG_FILES="$CONFIG_FILES demo/Makefile" ;;
+     "phone/Makefile") CONFIG_FILES="$CONFIG_FILES phone/Makefile" ;;
+     "w32/Makefile") CONFIG_FILES="$CONFIG_FILES w32/Makefile" ;;
+     "ccrtp.spec") CONFIG_FILES="$CONFIG_FILES ccrtp.spec" ;;

Modified: libccrtp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/rules?rev=9344&op=diff
==============================================================================
--- libccrtp/trunk/debian/rules (original)
+++ libccrtp/trunk/debian/rules Sat Oct 29 01:50:29 2011
@@ -1,17 +1,10 @@
 #!/usr/bin/make -f
 
-FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-URL = http://ftp.gnu.org/pub/gnu/ccrtp/ccrtp-$(DEB_UPSTREAM_VERSION).tar.gz
+export COMMONCPP_CFLAGS=`ucommon-config --cflags`
+export COMMONCPP_LIBS=`ucommon-config --libs`
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+%:
+	dh $@
 
 clean::
 	rm -f doc/latex/* doc/html/* doc/man/man3/* doc/doxy
-
-get-orig-source:
-	@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)

Added: libccrtp/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/source/format?rev=9344&op=file
==============================================================================
--- libccrtp/trunk/debian/source/format (added)
+++ libccrtp/trunk/debian/source/format Sat Oct 29 01:50:29 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the Pkg-voip-commits mailing list