[Pkg-voip-commits] [pjproject] 02/05: New upstream SVN snapshot: 2.2~svn.4703~dfsg
tzafrir at debian.org
tzafrir at debian.org
Tue Jan 21 12:24:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master
in repository pjproject.
commit 5c106d28190d625b02a55820989547731f432cbb
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Mon Jan 13 11:00:37 2014 +0200
New upstream SVN snapshot: 2.2~svn.4703~dfsg
* More standard numberring
* dfsg - we don't include the ocmplete tree.
* Patch fix_gcc_warn disabled for now.
---
debian/changelog | 4 +++-
debian/patches/no_libasound.patch | 2 +-
debian/patches/no_libnsl.patch | 22 +++++++---------------
debian/patches/reduce_pjlib_linkage.patch | 6 +++---
debian/patches/reduce_pjmedia_linkage.patch | 8 ++++----
debian/patches/series | 2 +-
debian/patches/typos.patch | 29 ++++++++++++++++++++---------
7 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 20cfb92..f765174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-pjproject (2.1.0.0.ast20130823-2) UNRELEASED; urgency=low
+pjproject (2.2~svn.4703~dfsg-1) UNRELEASED; urgency=low
* -dev package: depend explicitly on libsrtp0-dev due to -lsrtp in
the pkg-config file.
* Add README.Debian to explain what exactly we package (Closes: #725326).
+ * Switch to upstream subversion snapshots.
+ * explicit dfsg in version number as we remove some files (see copyright).
-- Tzafrir Cohen <tzafrir at debian.org> Wed, 02 Oct 2013 19:51:32 +0300
diff --git a/debian/patches/no_libasound.patch b/debian/patches/no_libasound.patch
index b3e0b50..d605a1d 100644
--- a/debian/patches/no_libasound.patch
+++ b/debian/patches/no_libasound.patch
@@ -7,7 +7,7 @@ but it was not being used anywhere.
--- a/aconfigure
+++ b/aconfigure
@@ -5994,8 +5994,6 @@ $as_echo "Checking sound device backend.
- if test "x$ac_cv_header_alsa_version_h" = x""yes; then :
+ if test "x$ac_cv_header_alsa_version_h" = xyes; then :
ac_pa_use_alsa=1
- LIBS="$LIBS -lasound"
diff --git a/debian/patches/no_libnsl.patch b/debian/patches/no_libnsl.patch
index 4431e5b..6fe52b9 100644
--- a/debian/patches/no_libnsl.patch
+++ b/debian/patches/no_libnsl.patch
@@ -1,22 +1,14 @@
All libraries and applications were being linked against libnsl,
but it was not being used anywhere.
+diff --git a/aconfigure b/aconfigure
+index 57eb0bc..919ea75 100755
--- a/aconfigure
+++ b/aconfigure
-@@ -4085,51 +4085,6 @@ _ACEOF
+@@ -4104,41 +4104,6 @@ LIBS="-lnsl $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
- fi
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lnsl" >&5
--$as_echo_n "checking for puts in -lnsl... " >&6; }
--if test "${ac_cv_lib_nsl_puts+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnsl $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -43,7 +35,7 @@ but it was not being used anywhere.
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_puts" >&5
-$as_echo "$ac_cv_lib_nsl_puts" >&6; }
--if test "x$ac_cv_lib_nsl_puts" = x""yes; then :
+-if test "x$ac_cv_lib_nsl_puts" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
@@ -54,7 +46,7 @@ but it was not being used anywhere.
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
$as_echo_n "checking for sin in -lm... " >&6; }
- if test "${ac_cv_lib_m_sin+set}" = set; then :
+ if ${ac_cv_lib_m_sin+:} false; then :
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -113,7 +113,6 @@ AC_CHECK_LIB(ole32,puts)
diff --git a/debian/patches/reduce_pjlib_linkage.patch b/debian/patches/reduce_pjlib_linkage.patch
index afe54cb..0f1c124 100644
--- a/debian/patches/reduce_pjlib_linkage.patch
+++ b/debian/patches/reduce_pjlib_linkage.patch
@@ -23,7 +23,7 @@ libcrypto, libssl and libuuid, but only libpj needs them.
@@ -7299,7 +7300,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_ERR_load_BIO_strings" >&5
$as_echo "$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; }
- if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = x""yes; then :
+ if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = xyes; then :
- libcrypto_present=1 && LIBS="$LIBS -lcrypto"
+ libcrypto_present=1 && PJLIB_EXT="$PJLIB_EXT -lcrypto"
fi
@@ -32,7 +32,7 @@ libcrypto, libssl and libuuid, but only libpj needs them.
@@ -7339,7 +7340,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
- if test "x$ac_cv_lib_ssl_SSL_library_init" = x""yes; then :
+ if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
- libssl_present=1 && LIBS="$LIBS -lssl"
+ libssl_present=1 && PJLIB_EXT="$PJLIB_EXT -lssl"
fi
@@ -52,9 +52,9 @@ libcrypto, libssl and libuuid, but only libpj needs them.
--- a/pjlib/build/Makefile
+++ b/pjlib/build/Makefile
@@ -38,7 +38,7 @@ export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS
- ssl_sock_common.o ssl_sock_ossl.o ssl_sock_dump.o \
string.o timer.o types.o
export PJLIB_CFLAGS += $(_CFLAGS)
+ export PJLIB_CXXFLAGS += $(_CXXFLAGS)
-export PJLIB_LDFLAGS += $(_LDFLAGS)
+export PJLIB_LDFLAGS += $(PJLIB_EXT) $(_LDFLAGS)
diff --git a/debian/patches/reduce_pjmedia_linkage.patch b/debian/patches/reduce_pjmedia_linkage.patch
index c7b0c28..74f32d2 100644
--- a/debian/patches/reduce_pjmedia_linkage.patch
+++ b/debian/patches/reduce_pjmedia_linkage.patch
@@ -34,7 +34,7 @@ needs them.
ifeq ($(PJ_SHARED_LIBRARIES),)
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
-@@ -83,6 +83,7 @@ export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDE
+@@ -84,6 +84,7 @@ export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDE
$(PJLIB_LDLIB) \
$(PJLIB_UTIL_LDLIB) \
$(PJNATH_LDLIB) \
@@ -42,15 +42,15 @@ needs them.
$(_LDFLAGS)
-@@ -95,6 +96,7 @@ export PJMEDIA_AUDIODEV_OBJS += audiode
- alsa_dev.o bb10_dev.o
+@@ -98,6 +99,7 @@ export PJMEDIA_AUDIODEV_OBJS += audiode
export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
+ export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \
+ $(PJMEDIA_AUDIODEV_EXT) \
$(_LDFLAGS)
-@@ -138,6 +140,7 @@ export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS
+@@ -145,6 +147,7 @@ export PJMEDIA_CODEC_CXXFLAGS += $(_CXXF
$(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS)
export PJMEDIA_CODEC_LDFLAGS += $(PJMEDIA_LDLIB) \
$(PJLIB_LDLIB) \
diff --git a/debian/patches/series b/debian/patches/series
index f881e9d..ead0e1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@ reduce_pjlib_linkage.patch
reduce_pjmedia_linkage.patch
typos.patch
symbols_diet.patch
-fix_gcc_warn.patch
+#fix_gcc_warn.patch
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
index a723496..cfca059 100644
--- a/debian/patches/typos.patch
+++ b/debian/patches/typos.patch
@@ -3,17 +3,28 @@ Description: Fix some typos in the code
Credit to Lintian
---- a/pjsip-apps/src/pjsua/pjsua_app.c
-+++ b/pjsip-apps/src/pjsua/pjsua_app.c
-@@ -4890,7 +4890,7 @@ void console_app_main(const pj_str_t *ur
- pjsua_call_info ci;
+--- a/pjsip-apps/src/pjsua/pjsua_app_cli.c
++++ b/pjsip-apps/src/pjsua/pjsua_app_cli.c
+@@ -1685,7 +1685,7 @@ static pj_status_t cmd_transfer_call(pj_
+ pjsua_call_get_info(current_call, &ci);
+ pj_ansi_snprintf(out_str,
+ sizeof(out_str),
+- "Transfering current call [%d] %.*s\n",
++ "Transferring current call [%d] %.*s\n",
+ current_call,
+ (int)ci.remote_info.slen,
+ ci.remote_info.ptr);
+--- a/pjsip-apps/src/pjsua/pjsua_app_legacy.c
++++ b/pjsip-apps/src/pjsua/pjsua_app_legacy.c
+@@ -1068,7 +1068,7 @@ static void ui_call_transfer(pj_bool_t n
+ pjsua_msg_data msg_data;
- pjsua_call_get_info(current_call, &ci);
-- printf("Transfering current call [%d] %.*s\n",
-+ printf("Transferring current call [%d] %.*s\n",
- current_call,
- (int)ci.remote_info.slen, ci.remote_info.ptr);
+ pjsua_call_get_info(current_call, &ci);
+- printf("Transfering current call [%d] %.*s\n", current_call,
++ printf("Transferring current call [%d] %.*s\n", current_call,
+ (int)ci.remote_info.slen, ci.remote_info.ptr);
+ ui_input_url("Transfer to URL", buf, sizeof(buf), &result);
--- a/pjsip-apps/src/py_pjsua/pjsua_app.py
+++ b/pjsip-apps/src/py_pjsua/pjsua_app.py
@@ -411,7 +411,7 @@ def xfer_call():
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git
More information about the Pkg-voip-commits
mailing list