[Pkg-voip-commits] [iaxmodem] 02/03: Imported Debian patch 1.2.0~dfsg-2
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Sun Aug 16 06:31:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository iaxmodem.
commit 4bc54d079ec89b795345ce9b600cfc65615cf2e4
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Sat Jul 26 22:25:16 2014 +0300
Imported Debian patch 1.2.0~dfsg-2
---
debian/changelog | 13 ++++
debian/clean | 2 +
debian/compat | 2 +-
debian/control | 8 +--
debian/copyright | 8 +--
debian/iaxmodem.init | 4 +-
debian/install | 1 +
debian/manpages | 1 +
...igure-stamp.dpatch => 11_build_configure-stamp} | 25 +++----
debian/patches/build_flags.patch | 24 +++++++
debian/patches/{00list => series} | 2 +-
debian/rules | 83 +++-------------------
debian/source/format | 1 +
13 files changed, 76 insertions(+), 98 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 28f710e..ad57b41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+iaxmodem (1.2.0~dfsg-2) unstable; urgency=low
+
+ * Allow building with libtiff5 (Closes: #736014).
+ * jblache is no longer an uploader (Closes: #688548).
+ * Switch to dpkg V3 format.
+ * Fix link command for building with ld --as-needed (Closes: #641729).
+ * Update VCS fields.
+ * Convert to dh.
+ * Explicit [L]GPL-2 in debian/copyright.
+ * uild_flags.patch: pass flags from dpkg-buildflags.
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Sat, 26 Jul 2014 22:25:16 +0300
+
iaxmodem (1.2.0~dfsg-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..068b3bc
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+iaxmodem
+iaxmodem.o
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 6681d74..95dde20 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: iaxmodem
Section: comm
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Julien BLACHE <jblache at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, libtiff4-dev, autotools-dev
+Uploaders: Tzafrir Cohen <tzafrir at debian.org>
+Build-Depends: debhelper (>= 9), libtiff-dev | libtiff4-dev, autotools-dev
Build-Conflicts: libiax-dev, libspandsp-dev
Standards-Version: 3.8.0
Homepage: http://iaxmodem.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/pkg-voip/iaxmodem/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/iaxmodem/?op=log
+Vcs-Svn: svn://anonscm.debian.org/pkg-voip/iaxmodem/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/iaxmodem/
Package: iaxmodem
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 93dd13d..3971030 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,7 @@ License:
IAXmodem is released under the term of the GNU General Public License,
version 2 or above. On Debian systems, the complete text of the license can
-be found in the /usr/share/common-licenses/GPL file.
+be found in the /usr/share/common-licenses/GPL-2 file.
The following files have their own copyright statements and license:
@@ -51,7 +51,7 @@ The following files have their own copyright statements and license:
This file is released under the terms of the GNU Lesser General Public
License, version 2.1 or later. On Debian systems, the complete text of
- the license can be found in the /usr/share/common-licenses/LGPL file.
+ the license can be found in the /usr/share/common-licenses/LGPL-2 file.
libiax2
@@ -88,7 +88,7 @@ The following files are in the public domain:
src/md5.h
On Debian systems, the complete text of the licenses can be found in the
-/usr/share/common-licenses/LGPL and /usr/share/common-licenses/GPL files.
+/usr/share/common-licenses/LGPL-2 and /usr/share/common-licenses/GPL-2 files.
spandsp
@@ -99,4 +99,4 @@ License:
spandsp is released under the term of the GNU General Public License,
version 2 or above. On Debian systems, the complete text of the license can
-be found in the /usr/share/common-licenses/GPL file.
+be found in the /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/iaxmodem.init b/debian/iaxmodem.init
index d6596f7..f408298 100644
--- a/debian/iaxmodem.init
+++ b/debian/iaxmodem.init
@@ -2,8 +2,8 @@
#
### BEGIN INIT INFO
# Provides: iaxmodem
-# Required-Start: $syslog $local_fs $network
-# Required-Stop: $syslog $local_fs $network
+# Required-Start: $syslog $remote_fs $network
+# Required-Stop: $syslog $remote_fs $network
# Should-Start: asterisk
# Should-Stop: asterisk
# Default-Start: 2 3 4 5
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..62a9197
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+iaxmodem usr/bin
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..3025981
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+iaxmodem.1
diff --git a/debian/patches/11_build_configure-stamp.dpatch b/debian/patches/11_build_configure-stamp
similarity index 71%
rename from debian/patches/11_build_configure-stamp.dpatch
rename to debian/patches/11_build_configure-stamp
index 6721800..25c402f 100644
--- a/debian/patches/11_build_configure-stamp.dpatch
+++ b/debian/patches/11_build_configure-stamp
@@ -1,14 +1,15 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_build_configure-stamp.dpatch by <jblache at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The build script should not build the libraries if configure-stamp exists
-## DP: debian/rules takes care of that.
-## DP: Do not link unneeded libraries:
-## DP: - -lutil is only needed if legacy PTYs are used
-## DP: - -ltiff is not needed at all (pulled in for spandsp, but
-## DP: tiff-dependent code in spandsp is not used by iaxmodem and not
-## DP: linked in the final binary)
+From: Julian Blanche <jblache at debian.org>
+Subject: avoid building libraries if configure-stamp exists
+
+The build script should not build the libraries if configure-stamp exists
+debian/rules takes care of that.
+
+Do not link unneeded libraries:
+ - -lutil is only needed if legacy PTYs are used
+ - -ltiff is not needed at all (pulled in for spandsp, but
+ tiff-dependent code in spandsp is not used by iaxmodem and not
+ linked in the final binary)
+ - Move libraries to end of link command: fixes ld --as-needed (Matthias Klose)
@DPATCH@
diff -urNad iaxmodem-1.2.0~dfsg~/build iaxmodem-1.2.0~dfsg/build
@@ -60,7 +61,7 @@ diff -urNad iaxmodem-1.2.0~dfsg~/build iaxmodem-1.2.0~dfsg/build
gcc -Wall -g $PTYUSE $CFLAGS -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS \
-std=c99 -Ilib/libiax2/src -Ilib/spandsp/src -c -o iaxmodem.o iaxmodem.c && \
- gcc -lm $LLIBS -ltiff -o iaxmodem iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a
-+ gcc -lm $LLIBS -o iaxmodem iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a
++ gcc -o iaxmodem iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a -lm $LLIBS
else
getVersions && \
gcc -Wall -g $PTYUSE -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" \
diff --git a/debian/patches/build_flags.patch b/debian/patches/build_flags.patch
new file mode 100644
index 0000000..e141582
--- /dev/null
+++ b/debian/patches/build_flags.patch
@@ -0,0 +1,24 @@
+From: Tzafrir Cohen <tzafrir at debian.org>
+Description: Pass hardening flags from dpkg
+
+dpkg-buildflags sets CFLAGS, CPPFLAGS and LDFLAGS. Pass them to the
+build process.
+
+--- a/build
++++ b/build
+@@ -43,12 +43,12 @@ if [ "$1" = "static" ]; then
+ fi
+
+ getVersions && \
+- gcc -Wall -g $PTYUSE $CFLAGS -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS \
++ gcc -Wall -g $PTYUSE $CPPFLAGS $CFLAGS -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS \
+ -std=c99 -Ilib/libiax2/src -Ilib/spandsp/src -c -o iaxmodem.o iaxmodem.c && \
+- gcc -o iaxmodem iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a -lm $LLIBS
++ gcc $LDFLAGS -o iaxmodem iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a -lm $LLIBS
+ else
+ getVersions && \
+- gcc -Wall -g $PTYUSE -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" \
++ gcc $LDFLAGS $CPPFLAGS $CFLAGS -Wall -g $PTYUSE -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" \
+ -lm -liax -lutil -lspandsp -ltiff -o iaxmodem iaxmodem.c
+ fi
+ if [ -n "`ls /etc/iaxmodem-cfg.* 2>/dev/null`" ]; then
diff --git a/debian/patches/00list b/debian/patches/series
similarity index 58%
rename from debian/patches/00list
rename to debian/patches/series
index ba056d0..4bb937e 100644
--- a/debian/patches/00list
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
11_build_configure-stamp
-
+build_flags.patch
diff --git a/debian/rules b/debian/rules
index 2771b9e..3ed5dd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Include dpatch rules
-include /usr/share/dpatch/dpatch.make
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -40,21 +37,10 @@ FILENAME := iaxmodem_$(UPVERSION)~dfsg.orig.tar.gz
UPFILENAME := iaxmodem_$(UPVERSION).orig.tar.gz
URL := http://heanet.dl.sourceforge.net/iaxmodem/iaxmodem-$(UPVERSION).tar.gz
-autotools-stamp:
- rm -f ./lib/libiax2/config.sub ./lib/libiax2/config.guess
- ln -s /usr/share/misc/config.sub ./lib/libiax2/config.sub
- ln -s /usr/share/misc/config.guess ./lib/libiax2/config.guess
-
- rm -f ./lib/spandsp/config/config.sub ./lib/spandsp/config/config.guess
- ln -s /usr/share/misc/config.sub ./lib/spandsp/config/config.sub
- ln -s /usr/share/misc/config.guess ./lib/spandsp/config/config.guess
-
- touch autotools-stamp
-
-
-configure-stamp: patch-stamp autotools-stamp
- dh_testdir
+%:
+ dh $@ --with-autotools_dev
+override_dh_auto_configure:
# Check that problematic files have been removed prior to packaging
( [ ! -e lib/spandsp/src/spandsp/mmx.h ] && \
[ ! -d lib/spandsp/src/msvc ] && [ ! -f lib/spandsp/libspandsp.vcproj ] && \
@@ -65,75 +51,25 @@ configure-stamp: patch-stamp autotools-stamp
(cd lib/libiax2 && ./configure $(confflags) --disable-shared)
(cd lib/spandsp && ./configure $(confflags) --disable-shared)
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
+override_dh_auto_build:
# Add here commands to compile the package.
$(MAKE) -C ./lib/libiax2
$(MAKE) -C ./lib/spandsp
./build static
- touch build-stamp
-
-clean: real-clean unpatch
-real-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp autotools-stamp
-
- # Add here commands to clean up after the build process.
+override_dh_auto_clean:
[ ! -f lib/libiax2/Makefile ] || $(MAKE) -C ./lib/libiax2 distclean
- rm -f ./lib/libiax2/config.sub ./lib/libiax2/config.guess
[ ! -f lib/spandsp/Makefile ] || $(MAKE) -C ./lib/spandsp distclean
rm -rf ./lib/spandsp/autom4te.cache
- rm -f ./lib/spandsp/config/config.sub ./lib/spandsp/config/config.guess
-
- rm -f iaxmodem iaxmodem.o
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- # Add here commands to install the package into debian/iaxmodem.
- cp iaxmodem debian/iaxmodem/usr/bin
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
+override_dh_installchangelogs:
dh_installchangelogs CHANGES
- dh_installdocs
- dh_installexamples
-# dh_install
- dh_installlogrotate
+
+overridedh_installinit:
# start before hylafax (20), stop after hylafax (20) and before asterisk (21)
dh_installinit -- defaults 19 20
- dh_installman iaxmodem.1
-# dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
print-version:
@@echo "Debian version: $(DEBVERSION)"
@@ -155,5 +91,4 @@ get-orig-source:
@@echo Cleaning up...
@@$(RM) -rf ../tarballs/iaxmodem-$(UPVERSION).tmp
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch real-clean
+.PHONY: build
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/iaxmodem.git
More information about the Pkg-voip-commits
mailing list