[Pkg-voip-commits] [libss7] 02/04: Imported Debian patch 1.0.2-3

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 1b607d5cb5bc34dfda465e0835b0f12553b511c3
Author: Mark Purcell <msp at debian.org>
Date:   Sun Jun 24 21:50:00 2012 +1000

    Imported Debian patch 1.0.2-3
---
 debian/README.source                          | 18 ------
 debian/changelog                              | 31 ++++++++++
 debian/clean                                  |  1 +
 debian/compat                                 |  2 +-
 debian/control                                | 36 ++++++++---
 debian/libss7-1.symbols                       | 89 +++++++++++++++++++++++++++
 debian/patches/gcc46                          | 53 ++++++++++++++++
 debian/patches/series                         |  2 +
 debian/patches/spelling-error-in-binary.patch | 16 +++++
 debian/rules                                  | 77 +++--------------------
 debian/source/format                          |  1 +
 debian/watch                                  |  4 +-
 12 files changed, 230 insertions(+), 100 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 4615393..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,18 +0,0 @@
-This package uses quilt for patches management.
-
-To get the patched source, run:
-
-  ./debian/rules patch
-
-
-The sources of the package are maintained in a subversion repository. 
-To get the latest version:
-
-  debcheckout libss7
-
-
-For more information about working with the repository, see:
-http://svn.debian.org/wsvn/pkg-voip/README?op=file
-
-For other useful information, see the pkg-voip team page:
-http://pkg-voip.alioth.debian.org/
diff --git a/debian/changelog b/debian/changelog
index 12c02a5..f9c7dbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+libss7 (1.0.2-3) unstable; urgency=low
+
+  * wheezy polish
+  * Update Standards-Version: 3.9.3 - no changes
+  * debian/compat -> 9 hardening & multiarch
+  * Update Description - fixes extended-description-is-probably-too-short
+  * Fix spelling-error-in-binary usr/lib/libss7.so.1.0 requried required
+
+ -- Mark Purcell <msp at debian.org>  Sun, 24 Jun 2012 21:50:00 +1000
+
+libss7 (1.0.2-2) unstable; urgency=low
+
+  [ Kilian Krause ]
+  * Add myself to Uploaders
+  * Fix debian/watch
+
+  [ Mark Purcell ]
+  * Add myself to Uploaders
+  * libss7-dbg -> Section: debug
+  * debian/compat -> 7
+
+  [ Tzafrir Cohen ]
+  * A @debian.org address.
+  * Patch gcc46: Fix the gcc 4.6 warnings (Closes: 625375).
+  * Switch to dh.
+  * Swich to dpkg v.3 format.
+  * Standards version: 3.9.2.
+  * Add a symbols file.
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Fri, 25 Nov 2011 21:06:32 +0200
+
 libss7 (1.0.2-1) unstable; urgency=low
 
   [ Tzafrir Cohen ]
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..17435c8
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+version.c
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 665ed41..b97d6d3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,33 +2,53 @@ Source: libss7
 Priority: optional
 Section: libs
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Build-Depends: debhelper (>> 4.0.0), quilt
-Standards-Version: 3.8.0
-Homepage: http://www.asterisk.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
+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
 
 Package: libss7-dev
 Section: libdevel
 Architecture: any
-Depends: libss7-1 (= ${binary:Version})
+Depends: ${misc:Depends}, libss7-1 (= ${binary:Version})
 Description: Signalling System 7 (ss7) development files
+ A userspace library that provids SS7 protocol services to applications.
+ It has a working MTP2, MTP3, and ISUP for ITU and ANSI style SS7, however
+ it was written in a manner that will easily allow support for other various
+ national specific variants in the future.  For a working reference
+ implementation, see the various link test programs, as well as the Asterisk
+ Open Source PBX.
+ .
  Development files for the C implementation of the Signalling System 7 
  (ss7) telephony protocol.
  
 Package: libss7-1
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Signalling System 7 (ss7) library
+ A userspace library that provids SS7 protocol services to applications.
+ It has a working MTP2, MTP3, and ISUP for ITU and ANSI style SS7, however
+ it was written in a manner that will easily allow support for other various
+ national specific variants in the future.  For a working reference
+ implementation, see the various link test programs, as well as the Asterisk
+ Open Source PBX.
+ .
  C implementation of the Signalling System 7 (ss7) telephony protocol.
  
 Package: libss7-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
-Depends: libss7-1 (= ${binary:Version})
+Depends: ${misc:Depends}, libss7-1 (= ${binary:Version})
 Description: Signalling System 7 (ss7) debugging symbols
+ A userspace library that provids SS7 protocol services to applications.
+ It has a working MTP2, MTP3, and ISUP for ITU and ANSI style SS7, however
+ it was written in a manner that will easily allow support for other various
+ national specific variants in the future.  For a working reference
+ implementation, see the various link test programs, as well as the Asterisk
+ Open Source PBX.
+ .
  Debug symbols for the C implementation of the Signalling System 7 
  (ss7) telephony protocol.
