[Pkg-voip-commits] r6952 - in /yxa/trunk/debian/patches: erlang-auto-rel.dpatch ssl_util.dpatch
mikma-guest at alioth.debian.org
mikma-guest at alioth.debian.org
Tue Mar 31 20:06:01 UTC 2009
Author: mikma-guest
Date: Tue Mar 31 20:06:01 2009
New Revision: 6952
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6952
Log:
Updated erlang-auto-rel and ssl_util patches for version 1.0+20090326
Modified:
yxa/trunk/debian/patches/erlang-auto-rel.dpatch
yxa/trunk/debian/patches/ssl_util.dpatch
Modified: yxa/trunk/debian/patches/erlang-auto-rel.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/erlang-auto-rel.dpatch?rev=6952&op=diff
==============================================================================
--- yxa/trunk/debian/patches/erlang-auto-rel.dpatch (original)
+++ yxa/trunk/debian/patches/erlang-auto-rel.dpatch Tue Mar 31 20:06:01 2009
@@ -5,12 +5,12 @@
## DP: Autodetect Erlang OTP library version numbers
@DPATCH@
-diff -urNad yxa-1.0+20080221svn~/src/Makefile.in yxa-1.0+20080221svn/src/Makefile.in
---- yxa-1.0+20080221svn~/src/Makefile.in 2008-03-30 12:52:12.000000000 +0200
-+++ yxa-1.0+20080221svn/src/Makefile.in 2008-03-30 12:52:45.000000000 +0200
-@@ -28,6 +28,14 @@
- ebin_dir = ../ebin
- doc_dir = ../doc
+diff -urNad yxa-1.0+20090326~/src/Makefile.in yxa-1.0+20090326/src/Makefile.in
+--- yxa-1.0+20090326~/src/Makefile.in 2009-03-31 21:32:26.000000000 +0200
++++ yxa-1.0+20090326/src/Makefile.in 2009-03-31 21:32:27.000000000 +0200
+@@ -30,6 +30,14 @@
+ install_DATA = @INSTALL_DATA@
+ install_PROGRAM = @INSTALL_PROGRAM@
+ERLANG_LIB_VER_asn1 = @ERLANG_LIB_VER_asn1@
+ERLANG_LIB_VER_kernel = @ERLANG_LIB_VER_kernel@
@@ -23,7 +23,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
systools_make_script = \
-@@ -88,6 +96,9 @@
+@@ -91,6 +99,9 @@
yxa_monitor.erl \
$(local_module).erl
@@ -33,7 +33,7 @@
imported_hrl_FILES = \
include/database_regexproute.hrl \
-@@ -172,7 +183,7 @@
+@@ -175,7 +186,7 @@
clean: clean-recursive
rm -f core *.core *~
@@ -42,7 +42,7 @@
rm -f *.o ktrace.out erl_crash.dump
rm -f $(addsuffix .tar.gz, $(basename $(rel_FILES)))
rm -f $(rel_FILES) start_ssl.rel sys.config
-@@ -182,9 +193,9 @@
+@@ -185,9 +196,9 @@
$(beam_FILES): $(yxa_hrl_FILES)
$(boot_FILES): $(beam_FILES)
@@ -53,8 +53,8 @@
+.SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in .rel-in
$(ebin_dir)/%.beam: $(srcdir)/%.erl
- $(ERLC) -o $(ebin_dir) -pa $(ebin_dir) -I$(srcdir)/include -W +debug_info $<
-@@ -200,7 +211,7 @@
+ $(ERLC) $(L_ERLC_FLAGS) $<
+@@ -203,7 +214,7 @@
-e 's!%VERSION%!@PACKAGE_VERSION@!' < $< > $@
$(ebin_dir)/%.rel: $(srcdir)/%.rel-in
@@ -63,17 +63,17 @@
%.boot: $(ebin_dir)/%.app $(ebin_dir)/yxa.app $(ebin_dir)/%.rel
$(systools_make_script)
-diff -urNad yxa-1.0+20080221svn~/src/appserver.rel-in yxa-1.0+20080221svn/src/appserver.rel-in
---- yxa-1.0+20080221svn~/src/appserver.rel-in 2008-03-30 12:41:38.000000000 +0200
-+++ yxa-1.0+20080221svn/src/appserver.rel-in 2008-03-30 12:52:12.000000000 +0200
+diff -urNad yxa-1.0+20090326~/src/appserver.rel-in yxa-1.0+20090326/src/appserver.rel-in
+--- yxa-1.0+20090326~/src/appserver.rel-in 2008-04-30 10:58:33.000000000 +0200
++++ yxa-1.0+20090326/src/appserver.rel-in 2009-03-31 21:32:27.000000000 +0200
@@ -1,10 +1,10 @@
- %% Erlang OTP R11B-2 library versions
+ %% Erlang OTP R12B-2 library versions
{release, {"YXA appserver","YXA-appserver-%VERSION%"},
{erts, "5.5.2"},
-- [{kernel,"2.12.1"},
-- {stdlib,"1.15.1"},
-- {ssl, "3.9"},
-- {mnesia, "4.4"},
+- [{kernel,"2.12.2"},
+- {stdlib,"1.15.2"},
+- {ssl, "3.9"},
+- {mnesia, "4.4.2"},
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
+ {ssl, "@ERLANG_LIB_VER_ssl@"},
@@ -81,12 +81,12 @@
{yxa, "%VERSION%"},
{appserver, "%VERSION%"}
]
-diff -urNad yxa-1.0+20080221svn~/src/event/Makefile.in yxa-1.0+20080221svn/src/event/Makefile.in
---- yxa-1.0+20080221svn~/src/event/Makefile.in 2008-03-30 12:41:38.000000000 +0200
-+++ yxa-1.0+20080221svn/src/event/Makefile.in 2008-03-30 12:52:45.000000000 +0200
-@@ -28,6 +28,14 @@
- ebin_dir = ../../ebin
- doc_dir = ../../doc
+diff -urNad yxa-1.0+20090326~/src/event/Makefile.in yxa-1.0+20090326/src/event/Makefile.in
+--- yxa-1.0+20090326~/src/event/Makefile.in 2009-03-24 20:42:45.000000000 +0100
++++ yxa-1.0+20090326/src/event/Makefile.in 2009-03-31 21:33:19.000000000 +0200
+@@ -30,6 +30,14 @@
+ install_DATA = @INSTALL_DATA@
+ install_PROGRAM = @INSTALL_PROGRAM@
+ERLANG_LIB_VER_asn1 = @ERLANG_LIB_VER_asn1@
+ERLANG_LIB_VER_kernel = @ERLANG_LIB_VER_kernel@
@@ -99,9 +99,9 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
systools_make_script = \
-@@ -48,6 +56,9 @@
- subscription.erl \
- uaprofile_package.erl
+@@ -49,6 +57,9 @@
+ presence_xmerl_xml.erl \
+ subscription.erl
+.rel-in.rel:
+ sed $(ERLANG_LIB_VER_SUBST) $*.rel-in > $*.rel
@@ -109,7 +109,7 @@
imported_hrl_FILES = \
../include/event.hrl \
-@@ -103,7 +114,7 @@
+@@ -104,7 +115,7 @@
clean:
rm -f core *.core *~
@@ -118,18 +118,18 @@
rm -f *.o ktrace.out erl_crash.dump
rm -f $(addsuffix .tar.gz, $(basename $(rel_FILES)))
rm -f $(start_FILES)
-@@ -124,15 +135,15 @@
+@@ -125,15 +136,15 @@
$(beam_FILES): $(yxa_hrl_FILES)
$(boot_FILES): $(beam_FILES)
-SUFFIXES = .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
-+SUFFIXES = .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in .rel-in
++SUFFIXES = .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in .app-in
.SUFFIXES:
-.SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
-+.SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in .rel-in
++.SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in .app-in
$(ebin_dir)/%.beam: $(srcdir)/%.erl
- $(ERLC) -o $(ebin_dir) -pa $(ebin_dir) -I$(srcdir)/../include -pz ../ -W +debug_info $<
+ $(ERLC) $(L_ERLC_FLAGS) $<
$(ebin_dir)/%.rel: $(srcdir)/%.rel-in
- sed -e 's!%VERSION%!@PACKAGE_VERSION@!' < $< > $@
@@ -137,18 +137,18 @@
$(ebin_dir)/%.app: $(srcdir)/%.app-in
sed -e 's!%VERSION%!@PACKAGE_VERSION@!' < $< > $@
-diff -urNad yxa-1.0+20080221svn~/src/event/eventserver.rel-in yxa-1.0+20080221svn/src/event/eventserver.rel-in
---- yxa-1.0+20080221svn~/src/event/eventserver.rel-in 2008-03-30 12:41:38.000000000 +0200
-+++ yxa-1.0+20080221svn/src/event/eventserver.rel-in 2008-03-30 12:52:12.000000000 +0200
+diff -urNad yxa-1.0+20090326~/src/event/eventserver.rel-in yxa-1.0+20090326/src/event/eventserver.rel-in
+--- yxa-1.0+20090326~/src/event/eventserver.rel-in 2008-04-30 10:58:33.000000000 +0200
++++ yxa-1.0+20090326/src/event/eventserver.rel-in 2009-03-31 21:32:27.000000000 +0200
@@ -1,11 +1,11 @@
- %% Erlang OTP R11B-2 library versions
+ %% Erlang OTP R12B-2 library versions
{release, {"YXA eventserver", "YXA-eventserver-%VERSION%"},
{erts, "5.5.2"},
-- [{kernel,"2.12.1"},
-- {stdlib,"1.15.1"},
-- {ssl, "3.9"},
-- {asn1, "1.5"},
-- {mnesia, "4.4"},
+- [{kernel,"2.12.2"},
+- {stdlib,"1.15.2"},
+- {ssl, "3.9"},
+- {asn1, "1.5.1"},
+- {mnesia, "4.4.2"},
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
+ {ssl, "@ERLANG_LIB_VER_ssl@"},
@@ -157,18 +157,18 @@
{yxa, "%VERSION%"},
{eventserver, "%VERSION%", [yxa]}
]
-diff -urNad yxa-1.0+20080221svn~/src/incomingproxy.rel-in yxa-1.0+20080221svn/src/incomingproxy.rel-in
---- yxa-1.0+20080221svn~/src/incomingproxy.rel-in 2008-03-30 12:41:38.000000000 +0200
-+++ yxa-1.0+20080221svn/src/incomingproxy.rel-in 2008-03-30 12:52:12.000000000 +0200
+diff -urNad yxa-1.0+20090326~/src/incomingproxy.rel-in yxa-1.0+20090326/src/incomingproxy.rel-in
+--- yxa-1.0+20090326~/src/incomingproxy.rel-in 2008-04-30 10:58:33.000000000 +0200
++++ yxa-1.0+20090326/src/incomingproxy.rel-in 2009-03-31 21:32:27.000000000 +0200
@@ -1,11 +1,11 @@
- %% Erlang OTP R11B-2 library versions
+ %% Erlang OTP R12B-2 library versions
{release, {"YXA incomingproxy","YXA-incomingproxy-%VERSION%"},
{erts, "5.5.2"},
-- [{kernel,"2.12.1"},
-- {stdlib,"1.15.1"},
-- {ssl, "3.9"},
-- {asn1, "1.5"},
-- {mnesia, "4.4"},
+- [{kernel,"2.12.2"},
+- {stdlib,"1.15.2"},
+- {ssl, "3.9"},
+- {asn1, "1.5.1"},
+- {mnesia, "4.4.2"},
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
+ {ssl, "@ERLANG_LIB_VER_ssl@"},
@@ -177,17 +177,17 @@
{yxa, "%VERSION%", load},
{incomingproxy, "%VERSION%", permanent}
]
-diff -urNad yxa-1.0+20080221svn~/src/outgoingproxy.rel-in yxa-1.0+20080221svn/src/outgoingproxy.rel-in
---- yxa-1.0+20080221svn~/src/outgoingproxy.rel-in 2008-03-30 12:41:38.000000000 +0200
-+++ yxa-1.0+20080221svn/src/outgoingproxy.rel-in 2008-03-30 12:52:12.000000000 +0200
+diff -urNad yxa-1.0+20090326~/src/outgoingproxy.rel-in yxa-1.0+20090326/src/outgoingproxy.rel-in
+--- yxa-1.0+20090326~/src/outgoingproxy.rel-in 2008-04-30 10:58:33.000000000 +0200
++++ yxa-1.0+20090326/src/outgoingproxy.rel-in 2009-03-31 21:32:27.000000000 +0200
@@ -1,10 +1,10 @@
- %% Erlang OTP R11B-2 library versions
+ %% Erlang OTP R12B-2 library versions
{release, {"YXA outgoingproxy","YXA-outgoingproxy-%VERSION%"},
{erts, "5.5.2"},
-- [{kernel,"2.12.1"},
-- {stdlib,"1.15.1"},
-- {ssl, "3.9"},
-- {mnesia, "4.4"},
+- [{kernel,"2.12.2"},
+- {stdlib,"1.15.2"},
+- {ssl, "3.9"},
+- {mnesia, "4.4.2"},
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
+ {ssl, "@ERLANG_LIB_VER_ssl@"},
@@ -195,18 +195,18 @@
{yxa, "%VERSION%"},
{outgoingproxy, "%VERSION%"}
]
-diff -urNad yxa-1.0+20080221svn~/src/pstnproxy.rel-in yxa-1.0+20080221svn/src/pstnproxy.rel-in
---- yxa-1.0+20080221svn~/src/pstnproxy.rel-in 2008-03-30 12:41:38.000000000 +0200
-+++ yxa-1.0+20080221svn/src/pstnproxy.rel-in 2008-03-30 12:52:12.000000000 +0200
+diff -urNad yxa-1.0+20090326~/src/pstnproxy.rel-in yxa-1.0+20090326/src/pstnproxy.rel-in
+--- yxa-1.0+20090326~/src/pstnproxy.rel-in 2008-04-30 10:58:33.000000000 +0200
++++ yxa-1.0+20090326/src/pstnproxy.rel-in 2009-03-31 21:32:27.000000000 +0200
@@ -1,11 +1,11 @@
- %% Erlang OTP R11B-2 library versions
+ %% Erlang OTP R12B-2 library versions
{release, {"YXA pstnproxy","YXA-pstnproxy-%VERSION%"},
{erts, "5.5.2"},
-- [{kernel,"2.12.1"},
-- {stdlib,"1.15.1"},
-- {ssl, "3.9"},
-- {asn1, "1.5"},
-- {mnesia, "4.4"},
+- [{kernel,"2.12.2"},
+- {stdlib,"1.15.2"},
+- {ssl, "3.9"},
+- {asn1, "1.5.1"},
+- {mnesia, "4.4.2"},
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
+ {ssl, "@ERLANG_LIB_VER_ssl@"},
@@ -215,15 +215,15 @@
{yxa, "%VERSION%"},
{pstnproxy, "%VERSION%"}
]
-diff -urNad yxa-1.0+20080221svn~/src/start_ssl.rel-in yxa-1.0+20080221svn/src/start_ssl.rel-in
---- yxa-1.0+20080221svn~/src/start_ssl.rel-in 2008-03-30 12:41:38.000000000 +0200
-+++ yxa-1.0+20080221svn/src/start_ssl.rel-in 2008-03-30 12:52:12.000000000 +0200
+diff -urNad yxa-1.0+20090326~/src/start_ssl.rel-in yxa-1.0+20090326/src/start_ssl.rel-in
+--- yxa-1.0+20090326~/src/start_ssl.rel-in 2008-04-30 10:58:33.000000000 +0200
++++ yxa-1.0+20090326/src/start_ssl.rel-in 2009-03-31 21:32:27.000000000 +0200
@@ -2,8 +2,8 @@
%% File to get Erlang distribution using SSL started
{release, {"YXA start_ssl","YXA-start_ssl-%VERSION%"},
{erts, "5.5.2"},
-- [{kernel,"2.12.1"},
-- {stdlib,"1.15.1"},
+- [{kernel,"2.12.2"},
+- {stdlib,"1.15.2"},
- {ssl, "3.9"}
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
Modified: yxa/trunk/debian/patches/ssl_util.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/ssl_util.dpatch?rev=6952&op=diff
==============================================================================
--- yxa/trunk/debian/patches/ssl_util.dpatch (original)
+++ yxa/trunk/debian/patches/ssl_util.dpatch Tue Mar 31 20:06:01 2009
@@ -5,27 +5,23 @@
## DP: SSL-PKIX.hrl was renamed to OTP-PKIX.hrl in R12B-0.
@DPATCH@
-diff -urNad yxa-1.0+20080221svn~/src/transportlayer/Makefile.in yxa-1.0+20080221svn/src/transportlayer/Makefile.in
---- yxa-1.0+20080221svn~/src/transportlayer/Makefile.in 2008-03-30 12:41:38.000000000 +0200
-+++ yxa-1.0+20080221svn/src/transportlayer/Makefile.in 2008-03-30 12:51:06.000000000 +0200
-@@ -21,6 +21,8 @@
+diff -urNad yxa-1.0+20090326~/src/transportlayer/Makefile.in yxa-1.0+20090326/src/transportlayer/Makefile.in
+--- yxa-1.0+20090326~/src/transportlayer/Makefile.in 2009-03-24 20:42:45.000000000 +0100
++++ yxa-1.0+20090326/src/transportlayer/Makefile.in 2009-03-31 21:35:29.000000000 +0200
+@@ -24,7 +24,9 @@
+
ERLC = @ERLC@
ERL = @ERL@
+-L_ERLC_FLAGS = $(ERLC_FLAGS) -o $(ebin_dir) -I$(srcdir) -I$(yxa_include_dir) -pa $(ebin_dir)
++L_ERLC_FLAGS = $(ERLC_FLAGS) $(DEFS) -o $(ebin_dir) -I$(srcdir) -I$(yxa_include_dir) -pa $(ebin_dir)
++
++DEFS = @DEFS@
-+DEFS = @DEFS@
-+
INSTALL = @INSTALL@
install_DATA = @INSTALL_DATA@
- install_PROGRAM = @INSTALL_PROGRAM@
-@@ -103,4 +105,4 @@
- .SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
-
- $(ebin_dir)/%.beam: $(srcdir)/%.erl
-- $(ERLC) -o $(ebin_dir) -pa $(ebin_dir) -I$(srcdir)/../include -W +debug_info $<
-+ $(ERLC) $(DEFS) -o $(ebin_dir) -pa $(ebin_dir) -I$(srcdir)/../include -W +debug_info $<
-diff -urNad yxa-1.0+20080221svn~/src/transportlayer/ssl_util.erl yxa-1.0+20080221svn/src/transportlayer/ssl_util.erl
---- yxa-1.0+20080221svn~/src/transportlayer/ssl_util.erl 2008-03-30 12:41:38.000000000 +0200
-+++ yxa-1.0+20080221svn/src/transportlayer/ssl_util.erl 2008-03-30 12:51:29.000000000 +0200
+diff -urNad yxa-1.0+20090326~/src/transportlayer/ssl_util.erl yxa-1.0+20090326/src/transportlayer/ssl_util.erl
+--- yxa-1.0+20090326~/src/transportlayer/ssl_util.erl 2009-03-25 09:17:49.000000000 +0100
++++ yxa-1.0+20090326/src/transportlayer/ssl_util.erl 2009-03-31 21:33:39.000000000 +0200
@@ -24,7 +24,15 @@
%%--------------------------------------------------------------------
%% Include files
More information about the Pkg-voip-commits
mailing list