[Pkg-voip-commits] [libss7] 36/51: * New upstream release * debian/patches incorporated upstream
tzafrir at debian.org
tzafrir at debian.org
Mon Oct 31 09:39:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master
in repository libss7.
commit 85ff6f6b41e4cb72e66f079eed45b7ace72c2161
Author: Mark Purcell <msp at debian.org>
Date: Wed Jun 25 12:43:35 2014 +0000
* New upstream release * debian/patches incorporated upstream
git-svn-id: svn://anonscm.alioth.debian.org/svn/pkg-voip/libss7/trunk@10495 5e74be4b-f5d6-0310-a852-e9e23c5afa6a
---
debian/changelog | 7 ++++
debian/patches/fix-clang-build.diff | 39 --------------------
debian/patches/gcc46 | 53 ---------------------------
debian/patches/ldconfig | 21 -----------
debian/patches/series | 4 --
debian/patches/spelling-error-in-binary.patch | 16 --------
6 files changed, 7 insertions(+), 133 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9b2adad..217d146 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libss7 (2.0.0-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/patches incorporated upstream
+
+ -- Mark Purcell <msp at debian.org> Wed, 25 Jun 2014 22:28:01 +1000
+
libss7 (1.0.2-5) unstable; urgency=low
* Upload to unstable
diff --git a/debian/patches/fix-clang-build.diff b/debian/patches/fix-clang-build.diff
deleted file mode 100644
index 2f91a95..0000000
--- a/debian/patches/fix-clang-build.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-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/gcc46 b/debian/patches/gcc46
deleted file mode 100644
index e56b107..0000000
--- a/debian/patches/gcc46
+++ /dev/null
@@ -1,53 +0,0 @@
-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/ldconfig b/debian/patches/ldconfig
deleted file mode 100644
index faaec73..0000000
--- a/debian/patches/ldconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-"make install with destdir under fakeroot: ldconfig permission denied"
-
-Upstream issue: http://bugs.digium.com/13313
-
-Index: Makefile
-===================================================================
---- a/Makefile (revision 209)
-+++ b/Makefile (working copy)
-@@ -45,10 +45,9 @@
- mkdir -p $(INSTALL_PREFIX)$(libdir)
- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
- install -m 644 libss7.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
-- install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
-- ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libss7.so.1 libss7.so ; ln -sf libss7.so.1.0 libss7.so.1 )
-+ cp -dp *.so* $(INSTALL_PREFIX)$(libdir)
- install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
-- if test $$(id -u) = 0; then $(LDCONFIG); fi
-+ $(LDCONFIG) 2>/dev/null || :
-
- $(STATIC_LIBRARY): $(STATIC_OBJS)
- ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 42e6357..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-fix-clang-build.diff
-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
deleted file mode 100644
index 41cbb2e..0000000
--- a/debian/patches/spelling-error-in-binary.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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";
--
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