[Pkg-voip-commits] r10029 - in /libccrtp/trunk/debian: changelog patches/without-demo

[msp at alioth.debian.org]

Author: msp
Date: Thu Nov 22 04:51:12 2012
New Revision: 10029

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10029
Log:
* New upstream release
* Refreshed patch without-demo

Modified:
    libccrtp/trunk/debian/changelog
    libccrtp/trunk/debian/patches/without-demo

Modified: libccrtp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/changelog?rev=10029&op=diff
==============================================================================
--- libccrtp/trunk/debian/changelog (original)
+++ libccrtp/trunk/debian/changelog Thu Nov 22 04:51:12 2012
@@ -1,3 +1,10 @@
+libccrtp (2.0.5-1) experimental; urgency=low
+
+  * New upstream release
+  * Refreshed patch without-demo
+
+ -- Mark Purcell <msp at debian.org>  Thu, 22 Nov 2012 15:50:21 +1100
+
 libccrtp (2.0.3-4) unstable; urgency=low
 
   * wheezey polish - lintian clean

Modified: libccrtp/trunk/debian/patches/without-demo
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/patches/without-demo?rev=10029&op=diff
==============================================================================
--- libccrtp/trunk/debian/patches/without-demo (original)
+++ libccrtp/trunk/debian/patches/without-demo Thu Nov 22 04:51:12 2012
@@ -1,12 +1,12 @@
 Description: demo/ FTBFS
 
-Index: libccrtp-2.0.1/Makefile.am
+Index: libccrtp-2.0.5/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/*
+--- libccrtp-2.0.5.orig/Makefile.am	2012-11-21 00:47:13.000000000 +1100
++++ libccrtp-2.0.5/Makefile.am	2012-11-22 15:44:37.000000000 +1100
+@@ -15,8 +15,8 @@
+     ccrtp.list ccrtp.list.in libccrtp.pc libccrtp.pc.in autoconf/* \
+     ccrtp-config.h directive.in
  
 -SUBDIRS = src demo doc
 -DIST_SUBDIRS = m4 src phone doc demo w32
@@ -15,13 +15,13 @@
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libccrtp.pc
-Index: libccrtp-2.0.1/Makefile.in
+Index: libccrtp-2.0.5/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/*
+--- libccrtp-2.0.5.orig/Makefile.in	2012-11-21 00:44:39.000000000 +1100
++++ libccrtp-2.0.5/Makefile.in	2012-11-22 15:44:37.000000000 +1100
+@@ -328,8 +328,8 @@
+     ccrtp.list ccrtp.list.in libccrtp.pc libccrtp.pc.in autoconf/* \
+     ccrtp-config.h directive.in
  
 -SUBDIRS = src demo doc
 -DIST_SUBDIRS = m4 src phone doc demo w32
@@ -29,32 +29,32 @@
 +DIST_SUBDIRS = m4 src phone doc w32
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libccrtp.pc
- all: all-recursive
-Index: libccrtp-2.0.1/configure.ac
+ all: ccrtp-config.h
+Index: libccrtp-2.0.5/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
+--- libccrtp-2.0.5.orig/configure.ac	2012-11-21 00:44:27.000000000 +1100
++++ libccrtp-2.0.5/configure.ac	2012-11-22 15:46:07.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.spec ccrtp.list libccrtp.pc src/ccrtp/crypto/Makefile directive)
+Index: libccrtp-2.0.5/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 @@
+--- libccrtp-2.0.5.orig/configure	2012-11-21 00:44:39.000000000 +1100
++++ libccrtp-2.0.5/configure	2012-11-22 15:47:16.000000000 +1100
+@@ -16447,7 +16447,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"
+-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 directive"
++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 directive"
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -16726,7 +16726,6 @@
+@@ -17581,7 +17581,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" ;;