[Pkg-voip-commits] r9637 - in /yate/trunk/debian: changelog control patches/ rules yate-h323.install yate-h323chan.install

[msp at alioth.debian.org]

Author: msp
Date: Sun Apr  1 05:40:49 2012
New Revision: 9637

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9637
Log:
* Disable --parallel  - FTBFS
* Drop unused debian/patches
* Revert to libopenh323 - yate+h323plus FTBFS

Added:
    yate/trunk/debian/yate-h323chan.install
      - copied unchanged from r9631, yate/trunk/debian/yate-h323.install
Removed:
    yate/trunk/debian/patches/
    yate/trunk/debian/yate-h323.install
Modified:
    yate/trunk/debian/changelog
    yate/trunk/debian/control
    yate/trunk/debian/rules

Modified: yate/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/changelog?rev=9637&op=diff
==============================================================================
--- yate/trunk/debian/changelog (original)
+++ yate/trunk/debian/changelog Sun Apr  1 05:40:49 2012
@@ -23,11 +23,12 @@
   [ Mark Purcell ]
   * Update build/watch/g-o-s to yate4
   * ACK NMU - Thanks Matthias & Gregor
-  * configure --without-pwlib --without-openh323 - FTBFS
-  * Disable --parallel
+  * Disable --parallel  - FTBFS
   * debian/rules: remove subpacks from yate package
-
- -- Mark Purcell <msp at debian.org>  Sun, 01 Apr 2012 10:59:26 +1000
+  * Drop unused debian/patches
+  * Revert to libopenh323 - yate+h323plus FTBFS
+
+ -- Mark Purcell <msp at debian.org>  Sun, 01 Apr 2012 15:25:49 +1000
 
 yate (2.2.0-1~dfsg-1.2) unstable; urgency=low
 

Modified: yate/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/control?rev=9637&op=diff
==============================================================================
--- yate/trunk/debian/control (original)
+++ yate/trunk/debian/control Sun Apr  1 05:40:49 2012
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 8),
  autotools-dev,
  dh-autoreconf,
-# libh323plus-dev (>= 1.22.0~),
+ libopenh323-dev | libh323plus-dev (>= 1.22.0~),
  libgsm1-dev,
  dahdi-source,
  libmysqlclient-dev,
@@ -107,17 +107,17 @@
  .
  These are the modules that require PostgreSQL.
 
-#Package: yate-h323
-#Architecture: any
-#Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
-#Conflicts: yate-openh323
-#Replaces: yate-openh323
-#Description: H323 module for YATE based on H323Plus
-# YATE is a telephony engine aimed at creating a telephony server that
-# performs well enough to deal with PBX requirements and also flexible
-# enough for complex Gateway and IVR solutions.
-# .
-# This is the H.323 protocol module.
+Package: yate-h323chan
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
+Conflicts: yate-openh323
+Replaces: yate-openh323
+Description: H323 module for YATE
+ YATE is a telephony engine aimed at creating a telephony server that
+ performs well enough to deal with PBX requirements and also flexible
+ enough for complex Gateway and IVR solutions.
+ .
+ This is the H.323 protocol module.
 
 Package: yate-qt4
 Conflicts: yate-gtk2

Modified: yate/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/rules?rev=9637&op=diff
==============================================================================
--- yate/trunk/debian/rules (original)
+++ yate/trunk/debian/rules Sun Apr  1 05:40:49 2012
@@ -24,7 +24,7 @@
 config.status: check-ilbc 
 	dh_autoreconf --as-needed
 	dh_auto_configure --\
-		--disable-ilbc --without-amrnb --without-coredumper --enable-sctp  --without-pwlib --without-openh323
+		--disable-ilbc --without-amrnb --without-coredumper --enable-sctp
 
 build: build-arch build-indep
 
@@ -60,7 +60,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-subpacks_names = alsa dahdi sctp qt4 mysql h323 pgsql
+subpacks_names = alsa dahdi sctp qt4 mysql h323chan pgsql
 subpacks = $(subpacks_names:%=$(CURDIR)/debian/yate-%) $(CURDIR)/debian/yate
 
 # Build architecture-dependent files here.
@@ -73,6 +73,9 @@
 	dh_install -a --fail-missing
 	find $(subpacks) -name '*.yate' -type f  -printf '-name %f -o\n' \
 	  | xargs | sed -e 's/ -o$$//' | xargs find $(CURDIR)/debian/yate \
+	  | xargs $(RM) -fv
+	find $(subpacks) -name '*.yate' -type f  -printf '-name %f -o\n' \
+	  | xargs | sed -e 's/ -o$$//' | xargs find $(CURDIR)/debian/yate-core \
 	  | xargs $(RM) -fv
 	find $(subpacks) -name '*.conf' -type f  -printf '-name %f -o\n' \
 	  | xargs | sed -e 's/ -o$$//' | xargs find $(CURDIR)/debian/yate-core \