[Pkg-voip-commits] [spandsp] 01/04: Imported Debian patch 0.0.6~pre12-1

Victor Seva Lopez maniac-guest at moszumanska.debian.org
Fri Aug 14 13:10:31 UTC 2015


This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository spandsp.

commit f2a27b3084405824b09b77fc6aada22212976e44
Author: Mark Purcell <msp at debian.org>
Date:   Sun Dec 6 18:45:43 2009 +1100

    Imported Debian patch 0.0.6~pre12-1
---
 debian/changelog              | 83 ++++++++++++++++++++++++++++++++++++-------
 debian/compat                 |  2 +-
 debian/control                | 19 +++++-----
 debian/copyright              | 56 +++++++++++++++++++----------
 debian/libspandsp-doc.install |  1 +
 debian/libspandsp2.install    |  2 ++
 debian/rules                  | 24 +++++++------
 debian/watch                  |  4 ++-
 8 files changed, 137 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ace464..f97fa02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,80 @@
-spandsp (0.0.6~pre7-1) unstable; urgency=low
+spandsp (0.0.6~pre12-1) unstable; urgency=low
+
+  [ Tzafrir Cohen ]
+  * New upstream release (Closes: #537529).
+  * Upstream bumped SONAME to 2 (0.0.5 => 0.0.6)
+
+  [ Mark Purcell ]
+  * Conflicts: asterisk-app-dtmftotext (<= 0.0.20060218-4)
+    provides for smooth upgrades from etch
+  * debian/watch switch to uversionmangle
+  * debian/compat = 7 - package-uses-deprecated-debhelper-compat-version
+  * debian/rules switch to dh_prep - dh-clean-k-is-deprecated
+  * Standards: 3.8.3 - no changes out-of-date-standards-version
+
+ -- Mark Purcell <msp at debian.org>  Sun, 06 Dec 2009 18:45:43 +1100
+
+spandsp (0.0.5~pre4-1) unstable; urgency=medium
 
-  [ Steve Underwood ]
   * New upstream release.
-  * Fixed upstream file name for get-orig-source.
-  * Updates to 64bit archs support
-  * Removal of obsoleted files
 
- -- Steve Underwood <steveu at coppice.org>  Sat, 14 Mar 2009 09:23:36 +0100
+  [ Tzafrir Cohen ]
+  * Upstream seems to be commited to the ABI and bumped soname. We follow.
+    (Closes: #479612)
+  * The library was relicensed as LGPL, changed debian/copyright.
+  * Changed name back to libspandsp1 due to the new upstream SONAME.
+  * New standards version. No changes required.
+
+  [ Faidon Liambotis ]
+  * Add build-dep to docbook-xsl, needed for the xslt. (Closes: #476050) 
+  * Remove unneeded Conflicts with previous versions since
+    /usr/share/spandsp/{global-tones.xml,tones.dtd} is not provided anymore.
+  * Remove dpatch from debian/rules and the build-dependency to it.
+  * Remove long-gone Uploaders and add myself.
+  * Urgency medium because of an RC bugfix.
+
+ -- Faidon Liambotis <paravoid at debian.org>  Thu, 26 Jun 2008 13:16:41 +0300
+
+spandsp (0.0.4pre18-1) unstable; urgency=low
+
+  [ Tzafrir Cohen ]
+  * New upstream release (Closes: #470173).
+  * Bump standard version to 3.7.3 (no change needed).
+  * debian/copyright: Make sure that the Copyright line is properly
+    written
+  * Avoid rpath on amd64 (from http://wiki.debian.org/RpathIssue ).
+
+ -- Mark Purcell <msp at debian.org>  Tue, 08 Apr 2008 22:59:52 +1000
 
-spandsp (0.0.5~pre2-1) unstable; urgency=low
+spandsp (0.0.4pre16-1) unstable; urgency=low
+
+  * New upstream release
+
+  * Extremadura release ;-)
+
+  [ Kilian Krause ]
+  * Add Homepage field as added in dpkg-dev 1.14.6.
+
+  [ Tzafrir Cohen ]
+  * Switching to www.soft-switch.org (the mirror for soft-switch.org).
+
+ -- Mark Purcell <msp at debian.org>  Sat, 01 Dec 2007 22:14:26 +0100
+
+spandsp (0.0.4~pre4-1) unstable; urgency=low
 
-  [ Massimo Cetra ]
   * New upstream release.
-  * Fixed upstream file name for get-orig-source.
-  * Updates to 64bit archs support
-  * Removal of obsoleted files
+  * Use ${binary:Version} for binNMU-safe uploads.
+    Add dpkg-dev (>= 1.13.19) to Build-Depends
+  * debian/watch: Update.
+  * Don't ignore make clean error.
+
+ -- Kilian Krause <kilian at debian.org>  Sun, 19 Aug 2007 02:39:53 +0200
 
- -- Massimo Cetra <devel at navynet.it>  Mon, 5 May 2008 09:23:36 +0100
+spandsp (0.0.4~pre3-2) unstable; urgency=low
+
+  * Fix compilation on amd64 (Closes: #430111)
+
+ -- Kilian Krause <kilian at debian.org>  Sat, 21 Jul 2007 15:32:00 +0200
 
 spandsp (0.0.4~pre3-1) unstable; urgency=low
 
@@ -117,3 +175,4 @@ spandsp (0.0.2-1) unstable; urgency=low
   * Initial Release (Closes: #262032).
 
  -- Simon Richter <sjr at debian.org>  Sun,  2 Jan 2005 15:22:58 +0100
+
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 3f08fbf..f0dcb7e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,17 @@ Source: spandsp
 Section: libs
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Kilian Krause <kilian at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Santiago Ruano Rincón <santiago at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libtiff4-dev, libjpeg62-dev, dpatch, doxygen, autotools-dev, xsltproc
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
+Uploaders: Kilian Krause <kilian at debian.org>, Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Faidon Liambotis <paravoid at debian.org>
+Build-Depends: debhelper (>= 7), libtiff4-dev, libjpeg62-dev, doxygen, autotools-dev, libtool, dpkg-dev (>= 1.13.19), xsltproc, docbook-xsl
+Standards-Version: 3.8.3
+Homepage: http://www.soft-switch.org/
+Vcs-Svn: svn://svn.debian.org/pkg-voip/spandsp/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/spandsp/?op=log
 
-Package: libspandsp6
+Package: libspandsp2
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libspandsp0, libspandsp1, libspandsp2
+Conflicts: asterisk-app-dtmftotext (<= 0.0.20060218-4)
 Description: Telephony signal processing library
  This is a low-level signal processing library that modulate and demodulate
  signals commonly used in telephony, such as the "noise" generated by a
@@ -22,15 +23,13 @@ Description: Telephony signal processing library
 Package: libspandsp-dev
 Section: libdevel
 Architecture: any
-Depends: libspandsp6 (= ${Source-Version}), libtiff4-dev, libjpeg62-dev
+Depends: libspandsp2 (= ${binary:Version}), libtiff4-dev, libjpeg62-dev
 Description: Telephony signal processing library
  This is a low-level signal processing library that modulate and demodulate
  signals commonly used in telephony, such as the "noise" generated by a
  fax modem or DTMF touchpad.
  .
  This package contains the static library and development headers.
- .
- Homepage: http://www.soft-switch.org/
 
 Package: libspandsp-doc
 Section: doc
diff --git a/debian/copyright b/debian/copyright
index 2342a78..2693c7a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,43 @@
 This package was debianized by Simon Richter <sjr at debian.org> on
 Sun,  2 Jan 2005 15:22:58 +0100.
+It is currently maintained by the Debian VoIP team
+<pkg-voip-maintainers at lists.alioth.debian.org>
 
 It was downloaded from http://soft-switch.org/downloads/spandsp/
 
-Copyright: Steve Underwood <steveu at coppice.org>
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along with
-   this package; if not, write to the Free Software Foundation, Inc., 
-   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
+Copyright 2005,2006,2007,2008 by Steve Underwood <steveu at coppice.org> .
+
+The spandsp library is licensed under LGPL 2.1. The test suite, and some of
+the supporting code, are licensed under GPL 2.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1,
+  as published by the Free Software Foundation.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public
+  License along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License V. 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2, as
+  published by the Free Software Foundation.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License V. 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libspandsp-doc.install b/debian/libspandsp-doc.install
index 0381c92..082981b 100644
--- a/debian/libspandsp-doc.install
+++ b/debian/libspandsp-doc.install
@@ -1 +1,2 @@
 doc/api/html usr/share/doc/libspandsp-doc/api/
+
diff --git a/debian/libspandsp2.install b/debian/libspandsp2.install
new file mode 100644
index 0000000..52fa060
--- /dev/null
+++ b/debian/libspandsp2.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libspandsp.so.2.*
+debian/tmp/usr/lib/libspandsp.so.2
diff --git a/debian/rules b/debian/rules
index beee3de..fa01439 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ UPVERSION:=$(shell echo $(ORIGTARVER) | tr -d '~')
 
 FILENAME := spandsp_$(ORIGTARVER).orig.tar.gz
 FULLNAME := spandsp-$(UPVERSION)
-URL := http://soft-switch.org/downloads/spandsp/spandsp-$(UPVERSION).tgz
+URL := http://www.soft-switch.org/downloads/spandsp/spandsp-$(UPVERSION).tgz
 
 CFLAGS = -Wall -g
 
@@ -24,16 +24,15 @@ else
 	CFLAGS += -O2
 endif
 
-include /usr/share/dpatch/dpatch.make
-
-
-autotools: patch-stamp
+autotools:
 	ln -s /usr/share/misc/config.sub config.sub
 	ln -s /usr/share/misc/config.guess config.guess
 	touch autotools
 
 config.status: autotools configure
 	dh_testdir
+	if [ ! -r aclocal.m4.saved ]; then cp -a aclocal.m4 aclocal.m4.saved; fi
+	sed -i -r 's/(hardcode_into_libs=).*$$/\1=no/' aclocal.m4
 	CFLAGS="$(CFLAGS)" ./configure \
 	  --host=$(DEB_HOST_GNU_TYPE) \
 	  --build=$(DEB_BUILD_GNU_TYPE) \
@@ -49,22 +48,25 @@ build-stamp:  config.status
 	$(MAKE)
 	touch build-stamp
 
-clean: clean-patched unpatch
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp autotools
-	-$(MAKE) distclean
+	if [ -r aclocal.m4.saved ]; then mv aclocal.m4.saved aclocal.m4; fi
+	[ ! -f Makefile ]||$(MAKE) distclean
 
 	-$(RM) -f config.sub
 	-$(RM) -f config.guess
+	-$(RM) -f config.h.in
+	-$(RM) -f doc/api/html/*.gif
+	-$(RM) -f doc/api/html/*.png
 
 	dh_clean 
 
 install: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 binary-indep: build-stamp install
@@ -100,7 +102,7 @@ get-orig-source:
 	-@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/watch b/debian/watch
index 36f79f1..bf0682b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -4,4 +4,6 @@
 version=3
 
 # <Webpage URL> <string match>
-http://soft-switch.org/downloads/spandsp/ spandsp-(.*)\.tgz debian svn-upgrade
+opts=uversionmangle=s/pre/~pre/ \
+ http://www.soft-switch.org/downloads/spandsp/ spandsp-(.*)\.tgz debian svn-upgrade
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/spandsp.git



More information about the Pkg-voip-commits mailing list