[Pkg-voip-commits] r10371 - in /spandsp/trunk/debian: changelog control patches/fix-ftbfs-parallel.patch patches/series rules

msp at alioth.debian.org msp at alioth.debian.org
Mon Dec 30 06:57:44 UTC 2013 

Author: msp
Date: Mon Dec 30 06:57:44 2013
New Revision: 10371

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10371
Log:
* Fix FTBFS in parallel mode by disabling multiple execution of
  the scripts that generate images. (Closes: #726410) 
  - patch from Andreas Moog
* Urgency medium for RC bugfix 
* Cleanup get-orig-target - see uscan(1) 
* Fix "[libspandsp2] "a [...] library that modulate" in extended
  description" - updated Description: (Closes: #725886)
* Update Build-Depends: libtiff-dev|libtiff5-dev - libtiff5 transition
* Update Standards-Version: 3.9.5 - no further changes

Added:
    spandsp/trunk/debian/patches/fix-ftbfs-parallel.patch
Modified:
    spandsp/trunk/debian/changelog
    spandsp/trunk/debian/control
    spandsp/trunk/debian/patches/series
    spandsp/trunk/debian/rules

Modified: spandsp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/spandsp/trunk/debian/changelog?rev=10371&op=diff
==============================================================================
--- spandsp/trunk/debian/changelog	(original)
+++ spandsp/trunk/debian/changelog	Mon Dec 30 06:57:44 2013
@@ -1,3 +1,17 @@
+spandsp (0.0.6~pre21-2) unstable; urgency=medium
+
+  * Fix FTBFS in parallel mode by disabling multiple execution of
+    the scripts that generate images. (Closes: #726410) 
+    - patch from Andreas Moog
+  * Urgency medium for RC bugfix 
+  * Cleanup get-orig-target - see uscan(1) 
+  * Fix "[libspandsp2] "a [...] library that modulate" in extended
+    description" - updated Description: (Closes: #725886)
+  * Update Build-Depends: libtiff-dev|libtiff5-dev - libtiff5 transition
+  * Update Standards-Version: 3.9.5 - no further changes
+
+ -- Mark Purcell <msp at debian.org>  Mon, 30 Dec 2013 17:57:04 +1100
+
 spandsp (0.0.6~pre21-1) unstable; urgency=low
 
   * New upstream release

Modified: spandsp/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/spandsp/trunk/debian/control?rev=10371&op=diff
==============================================================================
--- spandsp/trunk/debian/control	(original)
+++ spandsp/trunk/debian/control	Mon Dec 30 06:57:44 2013
@@ -4,7 +4,7 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir at debian.org>, Faidon Liambotis <paravoid at debian.org>
 Build-Depends: debhelper (>= 8),
- libtiff-dev|libtiff4-dev,
+ libtiff-dev|libtiff5-dev,
  libjpeg-dev|libjpeg62-dev,
  doxygen, autotools-dev, dh-autoreconf,
  libtool,
@@ -18,7 +18,7 @@
  sox,
  xsltproc,
  docbook-xsl, docbook-xml
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.soft-switch.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-voip/spandsp/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/spandsp/trunk/
@@ -38,7 +38,7 @@
 Architecture: any
 Depends: libspandsp2 (= ${binary:Version}), ${misc:Depends}, libtiff-dev|libtiff4-dev, libjpeg-dev|libjpeg62-dev
 Description: Telephony signal processing library - development headers
- This is a low-level signal processing library that modulate and demodulate
+ This is a low-level signal processing library that modulates and demodulates
  signals commonly used in telephony, such as the "noise" generated by a
  fax modem or DTMF touchpad.
  .
@@ -50,6 +50,6 @@
 Architecture: all
 Description: Documentation for the spandsp signal processing library
  This package contains the online API in HTML for the libspandsp, a low
- level signal processing library that modulate and demodulate siignals
+ level signal processing library that modulates and demodulates siignals
  commonly used in telephony, such as the "noise" generated by a fax
  modem or DTMF touchpad.

Added: spandsp/trunk/debian/patches/fix-ftbfs-parallel.patch
URL: http://svn.debian.org/wsvn/pkg-voip/spandsp/trunk/debian/patches/fix-ftbfs-parallel.patch?rev=10371&op=file
==============================================================================
--- spandsp/trunk/debian/patches/fix-ftbfs-parallel.patch	(added)
+++ spandsp/trunk/debian/patches/fix-ftbfs-parallel.patch	Mon Dec 30 06:57:44 2013
@@ -0,0 +1,14 @@
+Description: Don't execute multiple instances of the scripts generating
+ the images. It can lead to a race condition while building in parallel
+ mode.
+Author: Andreas Moog <andreas.moog at warperbbs.de>
+Bug-Debian: http://bugs.debian.org/726410
+
+--- spandsp-0.0.6~pre21.orig/test-data/itu/fax/Makefile.am
++++ spandsp-0.0.6~pre21/test-data/itu/fax/Makefile.am
+@@ -153,3 +153,5 @@ mixed_size_pages.tif: ${MIXED_SIZE_PAGES
+ 
+ striped.tif: generate_striped_pages$(EXEEXT)
+ 	./generate_striped_pages$(EXEEXT)
++
++.NOTPARALLEL: dithered.tif mixed_size_pages.tif striped.tif

Modified: spandsp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/spandsp/trunk/debian/patches/series?rev=10371&op=diff
==============================================================================
--- spandsp/trunk/debian/patches/series	(original)
+++ spandsp/trunk/debian/patches/series	Mon Dec 30 06:57:44 2013
@@ -1,3 +1,4 @@
 serial-tests
 array_warning
 fix-ftbfs-on-powerpcspe.patch
+fix-ftbfs-parallel.patch

Modified: spandsp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/spandsp/trunk/debian/rules?rev=10371&op=diff
==============================================================================
--- spandsp/trunk/debian/rules	(original)
+++ spandsp/trunk/debian/rules	Mon Dec 30 06:57:44 2013
@@ -1,18 +1,4 @@
 #!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEBVERSION:=$(shell head -n 1 debian/changelog \
-		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-ORIGTARVER:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//')# -e 's/.dfsg$$//' -e 's/~//')
-
-UPVERSION:=$(shell echo $(ORIGTARVER) | tr -d '~')
-
-FILENAME := spandsp_$(ORIGTARVER).orig.tar.gz
-FULLNAME := spandsp-$(UPVERSION)
-URL := http://www.soft-switch.org/downloads/spandsp/spandsp-$(UPVERSION).tgz
-
 %:
 	dh $@ --parallel --with autoreconf
 
@@ -34,9 +20,3 @@
 override_dh_link:
 	$(RM) -f debian/libspandsp-doc/usr/share/doc/libspandsp-doc/api/html/jquery.js
 	dh_link
-
-get-orig-source:
-	-@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)

More information about the Pkg-voip-commits mailing list