diff --git a/debian/libss7-1.symbols b/debian/libss7-1.symbols
new file mode 100644
index 0000000..0f96f99
--- /dev/null
+++ b/debian/libss7-1.symbols
@@ -0,0 +1,89 @@
+libss7.so.1 libss7-1 #MINVER#
+ ansi_sls_next at Base 1.0.2
+ isup_acm at Base 1.0.2
+ isup_anm at Base 1.0.2
+ isup_bla at Base 1.0.2
+ isup_blo at Base 1.0.2
+ isup_cgb at Base 1.0.2
+ isup_cgba at Base 1.0.2
+ isup_cgu at Base 1.0.2
+ isup_cgua at Base 1.0.2
+ isup_con at Base 1.0.2
+ isup_cpg at Base 1.0.2
+ isup_cqr at Base 1.0.2
+ isup_cvr at Base 1.0.2
+ isup_dump at Base 1.0.2
+ isup_faa at Base 1.0.2
+ isup_far at Base 1.0.2
+ isup_gra at Base 1.0.2
+ isup_grs at Base 1.0.2
+ isup_iam at Base 1.0.2
+ isup_init_call at Base 1.0.2
+ isup_lpa at Base 1.0.2
+ isup_new_call at Base 1.0.2
+ isup_receive at Base 1.0.2
+ isup_rel at Base 1.0.2
+ isup_rlc at Base 1.0.2
+ isup_rsc at Base 1.0.2
+ isup_set_call_dpc at Base 1.0.2
+ isup_set_called at Base 1.0.2
+ isup_set_calling at Base 1.0.2
+ isup_set_callref at Base 1.0.2
+ isup_set_charge at Base 1.0.2
+ isup_set_gen_address at Base 1.0.2
+ isup_set_gen_digits at Base 1.0.2
+ isup_set_generic_name at Base 1.0.2
+ isup_set_jip_digits at Base 1.0.2
+ isup_set_lspi at Base 1.0.2
+ isup_set_oli at Base 1.0.2
+ isup_uba at Base 1.0.2
+ isup_ubl at Base 1.0.2
+ isup_ucic at Base 1.0.2
+ mtp2_dump at Base 1.0.2
+ mtp2_msu at Base 1.0.2
+ mtp2_new at Base 1.0.2
+ mtp2_receive at Base 1.0.2
+ mtp2_setstate at Base 1.0.2
+ mtp2_start at Base 1.0.2
+ mtp2_stop at Base 1.0.2
+ mtp2_transmit at Base 1.0.2
+ mtp3_alarm at Base 1.0.2
+ mtp3_dump at Base 1.0.2
+ mtp3_noalarm at Base 1.0.2
+ mtp3_process_event at Base 1.0.2
+ mtp3_receive at Base 1.0.2
+ mtp3_start at Base 1.0.2
+ mtp3_transmit at Base 1.0.2
+ net_mng_messages at Base 1.0.2
+ set_routinglabel at Base 1.0.2
+ ss7_add_link at Base 1.0.2
+ ss7_check_event at Base 1.0.2
+ ss7_dump_buf at Base 1.0.2
+ ss7_dump_msg at Base 1.0.2
+ ss7_error at Base 1.0.2
+ ss7_event2str at Base 1.0.2
+ ss7_get_version at Base 1.0.2
+ ss7_link_alarm at Base 1.0.2
+ ss7_link_noalarm at Base 1.0.2
+ ss7_message at Base 1.0.2
+ ss7_msg_free at Base 1.0.2
+ ss7_msg_new at Base 1.0.2
+ ss7_msg_userpart at Base 1.0.2
+ ss7_msg_userpart_len at Base 1.0.2
+ ss7_new at Base 1.0.2
+ ss7_next_empty_event at Base 1.0.2
+ ss7_pollflags at Base 1.0.2
+ ss7_read at Base 1.0.2
+ ss7_schedule_del at Base 1.0.2
+ ss7_schedule_event at Base 1.0.2
+ ss7_schedule_next at Base 1.0.2
+ ss7_schedule_run at Base 1.0.2
+ ss7_set_adjpc at Base 1.0.2
+ ss7_set_debug at Base 1.0.2
+ ss7_set_error at Base 1.0.2
+ ss7_set_message at Base 1.0.2
+ ss7_set_network_ind at Base 1.0.2
+ ss7_set_pc at Base 1.0.2
+ ss7_start at Base 1.0.2
+ ss7_write at Base 1.0.2
+ testmessage at Base 1.0.2
diff --git a/debian/patches/gcc46 b/debian/patches/gcc46
new file mode 100644
index 0000000..e56b107
--- /dev/null
+++ b/debian/patches/gcc46
@@ -0,0 +1,53 @@
+Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Description: Remove assigned but unused code warningsof GCC 4.6
+Bug: https://issues.asterisk.org/jira/browse/SS7-54
+
+--- a/mtp3.c
++++ b/mtp3.c
+@@ -455,12 +455,10 @@ fail:
+ int mtp3_transmit(struct ss7 *ss7, unsigned char userpart, unsigned char sls, struct ss7_msg *m)
+ {
+ 	unsigned char *sio;
+-	unsigned char *sif;
+ 	struct mtp2 *winner;
+ 	int priority = 3;
+ 
+ 	sio = m->buf + MTP2_SIZE;
+-	sif = sio + 1;
+ 
+ 	winner = sls_to_link(ss7, sls);
+ 
+--- a/isup.c
++++ b/isup.c
+@@ -2274,12 +2274,9 @@ static int dump_parm(struct ss7 *ss7, in
+ 	int x;
+ 	int len = 0;
+ 	int totalparms = sizeof(parms)/sizeof(struct parm_func);
+-	char *parmname = "Unknown Parm";
+ 
+ 	for (x = 0; x < totalparms; x++) {
+ 		if (parms[x].parm == parm) {
+-			if (parms[x].name)
+-				parmname = parms[x].name;
+ 
+ 			ss7_message(ss7, "\t\t%s:\n", parms[x].name ? parms[x].name : "Unknown");
+ 
+--- a/parser_debug.c
++++ b/parser_debug.c
+@@ -45,7 +45,6 @@ int main(int argc, char **argv)
+ 	unsigned int tmp;
+ 	int ss7type;
+ 	int res = 0, i = 0, size;
+-	ss7_event *e;
+ 
+ 	if (argc != 3)
+ 		return -1;
+@@ -81,7 +80,7 @@ int main(int argc, char **argv)
+ 
+ 	mtp2_receive(ss7->links[0], mybuf, size);
+ 
+-	e = ss7_check_event(ss7);
++	ss7_check_event(ss7);
+ 
+ 	return 0;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 32d09d8..2948e35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+spelling-error-in-binary.patch
 ldconfig
+gcc46
diff --git a/debian/patches/spelling-error-in-binary.patch b/debian/patches/spelling-error-in-binary.patch
new file mode 100644
index 0000000..41cbb2e
--- /dev/null
+++ b/debian/patches/spelling-error-in-binary.patch
@@ -0,0 +1,16 @@
+Description: spelling-error-in-binary usr/lib/libss7.so.1.0 requried required
+Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-binary.html
+
+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-06-24 21:33:45.000000000 +1000
+@@ -407,7 +407,7 @@
+ 			hg_str = "ISDN user part not preferred all the way";
+ 			break;
+ 		case 2:
+-			hg_str = "ISDN user part requried all the way";
++			hg_str = "ISDN user part required all the way";
+ 			break;
+ 		case 3:
+ 			hg_str = "spare";
diff --git a/debian/rules b/debian/rules
index 082534f..3d1cf03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,78 +30,17 @@ SHLIBS = $(PKGNAME) (>= $(UPVERSIONMAJOR))
 FILENAME := $(PACKAGE)_$(UPVERSION).orig.tar.gz
 URL := http://downloads.digium.com/pub/telephony/$(PACKAGE)/releases/$(PACKAGE)-$(UPVERSION).tar.gz
 
-# shared library versions, option 1
-#version=2.0.5
-#major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-configure: configure-stamp
-configure-stamp: patch
-	dh_testdir
-	# Add here commands to configure the package.
-	
-	touch $@
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	
-	# Add here commands to compile the package.
-	CFLAGS="$(CFLAGS)" $(MAKE)
-	
-	touch $@
-
-clean: unpatch clean-unpatched
-clean-unpatched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	
-	# Add here commands to clean up after the build process.
-	#-$(MAKE) clean
-	[ ! -f Makefile ] || $(MAKE) clean
-	
-	# Until upstream gets a distclean target:
-	$(RM) -f version.c
-	
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) install INSTALL_PREFIX=$(CURDIR)/debian/tmp
+%:
+	dh $@
 
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+override_dh_mkshlibs:
+	dh_makeshlibs -V "$(SHLIBS)"
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_install --sourcedir=debian/tmp
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installman
+override_dh_strip:
 	dh_strip --dbg-package=libss7-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -V "$(SHLIBS)"
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
@@ -114,5 +53,3 @@ get-orig-source:
 	@@echo Downloading $(FILENAME) from $(URL) ...
 	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
 
-binary: binary-indep binary-arch
-.PHONY: build clean clean-unpatched binary-indep binary-arch binary install configure patch unpatch
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)
diff --git a/debian/watch b/debian/watch
index 669f76f..df4ebfe 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,3 @@
 version=3
 opts=dversionmangle=s/\~dfsg//,downloadurlmangle=s/.*ref=// \
-	http://downloads.digium.com/pub/telephony/libss7/releases/ \
-	http://www\.digium\.com/elqNow/elqRedir\.htm\?ref=http://downloads\.digium\.com/pub/telephony/libss7/releases/libss7-([0-9.]*)\.tar\.gz \
-	debian svn-upgrade
+	http://downloads.digium.com/pub/telephony/libss7/releases/libss7-([0-9.]*).tar.gz debian svn-upgrade

-- 
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