[Pkg-voip-commits] r9989 - in /libss7/trunk/debian: changelog patches/fix-clang-build.diff patches/series rules

[msp at alioth.debian.org]

Author: msp
Date: Sat Oct  6 07:28:05 2012
New Revision: 9989

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9989
Log:
* Fix "FTBFS with clang 3.1" patch from Cyril Roelandt (Closes: #686546)
* Cleanup debian/rules

Added:
    libss7/trunk/debian/patches/fix-clang-build.diff
Modified:
    libss7/trunk/debian/changelog
    libss7/trunk/debian/patches/series
    libss7/trunk/debian/rules

Modified: libss7/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libss7/trunk/debian/changelog?rev=9989&op=diff
==============================================================================
--- libss7/trunk/debian/changelog (original)
+++ libss7/trunk/debian/changelog Sat Oct  6 07:28:05 2012
@@ -1,3 +1,10 @@
+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

Added: libss7/trunk/debian/patches/fix-clang-build.diff
URL: http://svn.debian.org/wsvn/pkg-voip/libss7/trunk/debian/patches/fix-clang-build.diff?rev=9989&op=file
==============================================================================
--- libss7/trunk/debian/patches/fix-clang-build.diff (added)
+++ libss7/trunk/debian/patches/fix-clang-build.diff Sat Oct  6 07:28:05 2012
@@ -1,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;
+ 		}

Modified: libss7/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/libss7/trunk/debian/patches/series?rev=9989&op=diff
==============================================================================
--- libss7/trunk/debian/patches/series (original)
+++ libss7/trunk/debian/patches/series Sat Oct  6 07:28:05 2012
@@ -1,3 +1,4 @@
+fix-clang-build.diff
 spelling-error-in-binary.patch
 ldconfig
 gcc46

Modified: libss7/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libss7/trunk/debian/rules?rev=9989&op=diff
==============================================================================
--- libss7/trunk/debian/rules (original)
+++ libss7/trunk/debian/rules Sat Oct  6 07:28:05 2012
@@ -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 \
@@ -26,9 +6,6 @@
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')
 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_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)
-