[Pkg-voip-commits] [libss7] 03/04: Imported Debian patch 1.0.2-5
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Sun Aug 16 11:33:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository libss7.
commit 8e2d684339b25587c6b0a9948dc5d359f9cbe0c3
Author: Mark Purcell <msp at debian.org>
Date: Sun May 19 13:27:58 2013 +1000
Imported Debian patch 1.0.2-5
---
debian/backports/squeeze | 5 +++++
debian/changelog | 14 +++++++++++++
debian/control | 6 +++---
debian/patches/fix-clang-build.diff | 39 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 35 ---------------------------------
6 files changed, 62 insertions(+), 38 deletions(-)
diff --git a/debian/backports/squeeze b/debian/backports/squeeze
new file mode 100755
index 0000000..db61c4a
--- /dev/null
+++ b/debian/backports/squeeze
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Squeeze has an older debhelper:
+sed -i -e '/^Build-Depends:/s/debhelper (>= 9)/debhelper (>= 8)/' debian/control
+echo 8 >debian/compat
diff --git a/debian/changelog b/debian/changelog
index f9c7dbd..9b2adad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libss7 (1.0.2-5) unstable; urgency=low
+
+ * Upload to unstable
+ * Update Vcs & Standards-Version
+
+ -- Mark Purcell <msp at debian.org> Sun, 19 May 2013 13:27:58 +1000
+
+libss7 (1.0.2-4) experimental; urgency=low
+
+ * Fix "FTBFS with clang 3.1" patch from Cyril Roelandt (Closes: #686546)
+ * Cleanup debian/rules
+
+ -- Mark Purcell <msp at debian.org> Sat, 06 Oct 2012 17:27:40 +1000
+
libss7 (1.0.2-3) unstable; urgency=low
* wheezy polish
diff --git a/debian/control b/debian/control
index b97d6d3..a40f71d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Section: libs
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Tzafrir Cohen <tzafrir at debian.org>, Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://downloads.asterisk.org/pub/telephony/libss7/
-Vcs-Svn: svn://svn.debian.org/pkg-voip/libss7/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libss7/?op=log
+Vcs-Svn: svn://anonscm.debian.org/pkg-voip/libss7/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/libss7/trunk/
Package: libss7-dev
Section: libdevel
diff --git a/debian/patches/fix-clang-build.diff b/debian/patches/fix-clang-build.diff
new file mode 100644
index 0000000..2f91a95
--- /dev/null
+++ b/debian/patches/fix-clang-build.diff
@@ -0,0 +1,39 @@
+Description: libss7: FTBFS with clang 3.1
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686546
+
+Index: libss7-1.0.2/Makefile
+===================================================================
+--- libss7-1.0.2.orig/Makefile 2008-08-07 04:49:06.000000000 +1000
++++ libss7-1.0.2/Makefile 2012-10-06 17:05:47.000000000 +1000
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC?=gcc
+ GREP=grep
+ AWK=awk
+
+Index: libss7-1.0.2/isup.c
+===================================================================
+--- libss7-1.0.2.orig/isup.c 2008-08-10 02:54:23.000000000 +1000
++++ libss7-1.0.2/isup.c 2012-10-06 17:07:25.000000000 +1000
+@@ -1394,7 +1394,7 @@
+
+ switch ((parm[1] >> 4) & 0xf) {
+ case 0:
+- orig_redir_reas = "Unknown/not available";
++ redir_reas = "Unknown/not available";
+ break;
+ case 1:
+ redir_reas = "User busy";
+Index: libss7-1.0.2/mtp3.c
+===================================================================
+--- libss7-1.0.2.orig/mtp3.c 2008-08-06 08:27:45.000000000 +1000
++++ libss7-1.0.2/mtp3.c 2012-10-06 17:06:20.000000000 +1000
+@@ -614,7 +614,7 @@
+ int i;
+
+ for (i = 0; i < ss7->numlinks; i++) {
+- if ((ss7->mtp2_linkstate[i] == MTP2_LINKSTATE_DOWN)) {
++ if (ss7->mtp2_linkstate[i] == MTP2_LINKSTATE_DOWN) {
+ mtp2_start(ss7->links[i], 1);
+ ss7->mtp2_linkstate[i] = MTP2_LINKSTATE_ALIGNING;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 2948e35..42e6357 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix-clang-build.diff
spelling-error-in-binary.patch
ldconfig
gcc46
diff --git a/debian/rules b/debian/rules
index 3d1cf03..8c409eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,4 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
-
-PACKAGE = libss7
-
--include /usr/share/quilt/quilt.make
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
PKGNAME:=$(shell sed -nre 's/^Package: (.*[0-9])$$/\1/p' debian/control)
DEBVERSION:=$(shell head -n 1 debian/changelog \
@@ -27,9 +7,6 @@ UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e
UPVERSIONMAJOR:=$(shell echo $(UPVERSION) | sed -re 's/(^[0-9]\.[0-9]).*/\1/')
SHLIBS = $(PKGNAME) (>= $(UPVERSIONMAJOR))
-FILENAME := $(PACKAGE)_$(UPVERSION).orig.tar.gz
-URL := http://downloads.digium.com/pub/telephony/$(PACKAGE)/releases/$(PACKAGE)-$(UPVERSION).tar.gz
-
%:
dh $@
@@ -41,15 +18,3 @@ override_dh_mkshlibs:
override_dh_strip:
dh_strip --dbg-package=libss7-dbg
-
-print-version:
- @@echo "Debian version: $(DEBVERSION)"
- @@echo "Upstream version: $(UPVERSION)"
- @@echo "Upstream major version: $(UPVERSIONMAJOR)"
-
-get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@echo Downloading $(FILENAME) from $(URL) ...
- @@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/libss7.git
More information about the Pkg-voip-commits
mailing list